mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
67,974 Commits 36 Branches 523 Tags
Commit Graph

67974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
7b99722e93 Merge branch 'MDL-45207-master' of git://github.com/andrewnicols/moodle 2014-04-24 14:00:46 +08:00
Marina Glancy
faf67a87a0 Merge branch '45249-27' of git://github.com/samhemelryk/moodle 2014-04-24 12:00:00 +08:00
Marina Glancy
eb2d613ce0 Merge branch 'MDL-45158' of git://github.com/jleyva/moodle 2014-04-24 11:54:10 +08:00
Sam Hemelryk
5fbcc5263a Merge branch 'MDL-45096-master' of git://github.com/andrewnicols/moodle 2014-04-24 12:14:34 +12:00
Sam Hemelryk
5852a965ca Merge branch 'MDL-44928-master' of git://github.com/xow/moodle 2014-04-24 11:37:34 +12:00
Sam Hemelryk
d4f0e345ab Merge branch 'MDL-45169-master' of git://github.com/FMCorz/moodle 2014-04-24 11:33:34 +12:00
Sam Hemelryk
ecb98f6ecd Merge branch 'w17_MDL-45214_m27_idsortlog' of https://github.com/skodak/moodle 2014-04-24 11:10:46 +12:00
Sam Hemelryk
91a73fd53d Merge branch 'MDL-45238-master' of git://github.com/FMCorz/moodle 2014-04-24 11:05:27 +12:00
Sam Hemelryk
8ddcb3ff8c Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle 2014-04-24 11:03:15 +12:00
Sam Hemelryk
a544822bd8 Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle 2014-04-24 11:01:33 +12:00
Sam Hemelryk
a870d3e8fb MDL-45249 report_loglive: add missing @_switch_window tag to required tests 2014-04-24 09:50:27 +12:00
Dan Poltawski
d7ef1ac747 Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle 2014-04-23 16:40:22 +08:00
Frederic Massart
7d47f470bf MDL-45238 event\course_viewed: Added require for course/lib.php 2014-04-23 16:34:24 +08:00
Dan Poltawski
54de59e70a Merge branch 'MDL-45075-master' of git://github.com/andrewnicols/moodle 2014-04-23 16:13:08 +08:00
Andrew Nicols
7bb7de44cf MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation 2014-04-23 16:07:50 +08:00
John Okely
f548bc4de5 MDL-44928 mod_forum: Add unit tests for urls in mod_forum events 2014-04-23 15:59:26 +08:00
John Okely
2b7781d662 MDL-44928 mod_forum: Fix urls in log entries for forum events 2014-04-23 15:54:15 +08:00
Andrew Nicols
ea382deaaf MDL-45207 atto_equation: Handle multiple equations on the same line 2014-04-23 15:34:26 +08:00
Petr Skoda
a8d7d6175a MDL-45214 always try to use ID sort in get_events_select() 
This should make PostgreSQL behave more like MySQL
and resolve the problem when events were appearing in different
order.
 2014-04-23 15:29:35 +08:00
Marina Glancy
3ebfb87878 Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle 2014-04-23 15:25:01 +08:00
Marina Glancy
66d3188112 Merge branch 'MDL-45134-master' of git://github.com/FMCorz/moodle 2014-04-23 14:45:59 +08:00
Frederic Massart
8aa64bab43 MDL-45169 atto_image: Translatable string for 'size' 
AMOS BEGIN
 CPY [size,core],[size,atto_image]
AMOS END
 2014-04-23 14:43:28 +08:00
