Commit Graph

24767 Commits

Author SHA1 Message Date
Frederic Massart 89708ffc5f MDL-45256 portfolio: Do not require strict XML when parsing content 2014-04-29 17:43:44 +08:00
Frederic Massart 94545c73f1 MDL-45256 portfolio: Unit tests for rewrite pluginfile urls 2014-04-29 17:43:44 +08:00
Marina Glancy a8294bd955 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 17:27:56 +08:00
Frederic Massart 1cc9c00c3e MDL-45229 event: Adding information about stricter validation 2014-04-29 17:12:43 +08:00
Sam Hemelryk e0eca9b3e5 Merge branch 'MDL-45312' of git://github.com/timhunt/moodle 2014-04-29 10:24:20 +12:00
Sam Hemelryk 4299dc5bb6 Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle 2014-04-29 09:10:05 +12:00
Tim Hunt 856c2f1404 MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled.
They are required by the system.
2014-04-28 21:45:46 +01:00
Sam Hemelryk 48dba530c6 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 08:40:16 +12:00
Petr Skoda a9236a2c3f MDL-45287 fix behat database reset between scenarios
We cannot find out if DB received any writes because behat
web access runs in different request.

This was affecting only scenarios without generators.
2014-04-28 17:02:58 +08:00
Frederic Massart c56f0f4a2c MDL-45298 theme: More permissive usage of retired themes settings 2014-04-28 16:27:33 +08:00
Marina Glancy 254402dbbe Merge branch 'w17_MDL-45128_m27_stats' of git://github.com/skodak/moodle 2014-04-28 13:48:18 +08:00
Marina Glancy c6b4a7f4a2 Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle 2014-04-28 12:43:37 +08:00
Andrew Nicols 9cd7bb3764 MDL-45221 admin: configexecutable admin settings should only accept files 2014-04-28 12:21:21 +08:00
Simey Lameze 9e533215bd MDL-44627 events: Triggering event course module updated actions. 2014-04-28 12:11:24 +08:00
Petr Skoda 8dcb7ae62e MDL-45128 include only education related events from real users in statistics processing 2014-04-28 11:31:31 +08:00
Frederic Massart be9fb21191 MDL-45229 event: Validate sectionnum in course_section_updated 2014-04-28 11:27:44 +08:00
Marina Glancy 566fd05d21 Merge branch 'master_MDL-45210' of git://github.com/totara/moodle 2014-04-28 10:46:04 +08:00
Marina Glancy 3a0edd1fcd Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle 2014-04-28 10:44:36 +08:00
Ankit Agarwal c4652889f1 MDL-45052 events: Cleanup db/events.php 2014-04-28 10:33:18 +08:00
Sam Hemelryk 0e7408683f Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle 2014-04-28 14:09:18 +12:00
Dan Poltawski cf3166aafb Merge branch 'w17_MDL-45250_m27_ripaddtolog' of https://github.com/skodak/moodle 2014-04-28 09:40:41 +08:00
Sam Hemelryk 1e902feb66 Merge branch 'wip-MDL-45280-master' of git://github.com/marinaglancy/moodle 2014-04-28 12:22:44 +12:00
Sam Hemelryk 6b8e2f6794 Merge branch 'MDL-45286' of git://github.com/stronk7/moodle 2014-04-28 12:15:38 +12:00
Eloy Lafuente (stronk7) 1940cc3a91 MDL-45286 timezones: updated to 2014b 2014-04-28 01:01:04 +02:00
David Monllao 560fc52dca MDL-45284 behat: Replace wrongly triggered not found exception 2014-04-27 11:55:47 +07:00
Marina Glancy c7fb7fa370 MDL-45280 wrtie default value for admin_setting_configstoredfile
this fixes regression from MDL-45134
2014-04-26 10:37:37 +08:00
Petr Skoda b33da4bfe3 MDL-45250 add debugging message to deprecated add_to_log() 2014-04-25 15:29:58 +08:00
Dan Poltawski 1bdedfb880 Merge branch 'w17_MDL-45080_m27_questioncreate' of https://github.com/skodak/moodle 2014-04-25 13:31:47 +08:00
sam marshall f2faa7cd17 MDL-45260 Memcache session support does not work for multiple servers 2014-04-24 12:49:15 +01: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 4f078f38ae MDL-44637 report_eventlist: Created a tool for listing all events. 2014-04-24 16:24:22 +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 eb2d613ce0 Merge branch 'MDL-45158' of git://github.com/jleyva/moodle 2014-04-24 11:54:10 +08:00
Sam Hemelryk d4f0e345ab Merge branch 'MDL-45169-master' of git://github.com/FMCorz/moodle 2014-04-24 11:33:34 +12: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
Frederic Massart 7d47f470bf MDL-45238 event\course_viewed: Added require for course/lib.php 2014-04-23 16:34:24 +08:00
Andrew Nicols ea382deaaf MDL-45207 atto_equation: Handle multiple equations on the same line 2014-04-23 15:34:26 +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
Marina Glancy cc2c7d6767 Merge branch 'MDL-44991-master' of git://github.com/sammarshallou/moodle 2014-04-23 13:24:54 +08:00
Marina Glancy ff35a0129f Merge branch 'MDL-44855-master' of git://github.com/andrewnicols/moodle 2014-04-23 13:12:25 +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