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

66055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Dan Poltawski
824dccead3 Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle 2014-01-14 15:57:05 +08:00
Dan Poltawski
2c9c8c7f46 Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle 2014-01-14 15:48:49 +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
Dan Poltawski
b901d0e9dd Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle 2014-01-14 15:26:52 +08:00
Damyon Wiese
a1ac22b815 Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle 2014-01-14 15:18:37 +08:00
Dan Poltawski
2be353c195 Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle 2014-01-14 15:00:11 +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
Dan Poltawski
4198f7f903 Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle 2014-01-14 14:43:45 +08:00
Damyon Wiese
761549816d Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle 2014-01-14 14:29:58 +08:00
Dan Poltawski
81f7090b0c MDL-40313 question: build shifter after js changes 2014-01-14 14:28:44 +08:00
Damyon Wiese
f27e462b5f Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle 2014-01-14 14:23:06 +08:00
Dan Poltawski
198b1facc3 Merge branch 'MDL-40313' of git://github.com/timhunt/moodle 2014-01-14 14:21:06 +08:00
Damyon Wiese
c98ee8cdc0 Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle 2014-01-14 13:59:26 +08:00
Damyon Wiese
b6dc2b72b2 Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle 2014-01-14 13:25:44 +08:00
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
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
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
Dan Poltawski
4be67945aa Merge branch 'MDL-43412' of git://github.com/timhunt/moodle 2014-01-14 10:46:22 +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
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