Marina Glancy
19a1a68e45 Merge branch 'MDL-45008-master' of git://github.com/andrewnicols/moodle 2014-04-23 14:33:51 +08:00
Marina Glancy
cae96c6217 Merge branch 'wip-MDL-45218-master' of git://github.com/abgreeve/moodle 2014-04-23 14:33:12 +08:00
Dan Poltawski
f58add15b1 Merge branch 'wip-MDL-45148-master' of https://github.com/mackensen/moodle 2014-04-23 14:22:17 +08:00
Dan Poltawski
0a4fa71345 Merge branch 'MDL-45194-master' of git://github.com/FMCorz/moodle 2014-04-23 13:29:20 +08:00
Marina Glancy
cc2c7d6767 Merge branch 'MDL-44991-master' of git://github.com/sammarshallou/moodle 2014-04-23 13:24:54 +08:00
Marina Glancy
a20ec8a0eb Merge branch 'MDL-45109_master' of git://github.com/nadavkav/moodle 2014-04-23 13:23:46 +08:00
Marina Glancy
ff35a0129f Merge branch 'MDL-44855-master' of git://github.com/andrewnicols/moodle 2014-04-23 13:12:25 +08:00
Marina Glancy
14ccfec4e1 Merge branch 'MDL-44950-master' of git://github.com/ankitagarwal/moodle 2014-04-23 13:11:23 +08:00
Frederic Massart
519a17e59f MDL-45134 adminlib: No more validation error when a config file is not set 
When the destination draft area existed and the user draft area has not
been used, and thus does not exist, an error was displayed to the user
saying that they could not save the setting.

This was intended to handle the cases where the draft area disappears
and would overwrite the content of the destination area, deleting
all its content. But now we do not prompt with an error when
overwriting empty with empty.
 2014-04-23 12:40:05 +08:00
Adrian Greeve
75cab92b19 MDL-45218 events: Unit tests and fixtures for new static methods in base event class. 2014-04-23 12:14:33 +08:00
Petr Skoda
dce7ec41e9 MDL-45219 add course recent_activity_viewed event 2014-04-23 11:53:36 +08:00
Petr Skoda
f40d61c187 MDL-45219 add report_viewed event to report_questioninstances 2014-04-23 11:53:36 +08:00
Petr Skoda
db473c0d5a MDL-45219 add report_viewed event to tool_capability 2014-04-23 11:53:35 +08:00
Petr Skoda
a991a1dd23 MDL-45219 add \mod\chat\course_module_viewed event 2014-04-23 11:53:35 +08:00
Petr Skoda
2f3c20b245 MDL-45219 remove old assignment course instance list 2014-04-23 11:53:35 +08:00
Adrian Greeve
cc662b0639 MDL-45218 events: New static methods for getting general event information. 
New methods are get_static_info() and get_explanation().
 2014-04-23 11:52:05 +08:00
Adrian Greeve
7c084af93d MDL-45216 events: Unit tests for core/event/manager. 
This includes unit tests for the new method get_all_observers
and updates to other methods that have been updated.
 2014-04-23 11:51:08 +08:00
Adrian Greeve
1b9fb2e815 MDL-45216 events: Update to core/event/manager to return observer information. 2014-04-23 11:51:08 +08:00
Andrew Davis
40d230162c MDL-45172 block_completionstatus: added a check for an empty string before appending 2014-04-23 11:22:04 +08:00
Dan Poltawski
b7ff518b17 Merge branch 'w17_MDL-45203_m27_loginlog' of https://github.com/skodak/moodle 2014-04-23 10:44:10 +08:00
Dan Poltawski
98bb800209 Merge branch 'MDL-45226-master' of git://github.com/andrewnicols/moodle 2014-04-23 10:39:26 +08:00
Petr Skoda
cd25119e34 MDL-45203 implement new event user_password_updated 2014-04-23 09:51:57 +08:00
Andrew Nicols
7c5ea4935a MDL-45226 AJAX: Backport upstream bug fixes from YUI 
This backports the following two patches:
* https://github.com/yui/yui3/issues/1757
* https://github.com/yui/yui3/issues/1778
 2014-04-22 23:25:27 +08:00
Juan Leyva
2e04d25053 MDL-45158 mobile: Grades functions included in Mobile Service 2014-04-22 14:11:11 +02:00
Eloy Lafuente (stronk7)
e471fc6c9d on-demand release 2.7beta+ 2014-04-22 12:31:22 +02:00
Andrew Nicols
f857b668f9 MDL-44855 AJAX: Arrays and Objects should be defined in the initializer 
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
 2014-04-22 17:03:21 +08:00
Steve Clay
d8edfff658 MDL-45096 block_navigation: Check for existence of the siteadminbranch before modifying it 
Prevents JS errors in some themes when admin block is hidden
 2014-04-22 16:32:42 +08:00
Andrew Nicols
d2782804cb MDL-45124 dndupload: Lowercase types when comparing 
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
 2014-04-22 16:08:26 +08:00