Commit Graph

24767 Commits

Author SHA1 Message Date
Petr Škoda 7ec0e0629c MDL-44515 import latest PHPExcel 1.8.0 2014-03-14 12:10:52 +08:00
Petr Škoda 9ede00db18 MDL-44500 detect context-courseid inconsistencies in new events 2014-03-14 12:08:12 +08:00
Petr Škoda 589eca14f2 MDL-44604 fix task cleanup in plugin uninstallation 2014-03-14 12:04:04 +08:00
Damyon Wiese bbd9226cb8 MDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks 2014-03-14 11:47:03 +08:00
Petr Škoda c386f35bca MDL-44339 treat unexpected debugging() calls in phpunit tests as errors 2014-03-14 11:43:46 +08:00
Petr Škoda 5d4c82560b MDL-44191 hack around MySQL 5.6 inability to lower auto_increment 2014-03-14 11:31:43 +08:00
Petr Škoda 1dd74afe9e MDL-43604 add support for future hacky MariaDB versions
This patch also shows the real server version without
normalisation on the environment page, this should
hopefully help people to identify MariaDB...
2014-03-14 11:28:05 +08:00
Petr Škoda 50f5c84359 MDL-41115 add option to allow login via email 2014-03-14 11:25:09 +08:00
Eloy Lafuente (stronk7) 630bb85d9e MDL-43266 testing: avoid assoc arrays for json
Last commit switched from raw arrays to associative
arrays. That leads to json_encode() to generate an
object instead of an array, ultimately leading to
problems with the rest of code expecting an array.

By using array_values() we are moving back to the
non-associative array.

Also, fix some file permissions.
2014-03-13 22:11:03 +01:00
Eloy Lafuente (stronk7) 1700bec3c6 Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle
Conflicts:
	lib/phpunit/classes/util.php
2014-03-13 19:12:25 +01:00
David Monllao ced0f98322 MDL-44236 behat: Fixing wrong old step call 2014-03-13 18:33:27 +01:00
Frederic Massart c13854785f MDL-44334 lockscroll: Fix wrong warning message 2014-03-13 18:33:26 +01:00
Dan Poltawski 41244dd3ce Merge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle 2014-03-13 18:33:26 +01:00
Mark Nelson f6a4a90e70 MDL-40913 core_message: fixed triggering the 'message_sent' event when the 'noreply' address is used 2014-03-13 18:33:25 +01:00
David Monllao 12427e7746 MDL-43236 behat: Include missing used namespace 2014-03-13 18:33:24 +01:00
Dan Poltawski 45ff52dab5 Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle 2014-03-13 18:33:21 +01:00
Eloy Lafuente (stronk7) 38c5e34c00 Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki/moodle 2014-03-13 18:33:15 +01:00
Dan Poltawski 454db7d467 Merge branch 'MDL-33653' of git://github.com/timhunt/moodle 2014-03-13 18:31:52 +01:00
Dan Poltawski c6b7551c71 Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle 2014-03-13 18:31:52 +01:00
Marina Glancy e2cb3ffad6 MDL-43967 logging: references to the migrating dev docs 2014-03-13 18:31:52 +01:00
Dan Poltawski d8085046ba Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle 2014-03-13 18:31:48 +01:00
Michael Aherne d432e0f722 MDL-44610 enrol Enable autoloading of enrolment plugins 2014-03-13 09:16:01 +00:00
David Monllao d3daf24563 MDL-43266 testing: Removing duplicated keys 2014-03-12 17:49:55 +08:00
Petr Škoda 1985ef8342 MDL-44299 resolve collision with session_gc() in PHP 5.6 2014-03-12 10:43:30 +08:00
Rajesh Taneja f325a6eb67 MDL-44458 notes: Fixed url in events 2014-03-11 15:26:20 +08:00
Juan Leyva ba1dc59721 MDL-44462 mobile: Add mod_assign functions to service definition
To support new functionality in the Moodle Mobile app.
2014-03-11 14:49:23 +08:00
Dan Poltawski 72e2a1d7eb Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-03-11 14:35:51 +08:00
Dan Poltawski c7cc278017 Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle 2014-03-11 10:50:55 +08:00
Sam Hemelryk 8daf8cbc0a Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle 2014-03-11 14:18:08 +13:00
Sam Hemelryk 421786ed61 Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle 2014-03-11 10:10:08 +13:00
Sam Hemelryk 2710ad2b52 Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle 2014-03-11 09:19:44 +13:00
Dan Poltawski 4e1aad54b8 Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle 2014-03-10 15:13:43 +08:00
Dan Poltawski 7f42ee92eb Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle 2014-03-10 13:45:26 +08:00
David Monllao 1f631c7c63 MDL-44440 behat: Changing , for > as a navigation tree nodes separator
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
2014-03-10 13:35:40 +08:00
Mark Nelson 5b09190975 MDL-40913 core_message: created 'message_read' event 2014-03-07 15:15:43 -08:00
Mark Nelson ab1bc5d222 MDL-40913 core_message: replaced 'write' add_to_log call with an event 2014-03-07 15:15:43 -08:00
Mark Nelson cd60936523 MDL-40913 core_message: replaced 'unblock contact' add_to_log call with an event 2014-03-07 15:15:43 -08:00
Mark Nelson 3f3d9521de MDL-40913 core_message: replaced 'block contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Mark Nelson 5edf9f3bd3 MDL-40913 core_message: replaced 'remove contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Mark Nelson 0d9bdf6185 MDL-40913 core_message: replaced 'add contact' add_to_log call with an event 2014-03-07 15:15:42 -08:00
Tim Hunt 8011be189e MDL-33653 fix preview links on calc qtype edit forms.
Also, refactor how we render preview icons, to eliminate duplication.
2014-03-07 19:46:56 +00:00
Brian King c484af5aa6 MDL-43497 Language: Allow course language to be overridden 2014-03-07 09:11:18 +01:00
David Monllao 759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
David Monllao c51c3b5575 MDL-43236 behat: Deprecate old steps
Correcting grammar errors and deprecating
the previous steps definitions:
- behat_data_generators::the_following_exists()
- behat_general::should_exists()
- behat_general::should_not_exists()
2014-03-07 16:05:21 +08:00
Rajesh Taneja e1b16f9773 MDL-44017 Events: Deprecated content_viewed event
Replaced content_viewed event with appropriate events and deprecated
content_viewed event
2014-03-07 15:16:10 +08:00
Andrew Nicols b959e5085a MDL-44334 Javascript: Prevent scroll locking for small screen heights 2014-03-07 15:04:56 +08:00
David Monllao a542553d42 MDL-44440 behat: Refactoring features to use I navigate to
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
2014-03-07 14:46:54 +08:00
David Monllao 370e88d4fe MDL-44440 behat: Other fixes to make clean work properly
- Update the step to follow links inside a treeview
  to work also when JS is disabled.
- Make regions accept header and footer.
- Change some locators refering to non-clean compatible
  regions.
- Restricting click to the table row in forum tracking
  because seems to conflict with the navigation bar when
  using narrow window sizes.
2014-03-07 14:27:52 +08:00
Rajesh Taneja 26fb3f5b71 MDL-44440 navigation: Added behat step to navigate from navigation/Admin block
This step will help navigate to different parts of moodle
using navigation or adminstration block.
2014-03-07 11:55:31 +08:00
Tim Lock 9619ff9ba3 MDL-44499: Fix PHP warning in upload_manager class 2014-03-07 14:19:26 +10:30