moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69776 commits 37 branches 544 tags 1.3 GiB
Commit graph

19034 commits

Author SHA1 Message Date
Frederic Massart
22c5c6e627 MDL-41767 themes: Support for parent-specific sheets in plugins 2014-01-20 13:29:20 +01:00
Dan Poltawski
1db62f7ff4 Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle 2014-01-20 15:29:15 +08:00
Damyon Wiese
e0ebe681e0 MDL-43760 Potential fix for fletcher scott issues with fullname. 2014-01-20 13:37:51 +08:00
Marina Glancy
b35ef82f33 MDL-41062 gradebook: corrections to grade_item upgrade script, more tests 2014-01-20 12:26:14 +08:00
Damyon Wiese
c8bfabd267 Merge branch '43675-27' of git://github.com/samhemelryk/moodle 2014-01-20 10:57:30 +08:00
Damyon Wiese
12c0236385 Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle 2014-01-20 10:41:36 +08:00
Mark Nelson
362b9a0465 MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event 2014-01-19 18:30:40 -08:00
Mark Nelson
0b7422f366 MDL-40051 core_mnet: replaced add_to_log calls with events 2014-01-19 18:30:40 -08:00
Dan Poltawski
e6fbca9f65 Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle 2014-01-20 09:45:43 +08:00
Dan Poltawski
2a9d7a42aa 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:31:21 +08:00
Sam Hemelryk
8496ddd7c6 MDL-43714 blocks: fixed coding style of ajax/blocks.php 2014-01-17 10:50:18 +13:00
Sam Hemelryk
efd556f77b MDL-43714 blocks: fixed notice when moving to an empty region 2014-01-17 10:45:23 +13:00
Sam Hemelryk
956e2e8a8c MDL-43675 navigation: courses branch is now recognised as expandable 2014-01-17 10:27:10 +13:00
Damyon Wiese
efbed79063 Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges 2014-01-15 13:17:31 +08:00
Dan Poltawski
b19608d682 Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle 2014-01-15 11:41:05 +08:00
Yuliya Bozhko
e477ec0a39 MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge 2014-01-15 16:24:37 +13:00
Mark Nelson
001f09548d MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event 2014-01-14 19:24:15 -08:00
Mark Nelson
d86c7206aa MDL-40912 coursecat: replaced 'move' add_to_log calls with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
c4cea8cb5d MDL-40912 coursecat: replaced 'update' add_to_log call with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
03ea10e6d3 MDL-40912 coursecat: replaced 'add' add_to_log call with an event 2014-01-14 19:24:08 -08:00
Eloy Lafuente (stronk7)
19c32aacea Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle 2014-01-15 03:59:51 +01:00
Rajesh Taneja
8acec2a693 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 10:28:00 +08:00
Damyon Wiese
7508094a87 Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle 2014-01-15 09:39:03 +08:00
David Monllao
4234011a1a MDL-43439 behat: Dir date without - separators 2014-01-15 09:17:44 +08:00
Dan Poltawski
852c34e509 Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle 2014-01-15 08:19:49 +08:00
Eloy Lafuente (stronk7)
75bdb2bfc7 Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle 2014-01-15 00:03:34 +01:00
Eloy Lafuente (stronk7)
7d4c752e31 Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle 2014-01-14 22:08:46 +01:00
Yuliya Bozhko
7f964cfdc7 MDL-43621 badges: Don't display deleted users in badge recipients list 2014-01-15 09:31:45 +13:00
Eloy Lafuente (stronk7)
da47e297da Merge branch '35597-27' of git://github.com/samhemelryk/moodle 2014-01-14 16:39:00 +01:00
Eloy Lafuente (stronk7)
1b92203ef3 Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle 2014-01-14 16:01:27 +01:00
sam marshall
0f1882ed1f MDL-43619 Roles: reset_role_capabilities unit test, cache fix 2014-01-14 13:46:25 +00:00
sam marshall
3978da9e2f MDL-43619 Roles: reset_role_capabilities function destroys overrides 2014-01-14 13:46:24 +00:00
Dan Poltawski
473924dfd5 Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle 2014-01-14 16:50:07 +08:00
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Dan Poltawski
00ae4c4ead Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle 2014-01-14 15:36:58 +08:00
David Monllao
5c0dfe32eb MDL-43439 behat: Save the screenshots to the specified location 2014-01-14 15:17:28 +08:00
Dan Poltawski
88457992ba Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle 2014-01-14 14:46:55 +08:00
Damyon Wiese
f27e462b5f Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle 2014-01-14 14:23:06 +08:00
David Monllao
ff7139d6cb 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:11:07 +08:00
David Monllao
19a40b1468 MDL-43461 behat: Using linux-style directory separators when using cygwin 2014-01-14 13:10:40 +08:00
Petr Škoda
62c8032509 MDL-34347 remove all problematic global text caching 
Instead we will create new MUC caches inside each filter plugin.
Please note that all cache filters should work with local caches
without the need of strict cache invalidation.
 2014-01-14 10:49:23 +08:00
Andrew Nicols
06acdf04f6 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:39:06 +08:00
Matteo Scaramuccia
753b71c775 MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption(). 2014-01-13 21:29:23 +01:00
Eloy Lafuente (stronk7)
c33eb444fc Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle 2014-01-13 19:10:13 +01:00
Dan Poltawski
d1426e2843 Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assignment/lang/en/assignment.php
 2014-01-13 12:55:36 +08:00
Dan Poltawski
8c0ddd430a Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
	lib/yui/src/notification/js/dialogue.js
 2014-01-13 12:42:13 +08:00
Dan Poltawski
3ef74a63a6 Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle 2014-01-13 12:11:17 +08:00
Dan Poltawski
f6652bc750 Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle 2014-01-13 08:54:22 +08:00
Dan Poltawski
c582565a06 MDL-43395 dml: warn about invalid limit params 
Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.
 2014-01-13 08:42:07 +08:00
Sam Hemelryk
d9bf4be487 MDL-43598 dialogue: fixed bug with render procedure 2014-01-13 08:27:46 +13:00