5f074a6bb0
Merge branch 'wip-MDL-41062-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-20 15:29:21 +08:00
8de9100136
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
2014-01-20 12:25:56 +08:00
5b860c69a2
Merge branch '43675-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-20 10:56:34 +08:00
e53eb2a208
Merge branch 'wip-mdl-43306-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-01-20 09:45:44 +08:00
15fac63956
MDL-41062 gradebook: remove sortorder duplicates
...
* Upgrade function to remove duplicates from the grade item duplicates
column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
verify that they have been removed.
2014-01-17 17:36:37 +08:00
aafc6872e4
MDL-43675 navigation: courses branch is now recognised as expandable
2014-01-17 10:27:05 +13:00
ebc09cc3ad
MDL-43306 restore: Fix grade_item sortorder after restoring course
...
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.
Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
2014-01-15 13:31:57 +08:00
5af6a32866
Merge branch 'MDL-43621_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE
2014-01-15 13:30:58 +08:00
f0040e7daf
MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge
2014-01-15 16:25:48 +13:00
893139fd12
Merge branch 'MDL-43439_26-dateformat' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 04:01:11 +01:00
f5d810b4f3
Merge branch 'MDL-43461_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 09:38:46 +08:00
e5ee31453a
MDL-43439 behat: Dir date without - separators
2014-01-15 09:18:55 +08:00
05297cc0a8
Merge branch 'MDL-43619-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-01-15 08:20:39 +08:00
66e46b4859
Merge branch 'MDL-43439_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 00:11:18 +01:00
4768a4768b
MDL-43621 badges: Don't count deleted users as badge recipients
2014-01-15 09:57:26 +13:00
a6a14f2155
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
2014-01-14 13:47:38 +00:00
bf2c42e8ee
MDL-43619 Roles: reset_role_capabilities function destroys overrides
2014-01-14 13:47:37 +00:00
f9d14c4cd7
Merge branch 'MDL-43664-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-14 16:50:09 +08:00
4a2ac9676a
Merge branch 'm26_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-14 15:37:04 +08:00
e906a85cc3
MDL-43439 behat: Save the screenshots to the specified location
2014-01-14 15:24:09 +08:00
58dd0d506e
MDL-43461 testing: Avoid switching to .bat files when running MinGW
...
MinGW can not execute .bat files (http://sourceforge.net/p/mingw/bugs/1902 )
so we should not switch to .bat files when running MinGW.
2014-01-14 13:14:40 +08:00
22a09b7d40
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:14:14 +08:00
56f0dc64ed
MDL-43664 Javascript: Use YUI indexOf for pending_js tracking
...
Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.
2014-01-14 10:40:39 +08:00
fc33a35857
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
2014-01-13 21:34:48 +01:00
4d2984c136
Merge branch '43598-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-13 12:37:26 +08:00
bc7a77f14d
Merge branch 'MDL-39661-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-13 08:54:23 +08:00
a2fb18da50
MDL-43598 dialogue: fixed bug with render procedure
...
Conflicts:
lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-01-13 08:25:42 +13:00
134462ae28
MDL-43439: Behat - new $CFG param - behat_screenshot_after_failure
2014-01-10 17:56:04 +08:00
8d5b7ed598
MDL-36721 make upgrade queries cross-db
2014-01-10 11:20:52 +08:00
5cf42ac843
MDL-40119 Forms: Remove cursor style override for calendar button
2014-01-08 11:14:37 +01:00
5bb7f7e0dc
MDL-43423 behat: Increasing the timeout to 6 seconds
2014-01-08 09:56:10 +01:00
135634fbd3
Merge branch 'wip-MDL-43606-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-08 14:33:11 +08:00
6f70004a0d
MDL-43606 tinymce_managefiles: bump version
...
to allow smooth upgrade from contributed plugin in 2.5
2014-01-08 13:57:54 +08:00
a3fa0ca96f
Merge branch 'MDL-40119-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-08 02:17:42 +01:00
e86b3c7335
Merge branch 'MDL-43173_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-08 08:21:09 +08:00
99a57908f5
Merge branch 'MDL-42607_rss_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-08 00:42:45 +01:00
f0d61c012d
Merge branch 'MDL-43451-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-07 23:38:28 +01:00
d829440fed
Merge branch 'w01_MDL-43510_m26_test404' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-07 17:26:01 +08:00
9fe6a6f42b
Merge branch 'm26_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-07 12:43:29 +08:00
836399115b
Merge branch 'MDL-42995-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-07 11:51:18 +08:00
883ea035af
Merge branch 'MDL-43394a-26' of https://github.com/srynot4sale/moodle into MOODLE_26_STABLE
2014-01-07 11:00:12 +08:00
2424069da2
MDL-39661 blocks: Removed notice when moving a block
2014-01-06 12:44:23 +01:00
5bf8b2e969
MDL-42995 libraries: Global function to strip pluginfile content
2014-01-06 10:31:48 +01:00
5726fe6263
Merge branch 'w01_MDL-36721_m26_passlog' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-06 14:51:16 +08:00
0cb1903bfd
Merge branch 'MDL-35973_redirect_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-06 11:28:25 +13:00
8571b889f3
Merge branch 'MDL-43281-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-06 11:22:09 +13:00
44b74479cb
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum
2014-01-05 20:08:05 +08:00
adf125a30b
MDL-43173 behat: Thowing an exception if the JS is not ready
2014-01-03 11:29:56 +08:00
a90069245d
MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation
2014-01-02 10:50:54 +08:00
560672aaa1
MDL-43451 Cron: Retrieve additional name fields when creating passwords
2014-01-01 02:25:42 +08:00
Dan Poltawski