mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-05 00:22:43 +01:00
Code Issues Projects Releases Wiki Activity
64,120 Commits 36 Branches 523 Tags
Commit Graph

64120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
3b06d7b22b Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle 2013-10-02 17:01:12 +10:00
Marina Glancy
0880a52c9a Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-10-02 16:54:59 +10:00
Damyon Wiese
766c6401b7 MDL-41912 Atto: Min-height fix - div was too small by default. 2013-10-02 13:13:35 +08:00
Frederic Massart
26422a66ad MDL-40050 webservice: Moving new events test file to right location 2013-10-02 13:10:45 +08:00
Frederic Massart
ee2df1a8b2 MDL-40050 webservice: Remove token from events 2013-10-02 13:00:28 +08:00
Frederic Massart
4fb6600eae MDL-42021 enrol: Missing objectid in enrolment_deleted event 2013-10-02 10:45:28 +08:00
Marina Glancy
a929e5e83d Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle 2013-10-02 09:20:52 +10:00
Sam Hemelryk
0fcedc7c73 MDL-41039 mod_quiz: version bump 2013-10-02 12:10:43 +13:00
Sam Hemelryk
18f04ab625 Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle 2013-10-02 12:10:08 +13:00
Sam Hemelryk
6579a7b791 Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle 2013-10-02 11:36:16 +13:00
Eloy Lafuente (stronk7)
9d4ff1e5f4 Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle 2013-10-02 00:26:20 +02:00
Eloy Lafuente (stronk7)
3667a8ce7f Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle 2013-10-01 23:59:05 +02:00
Sam Hemelryk
274399c00e MDL-40770 tinymce: fixed svg files included with moodle theme 2013-10-02 10:52:15 +13:00
Sam Hemelryk
55fcb3504f Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle 2013-10-02 10:52:03 +13:00
Eloy Lafuente (stronk7)
d1ed736f1d Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle 2013-10-01 23:42:00 +02:00
Sam Hemelryk
49b38d141e Merge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle 2013-10-02 10:36:56 +13:00
Sam Hemelryk
28a6f665f4 Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle 2013-10-02 10:27:54 +13:00
rwijaya
faf6010b10 MDL-40829: courses heading: remove headerblock class from header and fix heading levels. 
Also, changing h3 classname from name to categoryname.
    Added note to theme/upgrade.txt to describe the heading level changes.
 2013-10-02 09:46:26 +13:00
Eloy Lafuente (stronk7)
268f4cb503 Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle 2013-10-01 21:36:13 +02:00
Sam Hemelryk
7f58018843 Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle 2013-10-02 08:14:36 +13:00
Eloy Lafuente (stronk7)
098723aabb Merge branch 'mdl41996-master' of https://github.com/tlock/moodle 2013-10-01 20:01:33 +02:00
Eloy Lafuente (stronk7)
46e11c6690 Merge branch 'wip-MDL-41921-master' of git://github.com/marinaglancy/moodle 2013-10-01 19:55:30 +02:00
Eloy Lafuente (stronk7)
e360a68adc Merge branch '41997-26' of git://github.com/samhemelryk/moodle 2013-10-01 19:50:19 +02:00
Eloy Lafuente (stronk7)
da600e5314 Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle 2013-10-01 19:43:42 +02:00
Eloy Lafuente (stronk7)
52e9827495 Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle 2013-10-01 19:41:10 +02:00
Eloy Lafuente (stronk7)
164e90dd70 Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle 2013-10-01 19:36:37 +02:00
Eloy Lafuente (stronk7)
91c49b8cf4 Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle 2013-10-01 19:18:36 +02:00
Eloy Lafuente (stronk7)
00a6df6b02 Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle 2013-10-01 15:59:06 +02:00
Marina Glancy
c9e4ade71e Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:49:03 +10:00
Marina Glancy
815f0ef33c Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:42:37 +10:00
Petr Škoda
92911ef1b8 MDL-41999 fix setting of USER in chat 2013-10-01 09:23:42 +02:00
Nadav Kavalerchik
eef850815c MDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean) 2013-10-01 15:05:49 +10:00
Marina Glancy
3a3e3fa3b5 Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle 2013-10-01 14:45:14 +10:00
Sam Hemelryk
c7b6b27d77 MDL-41398 bootstrap: added a maintenance layout 2013-10-01 14:35:47 +10:00
Marina Glancy
5c06e84ab2 Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle 2013-10-01 14:21:50 +10:00
Damyon Wiese
900f571c3a MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button) 2013-10-01 11:58:15 +08:00
Yuliya Bozhko
f85ce0d900 MDL-42072 badges: Fix output and headers in badges ajax scripts 2013-10-01 16:50:54 +13:00
Sam Hemelryk
0af463d413 MDL-41828 mod: fixed navbar when adding modules to a course 2013-10-01 13:30:00 +10:00
Sam Hemelryk
d451eb4dc5 MDL-41900 events: avoid new debug call within unit tests 2013-10-01 16:20:57 +13:00
Andrew Nicols
03e36e7077 MDL-41878 JavaScript: Add an alias for Moodle in the YUI loader 2013-10-01 10:51:40 +08:00
Adrian Greeve
8a94144332 MDL-40049 mod_choice: Replaced old add_to_log calls with event triggers. 
Also added a generator for unit tests.
 2013-10-01 10:36:13 +08:00
Ankit Agarwal
808f8480eb MDL-40047 chat: Fix classname typo in generator tests 2013-10-01 10:13:20 +08:00
Ankit Agarwal
3f6fd94140 MDL-40047 events: Replace add_to_logs with new events in feedback 2013-10-01 10:12:06 +08:00
Ankit Agarwal
9c515cdcfb MDL-40047 events: Add unit tests for feedback events 2013-10-01 10:12:06 +08:00
Ankit Agarwal
1f00818771 MDL-40047 feedback: Add a test generator for feedback 2013-10-01 10:12:06 +08:00
Ankit Agarwal
4df4a9b93e MDL-40047 events: Add events related to feedback responses 
Adding following events related to feedback responses:-
/mod_feedback/event/response_deleted
/mod_feedback/event/response_submitted
/mod_feedback/event/instances_list_viewed
/mod_feedback/event/course_module_viewed
 2013-10-01 10:12:05 +08:00
Sam Hemelryk
c78fdd8db3 Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle 2013-10-01 14:50:53 +13:00
Sam Hemelryk
421dd2e8eb Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle 2013-10-01 14:35:49 +13:00
Sam Hemelryk
9b2fdfab44 Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle 2013-10-01 14:06:28 +13:00
Sam Hemelryk
5101954f03 Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
	lib/editor/atto/plugins/link/yui/src/button/js/button.js
 2013-10-01 13:58:17 +13:00