Sam Hemelryk [Sun, 4 Aug 2013 21:45:52 +0000 (09:45 +1200)]
MDL-31836 moodlelib: removed legacy encryptkey support
Sam Hemelryk [Thu, 8 Aug 2013 04:24:00 +0000 (16:24 +1200)]
weekly release 2.6dev
Sam Hemelryk [Thu, 8 Aug 2013 04:19:12 +0000 (16:19 +1200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Wed, 7 Aug 2013 03:19:49 +0000 (15:19 +1200)]
Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle
Mark Nelson [Wed, 7 Aug 2013 03:14:48 +0000 (11:14 +0800)]
MDL-40662 block_course_overview: added addinstance capability string
Sam Hemelryk [Wed, 7 Aug 2013 02:01:51 +0000 (14:01 +1200)]
Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle
Conflicts:
version.php
Frederic Massart [Wed, 7 Aug 2013 01:37:50 +0000 (09:37 +0800)]
MDL-40934 core: Bump version requiring major upgrade
AMOS bot [Wed, 7 Aug 2013 00:42:59 +0000 (00:42 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Tue, 6 Aug 2013 22:39:40 +0000 (10:39 +1200)]
Merge branch 'MDL-40086-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/filestorage/file_storage.php
Sam Hemelryk [Tue, 6 Aug 2013 22:23:32 +0000 (10:23 +1200)]
Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle
Conflicts:
lib/weblib.php
Sam Hemelryk [Sun, 4 Aug 2013 21:06:56 +0000 (09:06 +1200)]
MDL-41023 weblib: improved coding style
Petr Škoda [Tue, 6 Aug 2013 18:58:28 +0000 (20:58 +0200)]
MDL-40438 migrate all collatorlib:: and textlib:: uses
Marina Glancy [Tue, 6 Aug 2013 14:16:53 +0000 (00:16 +1000)]
Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 6 Aug 2013 14:10:44 +0000 (00:10 +1000)]
Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 6 Aug 2013 12:53:19 +0000 (22:53 +1000)]
Merge branch 'wip-mdl-40126' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Tue, 6 Aug 2013 12:33:55 +0000 (22:33 +1000)]
Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 6 Aug 2013 12:25:21 +0000 (22:25 +1000)]
MDL-40682 MDL-41000 event name and description return strings
event description is non-localised string
Marina Glancy [Tue, 6 Aug 2013 11:05:47 +0000 (21:05 +1000)]
Merge branch 'MDL-40682-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 6 Aug 2013 10:59:21 +0000 (20:59 +1000)]
MDL-41034 Additional check to be extra sure that no JS error occurs
Marina Glancy [Tue, 6 Aug 2013 10:49:13 +0000 (20:49 +1000)]
Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle
Ankit Agarwal [Tue, 6 Aug 2013 07:13:05 +0000 (15:13 +0800)]
MDL-40682 events: Add phpdocs for class and init method
Ankit Agarwal [Tue, 6 Aug 2013 05:56:11 +0000 (13:56 +0800)]
MDL-40935 phpunit: Remove assertLegacyEventName() since get_legacy_eventname() is public now
Ankit Agarwal [Wed, 31 Jul 2013 02:15:47 +0000 (10:15 +0800)]
MDL-40935 events: get_legacy_eventname() should be public and static
Frederic Massart [Tue, 6 Aug 2013 05:46:31 +0000 (13:46 +0800)]
MDL-40086 file: Correct ordering of subdirectories
Thanks to Mohamed Alsharaf for the proposed solution.
Sam Hemelryk [Tue, 6 Aug 2013 05:51:30 +0000 (17:51 +1200)]
Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 6 Aug 2013 05:45:16 +0000 (17:45 +1200)]
Merge branch 'wip-mdl-41000' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 6 Aug 2013 05:39:41 +0000 (17:39 +1200)]
Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 6 Aug 2013 05:36:33 +0000 (17:36 +1200)]
Merge branch 'wip-mdl-40469' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 6 Aug 2013 05:31:14 +0000 (17:31 +1200)]
Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle
Marina Glancy [Tue, 6 Aug 2013 05:03:26 +0000 (15:03 +1000)]
Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 6 Aug 2013 04:55:48 +0000 (16:55 +1200)]
Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle
Marina Glancy [Tue, 6 Aug 2013 04:38:08 +0000 (14:38 +1000)]
Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 6 Aug 2013 03:50:18 +0000 (15:50 +1200)]
Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle
Mark Nelson [Tue, 6 Aug 2013 03:38:10 +0000 (11:38 +0800)]
MDL-27953 auth: documented the newly introduced function can_be_manually_set() in upgrade.txt
Sam Hemelryk [Tue, 6 Aug 2013 03:38:18 +0000 (15:38 +1200)]
Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle
Conflicts:
lib/deprecatedlib.php
Andrew Davis [Fri, 22 Feb 2013 02:37:57 +0000 (10:37 +0800)]
MDL-37962 core_message:reimplemented the beep on new message functionality from 1.9
Marina Glancy [Tue, 6 Aug 2013 03:04:38 +0000 (13:04 +1000)]
Merge branch 'MDL-40737-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 6 Aug 2013 02:47:38 +0000 (14:47 +1200)]
Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle
Sam Hemelryk [Tue, 6 Aug 2013 02:39:49 +0000 (14:39 +1200)]
Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 6 Aug 2013 02:37:43 +0000 (14:37 +1200)]
Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle
Conflicts:
auth/tests/auth_test.php
Sam Hemelryk [Tue, 6 Aug 2013 02:03:54 +0000 (14:03 +1200)]
NOBUG: fixed whitespace
Sam Hemelryk [Tue, 6 Aug 2013 01:59:23 +0000 (13:59 +1200)]
Merge branch 'MDL-40963-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 6 Aug 2013 00:49:28 +0000 (12:49 +1200)]
Merge branch 'MDL-40955-m' of git://github.com/andrewnicols/moodle
Conflicts:
course/format/upgrade.txt
Sam Hemelryk [Tue, 6 Aug 2013 00:45:20 +0000 (12:45 +1200)]
Merge branch 'MDL-40953-m' of git://github.com/andrewnicols/moodle
AMOS bot [Tue, 6 Aug 2013 00:42:16 +0000 (00:42 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Mon, 5 Aug 2013 22:23:45 +0000 (10:23 +1200)]
Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle
Sam Hemelryk [Mon, 5 Aug 2013 22:11:20 +0000 (10:11 +1200)]
Merge branch 'MDL-27953_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)]
Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 5 Aug 2013 20:49:28 +0000 (08:49 +1200)]
Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle
Kyle Temkin [Mon, 5 Aug 2013 17:47:10 +0000 (13:47 -0400)]
MDL-41034 fix TinyMCE managefiles plugin for textareas that do not support file uploads
The current managefiles plugin assumes that every file manager will be created
by either calling use_editor without filepicker options ($fpoptions) or with
filepicker options that include options for the moodleimage plugin.
Marina Glancy [Mon, 5 Aug 2013 07:46:22 +0000 (17:46 +1000)]
Merge branch 'MDL-41029-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 Aug 2013 07:42:09 +0000 (17:42 +1000)]
Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 5 Aug 2013 03:28:55 +0000 (11:28 +0800)]
MDL-41029 core: Fix wrong guessing of course id in event base
Frederic Massart [Mon, 5 Aug 2013 07:32:43 +0000 (15:32 +0800)]
MDL-40737 tool_uploadcourse: Prove that category equals to 0 is handled
Frederic Massart [Mon, 29 Jul 2013 03:42:04 +0000 (11:42 +0800)]
MDL-40737 tool_uploadcourse: Prevent update of frontpage
Marina Glancy [Mon, 5 Aug 2013 07:15:38 +0000 (17:15 +1000)]
Merge branch 'MDL-36011-master' of git://github.com/damyon/moodle
Shane Elliott [Tue, 16 Jul 2013 08:55:12 +0000 (16:55 +0800)]
MDL-40684 Fix conditional field name for custom user fields
Marina Glancy [Mon, 5 Aug 2013 03:49:55 +0000 (13:49 +1000)]
Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 5 Aug 2013 03:46:59 +0000 (15:46 +1200)]
Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle
Sam Hemelryk [Mon, 5 Aug 2013 03:37:37 +0000 (15:37 +1200)]
Merge branch 'MDL-38758_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 5 Aug 2013 03:33:09 +0000 (15:33 +1200)]
Merge branch 'MDL-35922-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 5 Aug 2013 03:20:32 +0000 (11:20 +0800)]
MDL-30852 grade report: More coding guideline cleanups.
Marina Glancy [Mon, 5 Aug 2013 03:15:25 +0000 (13:15 +1000)]
Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 5 Aug 2013 02:38:47 +0000 (14:38 +1200)]
Merge branch 'MDL-35927' of git://github.com/rwijaya/moodle
Marina Glancy [Mon, 5 Aug 2013 02:30:56 +0000 (12:30 +1000)]
Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Mon, 5 Aug 2013 02:19:45 +0000 (12:19 +1000)]
Merge branch 'MDL-35981-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 5 Aug 2013 02:15:27 +0000 (14:15 +1200)]
Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 5 Aug 2013 02:06:26 +0000 (14:06 +1200)]
Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 5 Aug 2013 01:49:38 +0000 (09:49 +0800)]
MDL-35981 comments: Fix for keyboard control of "add a comment"
Sam Hemelryk [Mon, 5 Aug 2013 01:36:56 +0000 (13:36 +1200)]
Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Mon, 5 Aug 2013 00:48:36 +0000 (10:48 +1000)]
Merge branch 'wip-mdl-40933' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 5 Aug 2013 00:13:19 +0000 (10:13 +1000)]
MDL-34785 performance improvement with big list of courses
Sam Hemelryk [Sun, 4 Aug 2013 21:34:55 +0000 (09:34 +1200)]
MDL-41025 moodlelib: addressed todo on truncate_userinfo
Sam Hemelryk [Sun, 4 Aug 2013 21:17:37 +0000 (09:17 +1200)]
MDL-41024 lib: deprecate isediting
Petr Škoda [Sun, 4 Aug 2013 20:16:03 +0000 (22:16 +0200)]
MDL-40901 use assertInternalType()
Petr Škoda [Sun, 4 Aug 2013 20:09:30 +0000 (22:09 +0200)]
MDL-40901 standardise core test case class and file names
This finally allows us to type only the class name when executing individual core test cases.
Petr Škoda [Sun, 4 Aug 2013 19:34:17 +0000 (21:34 +0200)]
MDL-40940 try to guess testcase location using info from /phpunit.xml
This will help with core tests in non-standard core subsystem locations.
Petr Škoda [Sun, 4 Aug 2013 13:00:53 +0000 (15:00 +0200)]
MDL-41002 fix typo causing fatal error on other users page
Credit goes to Bernhard Brandstetter, thanks!
Petr Škoda [Sun, 4 Aug 2013 11:48:03 +0000 (13:48 +0200)]
MDL-40943 use observer priority only inside group of observers
This makes the '*' observers to be executed always first. This change allows us to implement parent event class catching if we ever decide we need it without breaking BC. This change includes some more unit test fixes.
Petr Škoda [Sun, 4 Aug 2013 08:18:10 +0000 (10:18 +0200)]
MDL-41020 fix installer notices
Petr Škoda [Thu, 1 Aug 2013 21:20:24 +0000 (23:20 +0200)]
MDL-40995 simplify minify integration and fix all known issues
Petr Škoda [Sat, 3 Aug 2013 08:48:15 +0000 (10:48 +0200)]
MDL-41017 improve purify caching
The improvements include:
* HTMLPurifier cache is stored in localcachedir
* allowobjectembed changes are not ignored any more
* the cache keys include revision and all options which makes
this suitable for local caches on cluster nodes
* unchanged test is replaced by "true" value which should
significantly improve performance
* removal of purge_all_caches() hack for directory recreation
* comments and coding style cleanup
Ruslan Kabalin [Mon, 29 Jul 2013 10:05:15 +0000 (11:05 +0100)]
MDL-31226: quiz: Fix message for attempts built on previous.
At the moment, when attempt is built on the last one, "not yet answered"
message is shown, which confuses many people. This patch modifies the state to
"complete" for attempt based on previous and modifies the output string.
Many thanks to Tim Hunt for guiding me through quiz infrastructure and some code
suggestions.
Petr Škoda [Fri, 26 Jul 2013 10:06:20 +0000 (12:06 +0200)]
MDL-40815 deprecate events_trigger()
Petr Škoda [Fri, 26 Jul 2013 14:44:12 +0000 (16:44 +0200)]
MDL-40889 prevent 304 when minimising JS
Frederic Massart [Fri, 2 Aug 2013 02:34:54 +0000 (10:34 +0800)]
MDL-40997 phpunit: Assertions for events legacy data
Ruslan Kabalin [Wed, 31 Jul 2013 08:46:07 +0000 (09:46 +0100)]
MDL-40947: Fix segmentation fault issue in get_fast_modinfo.
Rajesh Taneja [Fri, 2 Aug 2013 06:23:50 +0000 (14:23 +0800)]
MDL-41000 Events: Fixed return values for get_name() and get_description() in existing events
Changes done for following events:
- \core_auth\event\user_loggedin
- \core\event\role_assigned
- \core\event\role_unassigned
Damyon Wiese [Fri, 2 Aug 2013 06:40:23 +0000 (14:40 +0800)]
MDL-30852 grade: Coding style fix for user report.
Steve Bader [Fri, 2 Aug 2013 05:54:58 +0000 (13:54 +0800)]
MDL-30852 grade report: Add aria attributes
Converted to git branch by Damyon
Rajesh Taneja [Fri, 2 Aug 2013 05:48:11 +0000 (13:48 +0800)]
MDL-41000 Events: Fixed phpdoc for get_name and get_description in \core\event\base class
Damyon Wiese [Fri, 2 Aug 2013 03:42:15 +0000 (11:42 +0800)]
MDL-35981 comments: Add comment about keycodes for space and enter.
Damyon Wiese [Thu, 1 Aug 2013 04:38:32 +0000 (12:38 +0800)]
MDL-35981 comments: Remove confirm step from behat delete comments.
Damyon Wiese [Thu, 1 Aug 2013 04:30:36 +0000 (12:30 +0800)]
MDL-35981 comments: Make delete comment keyboard accessible.
Damyon Wiese [Mon, 29 Jul 2013 05:43:54 +0000 (13:43 +0800)]
MDL-36011 tablelib: Make column headers expand/collapse links accessible.
AMOS bot [Fri, 2 Aug 2013 00:38:30 +0000 (00:38 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Thu, 1 Aug 2013 20:21:15 +0000 (08:21 +1200)]
weekly release 2.6dev
Sam Hemelryk [Thu, 1 Aug 2013 20:17:40 +0000 (08:17 +1200)]
NOBUG: fix file permissions
Sam Hemelryk [Thu, 1 Aug 2013 20:11:35 +0000 (08:11 +1200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
sam marshall [Thu, 1 Aug 2013 13:11:57 +0000 (14:11 +0100)]
MDL-40320 Course page: Text greyed when conditional activity available
