Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 22:46:30 +0000 (00:46 +0200)]
Merge branch 'get_users_by_capability_fix_master' of github.com/timgus/moodle
Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 22:43:31 +0000 (00:43 +0200)]
Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 1 Jul 2013 22:31:48 +0000 (10:31 +1200)]
Merge branch 'MDL-39733' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 16 Jun 2013 15:02:27 +0000 (17:02 +0200)]
MDL-39733 xhprof: implement import of runs
Rossiani Wijaya [Tue, 28 May 2013 04:25:29 +0000 (12:25 +0800)]
MDL-39546 Lesson module: removed duplicate to decode special characters
Rossiani Wijaya [Mon, 1 Jul 2013 03:25:32 +0000 (11:25 +0800)]
MDL-39546 Lesson module: fixed matching question issues.
Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 21:13:39 +0000 (23:13 +0200)]
Merge branch 'w27_MDL-39754_m26_evn26' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 15:59:06 +0000 (17:59 +0200)]
Merge branch 'MDL-40370' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 1 Jul 2013 10:18:16 +0000 (11:18 +0100)]
MDL-40370 qtype_shortanswer: unique index upgrade problem.
Eliminate duplicate rows before we try to add a unique index. We
arbitrarily keep the duplicate row with the lowest id.
Petr Škoda [Mon, 1 Jul 2013 07:44:02 +0000 (09:44 +0200)]
MDL-39754 copy 2.5 requirements to Moodle 2.6
Optional features and warnings may be added later,
but we need at least required environment for 2.5.1
This includes database family cleanup and more realistic memory requirement.
Dan Poltawski [Mon, 1 Jul 2013 03:55:45 +0000 (11:55 +0800)]
Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle
Mark Nielsen [Mon, 1 Jul 2013 03:26:48 +0000 (11:26 +0800)]
MDL-40308: Privacy settings do not change
Update LTI mod form so checkboxes always submit their value.
Dan Poltawski [Mon, 1 Jul 2013 03:21:47 +0000 (11:21 +0800)]
Merge branch 'wip-MDL-40344-m26' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 1 Jul 2013 01:48:05 +0000 (13:48 +1200)]
Merge branch 'MDL-40069' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 1 Jul 2013 01:23:29 +0000 (13:23 +1200)]
NOBUG: fixed whitespace
Sam Hemelryk [Mon, 1 Jul 2013 01:22:27 +0000 (13:22 +1200)]
Merge branch 'wip-MDL-39741-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 1 Jul 2013 01:08:31 +0000 (13:08 +1200)]
Merge branch 'MDL-35206-email-links' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 30 Jun 2013 21:16:59 +0000 (09:16 +1200)]
MDL-19390 user: fixed typo during integration
Petr Škoda [Sun, 30 Jun 2013 09:10:17 +0000 (11:10 +0200)]
MDL-19390 add new option to send password to new users
Tim Hunt [Mon, 24 Jun 2013 16:18:43 +0000 (17:18 +0100)]
MDL-40069 question/type/upgrade.txt editing changes
Try to more clearly document what question type authors need to do to
upgrade their question types.
Colin Chambers [Fri, 7 Jun 2013 13:53:20 +0000 (14:53 +0100)]
MDL-40069 Document editing form changes
David Mudrák [Fri, 28 Jun 2013 11:10:10 +0000 (13:10 +0200)]
MDL-35206 Fix the links list enumeration in the html2text library
Sam Hemelryk [Fri, 28 Jun 2013 04:49:02 +0000 (16:49 +1200)]
MDL-39212 css: we now chunk and no longer separate
Eloy Lafuente (stronk7) [Mon, 20 May 2013 01:49:25 +0000 (03:49 +0200)]
MDL-39733 profiling: UI for importing runs
Eloy Lafuente (stronk7) [Mon, 20 May 2013 00:20:23 +0000 (02:20 +0200)]
MDL-39733 profiling: UI for exporting runs
Eloy Lafuente (stronk7) [Mon, 20 May 2013 00:15:54 +0000 (02:15 +0200)]
MDL-39733 xhprof: implement export of runs
Sam Hemelryk [Wed, 26 Jun 2013 22:05:35 +0000 (10:05 +1200)]
MDL-40344 navigation: expandable branch id is now properly unique
Petr Škoda [Wed, 26 Jun 2013 13:23:30 +0000 (15:23 +0200)]
MDL-39088 fix enrol migration redirect url
Thanks David for spotting it!
Petr Škoda [Wed, 26 Jun 2013 11:56:24 +0000 (13:56 +0200)]
MDL-39088 use word "Uninstall" consistently in plugin administration UI
Petr Škoda [Wed, 26 Jun 2013 11:43:00 +0000 (13:43 +0200)]
MDL-39088 migrate tinymce plugins uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:39:26 +0000 (13:39 +0200)]
MDL-39088 migrate admin tool uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:36:43 +0000 (13:36 +0200)]
MDL-39088 migrate report uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:33:22 +0000 (13:33 +0200)]
MDL-39088 migrate plagiarism uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:30:24 +0000 (13:30 +0200)]
MDL-39088 migrate module uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:28:27 +0000 (13:28 +0200)]
MDL-39088 migrate local uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:24:08 +0000 (13:24 +0200)]
MDL-39088 migrate enrol uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:19:00 +0000 (13:19 +0200)]
MDL-39088 migrate editor uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:14:31 +0000 (13:14 +0200)]
MDL-39088 migrate course format uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:07:23 +0000 (13:07 +0200)]
MDL-39088 migrate block uninstallation to plugin_manager
Petr Škoda [Wed, 26 Jun 2013 11:04:31 +0000 (13:04 +0200)]
MDL-39088 add new general uninstall url support to plugin manager
Eloy Lafuente (stronk7) [Thu, 27 Jun 2013 18:09:21 +0000 (20:09 +0200)]
weekly release 2.6dev
Eloy Lafuente (stronk7) [Thu, 27 Jun 2013 18:04:35 +0000 (20:04 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Marina Glancy [Thu, 27 Jun 2013 12:17:11 +0000 (22:17 +1000)]
MDL-39741 removed unused css classes
Marina Glancy [Thu, 27 Jun 2013 02:36:11 +0000 (12:36 +1000)]
MDL-39741 Use CSS class dimmed_text instead of hidden in grader report
AMOS bot [Thu, 27 Jun 2013 00:40:23 +0000 (00:40 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 26 Jun 2013 10:30:41 +0000 (12:30 +0200)]
Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle
Petr Škoda [Wed, 26 Jun 2013 07:50:33 +0000 (09:50 +0200)]
MDL-39701 prevent string filtering before finishing 2.5 upgrade
Eloy Lafuente (stronk7) [Tue, 25 Jun 2013 14:28:22 +0000 (16:28 +0200)]
Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle
Petr Škoda [Tue, 25 Jun 2013 13:15:46 +0000 (15:15 +0200)]
MDL-17081 allow role reset to self
The use case is importing of incomplete XML preset - keep current + preset changes. This also discards any pending changes.
Eloy Lafuente (stronk7) [Tue, 25 Jun 2013 10:08:15 +0000 (12:08 +0200)]
Merge branch 'MDL-40033_master' of git://github.com/dmonllao/moodle
Petr Škoda [Tue, 25 Jun 2013 08:18:22 +0000 (10:18 +0200)]
MDL-17081 fix invalid role XML schema
Sam Hemelryk [Tue, 25 Jun 2013 00:19:30 +0000 (12:19 +1200)]
Merge branch 'w26_MDL-40305_m26_phpunitloader' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 23:42:17 +0000 (01:42 +0200)]
Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jun 2013 23:35:57 +0000 (11:35 +1200)]
Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 24 Jun 2013 22:59:29 +0000 (10:59 +1200)]
Merge branch 'MDL-40304_master' of git://github.com/kordan/moodle
Petr Škoda [Mon, 24 Jun 2013 22:24:55 +0000 (00:24 +0200)]
MDL-17081 store also CAP_INHERIT in role export files
Sam Hemelryk [Mon, 24 Jun 2013 22:06:08 +0000 (10:06 +1200)]
MDL-40289 badges: version bump
Sam Hemelryk [Mon, 24 Jun 2013 21:59:24 +0000 (09:59 +1200)]
Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 24 Jun 2013 21:13:16 +0000 (09:13 +1200)]
Merge branch 'w26_MDL-40289_m26_badgescaps' of git://github.com/skodak/moodle
Petr Škoda [Mon, 24 Jun 2013 14:59:54 +0000 (16:59 +0200)]
MDL-40305 implement moodle specific phpunit testcase classloader
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 19:29:05 +0000 (21:29 +0200)]
Merge branch 'w26_MDL-40233_m26_frontset' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 19:24:00 +0000 (21:24 +0200)]
Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 19:13:01 +0000 (21:13 +0200)]
Merge branch 'w26_MDL-40254_m26_flatfile' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 18:21:22 +0000 (20:21 +0200)]
Merge branch 'MDL-34610' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 17:25:53 +0000 (19:25 +0200)]
Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 17:00:33 +0000 (19:00 +0200)]
Merge branch 'm26_MDL-40200_Notices_When_Viewing_Profile_Invalid_UserId' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 16:56:08 +0000 (18:56 +0200)]
Merge branch 'MDL-40258_master' of git://github.com/sam-moodle/moodle
Gareth J Barnard [Mon, 24 Jun 2013 16:06:12 +0000 (17:06 +0100)]
MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks.
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 15:23:29 +0000 (17:23 +0200)]
Merge branch 'MDL-40250-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 13:39:07 +0000 (15:39 +0200)]
Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle
kordan [Mon, 24 Jun 2013 13:36:32 +0000 (15:36 +0200)]
MDL-40304 theme_formal_white: improved the compliancy to coding rules in formal_white
Petr Škoda [Mon, 17 Jun 2013 09:27:42 +0000 (11:27 +0200)]
MDL-17081 add role export/import
This includes improved role creation, allowed roles are editable and other improvements.
Sam Hemelryk [Mon, 24 Jun 2013 03:43:19 +0000 (15:43 +1200)]
Merge branch 'wip-MDL-39044-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 24 Jun 2013 03:15:01 +0000 (15:15 +1200)]
Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jun 2013 02:43:00 +0000 (14:43 +1200)]
Merge branch 'MDL-39779' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 24 Jun 2013 02:30:49 +0000 (14:30 +1200)]
Merge branch 'MDL-39760-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 24 Jun 2013 02:19:20 +0000 (14:19 +1200)]
Merge branch 'MDL-39280-master-int' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 23 Jun 2013 23:44:20 +0000 (11:44 +1200)]
Merge branch 'mdl26dev-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle
Sam Hemelryk [Sun, 23 Jun 2013 23:42:29 +0000 (11:42 +1200)]
Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 23 Jun 2013 23:28:23 +0000 (11:28 +1200)]
MDL-38347 fixed whitespace
Sam Hemelryk [Sun, 23 Jun 2013 23:22:30 +0000 (11:22 +1200)]
Merge branch 'wip-MDL-38347-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 23 Jun 2013 23:05:51 +0000 (11:05 +1200)]
MDL-38376 mod_assign: fixed whitespace
Sam Hemelryk [Sun, 23 Jun 2013 22:30:19 +0000 (10:30 +1200)]
Merge branch 'MDL-28124_master' of git://github.com/lazydaisy/moodle
Amanda Doughty [Fri, 7 Jun 2013 19:33:30 +0000 (20:33 +0100)]
MDL-38376 mod_assign: Feedback displayed when Grade set to hidden
Sam Hemelryk [Sun, 23 Jun 2013 22:00:20 +0000 (10:00 +1200)]
Merge branch 'wip-MDL-38631-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Sun, 23 Jun 2013 20:57:44 +0000 (08:57 +1200)]
Merge branch 'MDL-39153-master' of git://github.com/ankitagarwal/moodle
Petr Škoda [Sun, 23 Jun 2013 19:37:56 +0000 (21:37 +0200)]
MDL-40254 ignore flatfile records with no user idnumber
Petr Škoda [Sun, 23 Jun 2013 19:24:15 +0000 (21:24 +0200)]
MDL-40294 remove references to removed plugin caches
Petr Škoda [Sun, 23 Jun 2013 10:33:40 +0000 (12:33 +0200)]
MDL-40289 fix block_badges capability defaults
Petr Škoda [Sun, 23 Jun 2013 10:22:31 +0000 (12:22 +0200)]
MDL-40289 fix all badges capabilities
1/ contextlevel must be the lowest level where capability can be overriden
2/ coursecreator is for course creation only!!!
3/ do not mix user with other archetypes
4/ config risk is for admin actions only in standard install
No upgrade cleanup, sorry, blame integrators...
Petr Škoda [Wed, 19 Jun 2013 15:44:31 +0000 (17:44 +0200)]
MDL-39701 prevent filters before finishing 2.5 upgrade
This prevents problems with unsigned integers in MySQL 5.5
Petr Škoda [Wed, 19 Jun 2013 09:04:17 +0000 (11:04 +0200)]
MDL-40233 add proper cache invalidation on frontpage setting save
Mary Evans [Sat, 22 Jun 2013 19:34:44 +0000 (20:34 +0100)]
MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files to enable dnd file uploader to work.
Matteo Scaramuccia [Sat, 15 Jun 2013 10:17:54 +0000 (12:17 +0200)]
MDL-40200 Administration: Return the invalid user message and stop there
To avoid adding duplicate code, 'invalid user' and 'user deleted' checks
have been merged together.
Marina Glancy [Wed, 19 Jun 2013 01:04:11 +0000 (11:04 +1000)]
MDL-38631 link categories in My courses only when needed
Dmytro Vorona [Mon, 25 Mar 2013 09:57:31 +0000 (10:57 +0100)]
MDL-38631 Fixed faulty add_category call, introduced in 758103
Tim Hunt [Fri, 21 Jun 2013 12:28:30 +0000 (13:28 +0100)]
MDL-34610 remove legacy IE CSS. It breaks form layout
Sam Chaffee [Thu, 20 Jun 2013 19:54:03 +0000 (15:54 -0400)]
MDL-40258: Fixed invalid json string error in file-picker
Brian King [Fri, 21 Jun 2013 09:12:21 +0000 (11:12 +0200)]
MDL-40130 Caching: let make_categories_list use the cache it makes
David Monllao [Tue, 18 Jun 2013 02:50:44 +0000 (10:50 +0800)]
MDL-40033 behat: Waiting until file manager is available