Dan Poltawski
a6a488d409
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-04-24 17:57:13 +08:00
Ankit Agarwal
867c44c348
MDL-44398 tags: Fix incorrect usage of caps
2014-04-24 16:38:31 +08:00
Marina Glancy
a44b25a3d3
Merge branch 'wip-MDL-44637-master' of git://github.com/abgreeve/moodle
2014-04-24 16:33:57 +08:00
Petr Skoda
b64af72c2c
MDL-45090 explain event->courseid
2014-04-24 16:31:50 +08:00
Adrian Greeve
663aab727d
MDL-44637 events: Update to string that was throwing off event list column ordering.
2014-04-24 16:24:23 +08:00
Adrian Greeve
780a43d660
MDL-44637 report_eventlist: Behat tests for the event listing tool.
2014-04-24 16:24:22 +08:00
Adrian Greeve
4f078f38ae
MDL-44637 report_eventlist: Created a tool for listing all events.
2014-04-24 16:24:22 +08:00
Frederic Massart
3f32733702
MDL-44004 grading_rubric: Ensure that score is set before using it
2014-04-24 16:21:07 +08:00
Andrew Nicols
d926ce7173
MDL-45254 atto_equation: Allow insertion of macros at the beginning of words
2014-04-24 15:13:19 +08:00
Petr Skoda
0ee1edd0ff
MDL-45080 fix question_category_created url and legacy log data
2014-04-24 14:28:43 +08:00
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
Daniel Neis Araujo
912af66e61
MDL-42869 calendar: HTML validation check fails on add event screen
2014-04-23 14:50:35 -03:00
Andrew Nicols
05a7f9e749
MDL-45239 editor_atto: The editor cannot be active if it is not the active element
...
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.
2014-04-23 16:59:40 +08: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