Commit graph

66105 commits

Author SHA1 Message Date
Damyon Wiese
9289d5fe72 Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle 2014-01-14 13:18:16 +08:00
Damyon Wiese
961f70adcd Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-14 13:14:09 +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
Damyon Wiese
f8a60dfe88 Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Conflicts:
	course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
	course/yui/dragdrop/dragdrop.js
2014-01-14 13:06:54 +08:00
Ankit Agarwal
0a61619043 MDL-40056 events: Replace old add_to_log calls with new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
25e8023d3d MDL-40056 events: Add unit tests for new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
a501fe1385 MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
2014-01-14 12:05:10 +08:00
Adrian Greeve
4e2ba4bb31 MDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings. 2014-01-14 11:59:01 +08:00
Adrian Greeve
1301a07a3e MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook. 2014-01-14 11:59:01 +08:00
Mark Nelson
8ff753857c MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317 2014-01-14 11:59:01 +08:00
Damyon Wiese
49ca1e77b0 Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle 2014-01-14 11:57:09 +08:00
Dan Poltawski
986c3f27ee Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle 2014-01-14 11:28:39 +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
Dan Poltawski
4be67945aa Merge branch 'MDL-43412' of git://github.com/timhunt/moodle 2014-01-14 10:46:22 +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
Damyon Wiese
1bedb6b92f MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore. 2014-01-14 09:57:05 +08:00
AMOS bot
7bccaffd78 Automatically generated installer lang files 2014-01-14 00:45:37 +00:00
Mark Nelson
4f5eaa55c5 MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317 2014-01-13 15:47:51 -08:00
Eloy Lafuente (stronk7)
295f7a6137 Merge branch 'MDL-43109' of https://github.com/mdikih/moodle 2014-01-13 21:51:27 +01:00
Matteo Scaramuccia
753b71c775 MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption(). 2014-01-13 21:29:23 +01:00
Matteo Scaramuccia
f5482be6f8 MDL-43577 Messages Incorrect variable expansion in the message template. 2014-01-13 21:06:58 +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
Eloy Lafuente (stronk7)
b9da30cfd2 Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle 2014-01-13 16:31:00 +01:00
Dan Poltawski
06cdbf8382 Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle 2014-01-13 15:38:22 +08:00
Frederic Massart
bfa0c3ab4f MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase 2014-01-13 08:11:07 +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
dbfdd1a4f9 Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 12:34:53 +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
f9276172a2 Merge branch '41226-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:11:10 +08:00
Dan Poltawski
58c8f0290f Merge branch '40821-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:02:18 +08:00
Dan Poltawski
e41761a5e9 Merge branch '40693-27' of git://github.com/samhemelryk/moodle 2014-01-13 10:07:53 +08:00
Dan Poltawski
fb9360db3a Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 10:03:51 +08:00
Sam Hemelryk
ee749e50be MDL-40205 theme: fixed overflow of block headers 2014-01-13 09:40:38 +08:00
Dan Poltawski
b5c8e7cbc3 Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 09:35:50 +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
Andrew Nicols
a67233e76f MDL-43262 JavaScript: Correct use of centered attribute override
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Andrew Nicols
c46cca4f94 MDL-43262 JavaScript: Correct visible attribute override
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Andrew Nicols
16d024348a MDL-43262 JavaScript: Correct width attribute override
This should be done using an attribute modification, rather than at the
constructor level.
2014-01-13 08:26:28 +13:00
Sam Hemelryk
3fa787ae4e MDL-40821 theme_bootstrapbase: fixed positioning of profile controls
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 08:17:24 +13:00
Sam Hemelryk
73d7e6eba9 MDL-40821 theme_bootstrapbase: show the current lang in the menu 2014-01-13 08:16:11 +13:00
Sam Hemelryk
73fc183d3a MDL-40693 theme_bootstrapbase: changed navbar separator to official separator 2014-01-13 08:15:46 +13:00
Sam Hemelryk
e5e0d397f4 MDL-35597 admin-plugins: are now sorted alphabetically 2014-01-13 08:12:42 +13:00
Sam Hemelryk
cea3b7eb76 MDL-35597 admin: categories now support localised alphabetical sorting 2014-01-13 08:12:42 +13:00
Petr Škoda
7bd95129d3 MDL-43488 remoe city and country requirement from signup
This was supposed to be part of MDL-28558.
2014-01-12 18:23:20 +08:00
Petr Škoda
c0fa7b0d93 MDL-43511 do not cache the MUC cache in question code 2014-01-12 18:20:52 +08:00
Petr Škoda
18a336c4e7 MDL-43537 drop some more unused ancient admin strings 2014-01-12 18:07:55 +08:00