8bca3609ee
MDL-48064 atto_editor: Expand event subscription for saving selection
2014-11-17 11:15:45 -06:00
b4dd8e28cd
Merge branch '48070-29' of git://github.com/samhemelryk/moodle
2014-11-17 16:22:26 +00:00
1b49f31df2
MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6
2014-11-17 15:55:22 +00:00
296e292413
Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle
2014-11-17 15:20:17 +00:00
4c3c1b5169
MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1
2014-11-17 15:19:56 +00:00
96ac6cb964
Merge branch 'MDL-42756' of git://github.com/aolley/moodle
2014-11-17 13:52:39 +00:00
bb4013f5c7
Merge branch 'MDL-43987-master' of git://github.com/xow/moodle
2014-11-17 13:17:40 +00:00
a020ddecf0
Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle
2014-11-17 12:52:35 +00:00
d931574ff9
MDL-33606 course: Adding section info to course_viewed log
...
Also changing references to section id to
section number, that it is what it really is.
2014-11-17 15:18:18 +08:00
0209a85704
MDL-46640 navigation: Handle block contexts within a category
2014-11-17 12:41:41 +08:00
c2a9bb3a9d
MDL-43987 core: Remove port numbers in cleanremoteaddr
2014-11-17 09:48:26 +08:00
d6abe6f744
Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle
2014-11-17 13:39:03 +13:00
b83a0323da
Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle
2014-11-17 12:34:02 +13:00
2928dfd8a0
Merge branch 'master_MDL-47993' of https://github.com/totara/moodle
2014-11-17 12:21:16 +13:00
6d97620481
Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle
2014-11-17 10:34:09 +13:00
bb8ed60a3c
MDL-48023 Files API: Theme files must be cache-able by shared proxies.
...
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
2014-11-16 09:53:27 +01:00
9b9a3abf9b
MDL-48064 atto_editor: Check if activeElement is child node in isActive
2014-11-14 11:49:15 -06:00
aac8dfa8b6
MDL-48070 navigation: optimised the login page
...
The navigation and settings no longer get initialised on the login
page by default, this is achieved by calling to ignore the active
page on the navbar.
It is safe because the login page is not represented in either the
navigation or the settings.
This change saves a few MB or ram and a couple of database queries
2014-11-14 11:40:25 +13:00
741063b41c
MDL-47993 calendar: Fix ical import Microsoft calendar issue
2014-11-14 10:32:54 +13:00
68ef378b1b
MDL-44657 forms: Form identifiers should only contain basic characters
2014-11-13 16:20:28 +08:00
14ecbb2ee8
MDL-48196 phpunit: Set e-mail address for admin user at installation
2014-11-13 08:47:43 +08:00
bfa16aa2fa
Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle
2014-11-12 11:03:43 +00:00
a9edd8a671
MDL-48194 testing: Adjust naming of testsuites in phpunit.xml
...
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
2014-11-12 11:46:03 +08:00
09869dd583
MDL-42756 dock: Trigger actionmenu enhance when showing dock panel
...
Additionally fixes the styling for the actionmenu icon size in
bootstrapbase'd themes.
2014-11-12 14:10:07 +10:30
73f755a799
MDL-47502 statslib tests: improve test
...
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
2014-11-11 19:25:49 +00:00
ba923f4f9a
MDL-47502 test_statslib_cron_daily: fix provider
...
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
2014-11-11 19:12:51 +00:00
e0fa3e952b
Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle
2014-11-11 18:59:55 +00:00
cae0c46b9b
Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle
2014-11-11 17:16:00 +00:00
ac19f245bf
MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task
...
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
2014-11-11 16:52:20 +08:00
147bae8f7c
MDL-48144 upgrade: add v2.8.0 sep lines
2014-11-10 18:08:15 +01:00
540af6f38e
MDL-48093 HTML 5 video: Firefox now supports .mp4
2014-11-10 10:48:28 +00:00
5429afc042
MDL-48156 task: Skip the scheduled task only for really disabled plugins
2014-11-10 11:09:25 +01:00
415fc3d2f9
Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle
2014-11-06 18:44:38 +01:00
6fdd4633a7
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
2014-11-06 11:14:52 +01:00
6887e2e53e
MDL-48035 Fix Behat tests regressions after merging en_fix strings
2014-11-06 10:54:27 +01:00
527464a618
MDL-43430 ldap: whitespace fix
2014-11-06 12:05:32 +08:00
bd6ee5c58a
Merge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle
2014-11-06 12:00:12 +08:00
253b93f720
Merge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle
2014-11-06 11:42:10 +08:00
5cf50f96e7
MDL-48083 dml: Empty buffers on forced rollback
2014-11-06 15:52:37 +13:00
dc3fab74ae
Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle
2014-11-06 02:15:44 +01:00
8f94164df3
MDL-47174 events: new calendar event may have 0 timestart
2014-11-06 08:57:29 +08:00
ec070d2cf7
Merge branch '48026-28' of git://github.com/samhemelryk/moodle
2014-11-06 00:33:46 +01:00
9aa9a1c70a
MDL-47862 tool_monitor: Fix tool monitor navigation tree
...
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
2014-11-06 12:27:51 +13:00
862b76f39b
Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle
2014-11-06 00:01:26 +01:00
8160d004ce
MDL-47943 editor_atto: Save selection on mouseleave for Chrome
2014-11-05 09:34:20 -06:00
c293eb004b
Merge branch 'MDL-47874' of git://github.com/stronk7/moodle
2014-11-05 14:27:12 +00:00
5a6c9f1cfb
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
...
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php
2014-11-05 12:11:16 +00:00
cc22032502
MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis
...
While testing the fix, it was found that ldap_stripslashes() was broken and
using a deprecated PCRE patter modifier, so it's also been fixed.
Thanks to Damyon Wiese, some units tests have been added to cover
ldap_addslashes() and ldap_stripslashes().
2014-11-05 09:01:27 +01:00
9807737734
MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis
...
As part of fixing MDL-43430, a typo has been detected in the
quoted alphanumeric characters (the '=' and '>' were transposed).
2014-11-05 09:00:17 +01:00
ba033b861e
MDL-48035 Merge English strings from the en_fix language pack
2014-11-04 21:55:26 +01:00
Daniel Thies