Dan Poltawski [Tue, 5 Aug 2014 18:14:15 +0000 (19:14 +0100)]
Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 5 Aug 2014 11:04:11 +0000 (13:04 +0200)]
Merge branch 'm28_MDL-46625' of https://github.com/totara/moodle
Damyon Wiese [Tue, 5 Aug 2014 08:22:36 +0000 (16:22 +0800)]
Merge branch 'wip_MDL-39840_m28_addonenv' of https://github.com/skodak/moodle
Petr Skoda [Mon, 21 Jul 2014 00:22:40 +0000 (12:22 +1200)]
MDL-39840 environment: add support for environment.xml in plugins
New features:
* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader
Damyon Wiese [Tue, 5 Aug 2014 07:52:50 +0000 (15:52 +0800)]
Merge branch 'wip-MDL-41639-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 5 Aug 2014 04:06:36 +0000 (12:06 +0800)]
Merge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle
Andrew Davis [Thu, 26 Jun 2014 12:10:11 +0000 (20:10 +0800)]
MDL-45897 blocks: added 3 new default blocks to /my
Eloy Lafuente (stronk7) [Tue, 5 Aug 2014 00:24:48 +0000 (02:24 +0200)]
Merge branch 'MDL-46641-delete-activity-step' of https://github.com/rlorenzo/moodle
Eloy Lafuente (stronk7) [Mon, 4 Aug 2014 15:10:38 +0000 (17:10 +0200)]
Merge branch 'MDL-44149-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 23 Jul 2014 04:15:56 +0000 (12:15 +0800)]
MDL-44149 Assign: Reopen attempts from quick grading (reopenuntilpass)
Marina Glancy [Mon, 4 Aug 2014 07:13:30 +0000 (15:13 +0800)]
Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle
Andrew Davis [Mon, 21 Jul 2014 02:40:13 +0000 (10:40 +0800)]
MDL-46447 core_rate: made sure non-ajax files don't return JSON data
Marina Glancy [Mon, 4 Aug 2014 06:24:04 +0000 (14:24 +0800)]
Merge branch 'MDL-44794-master' of git://github.com/lameze/moodle
Marina Glancy [Mon, 4 Aug 2014 06:23:38 +0000 (14:23 +0800)]
Merge branch 'MDL-43506-master' of git://github.com/andrewnicols/moodle
Simey Lameze [Tue, 22 Jul 2014 01:47:35 +0000 (09:47 +0800)]
MDL-44794 group: unit test for groups_get_user_groups method.
Simey Lameze [Tue, 22 Jul 2014 01:46:01 +0000 (09:46 +0800)]
MDL-44794 group: unit test for get_groups method.
Marina Glancy [Mon, 4 Aug 2014 03:23:10 +0000 (11:23 +0800)]
Merge branch 'MDL-44343-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 4 Aug 2014 03:22:53 +0000 (11:22 +0800)]
Merge branch 'MDL-46457' of git://github.com/aolley/moodle
Marina Glancy [Mon, 4 Aug 2014 03:22:36 +0000 (11:22 +0800)]
Merge branch 'MDL-46414-master' of git://github.com/sammarshallou/moodle
Andrew Nicols [Thu, 15 May 2014 06:12:35 +0000 (14:12 +0800)]
MDL-44343 mod_glossary: Show File attachments underneath content
Andrew Nicols [Thu, 15 May 2014 06:12:21 +0000 (14:12 +0800)]
MDL-44343 mod_forum: Show File attachments underneath content
Andrew Nicols [Sat, 28 Dec 2013 00:21:09 +0000 (08:21 +0800)]
MDL-43506 Blocks: Remove various deprecated functions
Eloy Lafuente (stronk7) [Sun, 3 Aug 2014 17:57:22 +0000 (19:57 +0200)]
Merge branch 'MDL-46620-master' of https://github.com/merrill-oakland/moodle
Andrew Davis [Fri, 1 Aug 2014 02:28:57 +0000 (10:28 +0800)]
MDL-46175 core_grading: updated grading related strings
Rex Lorenzo [Thu, 31 Jul 2014 18:29:00 +0000 (11:29 -0700)]
MDL-46641 behat: Delete activity step does not work without actions menu open
Dan Poltawski [Thu, 31 Jul 2014 08:37:11 +0000 (09:37 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 31 Jul 2014 08:37:08 +0000 (09:37 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
John Okely [Thu, 31 Jul 2014 04:22:57 +0000 (12:22 +0800)]
MDL-46465 mod_chat: Fix more user icon links
John Okely [Thu, 31 Jul 2014 02:22:48 +0000 (10:22 +0800)]
MDL-46465 mod_chat: Fix chat history user icon link
Brian Barnes [Wed, 30 Jul 2014 23:29:20 +0000 (11:29 +1200)]
MDL-46625 theme: Added a way to target the current page
Eric Merrill [Wed, 30 Jul 2014 19:22:44 +0000 (15:22 -0400)]
MDL-46620 messages Make sure full message is used for read marking
message_mark_message_read needs to have the full message object,
otherwise data will be lost.
Dan Poltawski [Wed, 30 Jul 2014 08:00:58 +0000 (09:00 +0100)]
Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"
This reverts commit
14a3ccc96da2c23fd5c34167d02e1323fb01d113, reversing
changes made to
4709708d4889e12f0f4a621ceaacb80c4cde6c51.
Marina Glancy [Wed, 30 Jul 2014 07:28:55 +0000 (15:28 +0800)]
Revert "Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle"
This reverts commit
68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2, reversing
changes made to
62d61619e80523e13b6f570fd9e130659c0a0d2e.
Damyon Wiese [Wed, 30 Jul 2014 04:06:20 +0000 (12:06 +0800)]
MDL-44116 Atto: Improve new accessibility sniffs.
Check for empty text it row, column headers and captions on tables.
Link to "Entire document" text instead of repeating the entire document if the text is long and has no headings.
sam marshall [Tue, 29 Jul 2014 17:32:22 +0000 (18:32 +0100)]
MDL-46414 Conditional availability: Dropdowns not set correctly when editing in IE
In IE, you cannot set the value of a dropdown to an integer; it has to be a string.
This caused a bug in several parts of the conditional availability editing
interface.
AMOS bot [Tue, 29 Jul 2014 16:05:28 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 29 Jul 2014 15:32:52 +0000 (16:32 +0100)]
Merge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 29 Jul 2014 15:11:02 +0000 (16:11 +0100)]
MDL-46591 filter_tex: improved string
Thanks to German Valero for noticing this and Matteo Scaramuccia, Daniel
Thies and Helen Foser for refining it.
Dan Poltawski [Tue, 29 Jul 2014 11:04:29 +0000 (12:04 +0100)]
Merge branch 'MDL-46236' of git://github.com/nobelium/moodle
Dan Poltawski [Tue, 29 Jul 2014 10:57:47 +0000 (11:57 +0100)]
Merge branch 'MDL-46456' of https://github.com/aolley/moodle
AMOS bot [Tue, 29 Jul 2014 08:02:17 +0000 (16:02 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 29 Jul 2014 07:50:37 +0000 (08:50 +0100)]
Merge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 29 Jul 2014 04:15:24 +0000 (16:15 +1200)]
Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 29 Jul 2014 04:10:34 +0000 (12:10 +0800)]
Merge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle
Marina Glancy [Tue, 29 Jul 2014 03:58:24 +0000 (11:58 +0800)]
Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:50:50 +0000 (15:50 +1200)]
Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)]
Merge branch 'MDL-45041' of git://github.com/jleyva/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:44:31 +0000 (15:44 +1200)]
Merge branch 'MDL-46460' of git://github.com/jleyva/moodle
Marina Glancy [Tue, 29 Jul 2014 01:50:22 +0000 (09:50 +0800)]
MDL-46338 enrol_self: Icon should indicate enrolment availability
Adam Olley [Tue, 29 Jul 2014 01:08:43 +0000 (10:38 +0930)]
MDL-46457 mod_lti: Render lti description through standard format_module_intro
Sam Hemelryk [Mon, 28 Jul 2014 21:37:44 +0000 (09:37 +1200)]
Merge branch 'MDL-44116-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 28 Jul 2014 20:46:49 +0000 (08:46 +1200)]
Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle
Sam Hemelryk [Mon, 28 Jul 2014 20:42:56 +0000 (08:42 +1200)]
Merge branch 'MDL-46446_rating_style' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 Jul 2014 16:25:04 +0000 (17:25 +0100)]
Merge branch 'MDL-46206-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:54:15 +0000 (12:54 +0100)]
Merge branch 'MDL-45594_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:49:13 +0000 (12:49 +0100)]
Merge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:47:30 +0000 (12:47 +0100)]
Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:01:24 +0000 (12:01 +0100)]
Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:59:02 +0000 (11:59 +0100)]
Merge branch 'MDL-46459' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:52:09 +0000 (11:52 +0100)]
Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:49:37 +0000 (11:49 +0100)]
Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:45:17 +0000 (10:45 +0100)]
Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:41:05 +0000 (10:41 +0100)]
Merge branch 'MDL-46397' of git://github.com/nobelium/moodle
Marina Glancy [Mon, 28 Jul 2014 08:00:48 +0000 (16:00 +0800)]
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
Jetha Chan [Fri, 25 Jul 2014 02:57:42 +0000 (10:57 +0800)]
MDL-46523 navigation: add body class when logged in as other role
Marina Glancy [Tue, 22 Jul 2014 09:05:06 +0000 (17:05 +0800)]
MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page
Nobelium [Mon, 28 Jul 2014 05:37:21 +0000 (05:37 +0000)]
MDL-46397 mod_scorm : binding cmi values with scoid
Andrew Davis [Wed, 23 Jul 2014 01:58:29 +0000 (09:58 +0800)]
MDL-46465 mod_chat: assorted coding style fixes
Sam Hemelryk [Mon, 28 Jul 2014 01:25:13 +0000 (13:25 +1200)]
Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)]
Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)]
Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:13:44 +0000 (12:13 +1200)]
Merge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)]
Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:46:03 +0000 (08:46 +1200)]
Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:37:42 +0000 (08:37 +1200)]
Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle
Nobelium [Sat, 26 Jul 2014 14:46:25 +0000 (14:46 +0000)]
MDL-46236 mod_scorm : Setting lauch options for scorm in popup
Juan Leyva [Fri, 25 Jul 2014 08:35:24 +0000 (10:35 +0200)]
MDL-45041 Web Service: add_user_device doesn't store entries for different users using the same push key
Juan Leyva [Wed, 23 Jul 2014 16:03:47 +0000 (18:03 +0200)]
MDL-46460 Web Services: Invalid check of grades visibility for missing grades
Juan Leyva [Wed, 23 Jul 2014 15:33:20 +0000 (17:33 +0200)]
MDL-46459 Web Services: Incorrect return parameters get_grades external function
Damyon Wiese [Wed, 23 Jul 2014 05:32:11 +0000 (13:32 +0800)]
MDL-46485 Assign: Fix when submitting to a group assignment from the default group
Damyon Wiese [Wed, 23 Jul 2014 05:31:25 +0000 (13:31 +0800)]
MDL-46485 Assign: New unit test to show error with group submission
Marina Glancy [Fri, 25 Jul 2014 06:29:55 +0000 (14:29 +0800)]
MDL-46525 enrol_cohort: fix JS error
Jason Fowler [Mon, 21 Jul 2014 00:19:08 +0000 (08:19 +0800)]
MDL-46206 Accessibility: Add aria role to footer image
Brian Barnes [Thu, 10 Jul 2014 23:28:54 +0000 (11:28 +1200)]
MDL-46325 behat: Fixed issue where 'teacher1' didn't exist
Frederic Massart [Wed, 2 Jul 2014 09:40:33 +0000 (17:40 +0800)]
MDL-8501 mod_forum: Behat test for neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 08:06:49 +0000 (16:06 +0800)]
MDL-8501 mod_forum: Adding links to navigate between discussions
Frederic Massart [Wed, 2 Jul 2014 04:34:28 +0000 (12:34 +0800)]
MDL-8501 mod_forum: Test coverage of neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 04:33:56 +0000 (12:33 +0800)]
MDL-8501 mod_forum: New function to retrieve discussion neighbours
Marina Glancy [Thu, 24 Jul 2014 02:03:36 +0000 (10:03 +0800)]
MDL-46503 behat: cohort generator allows to create cohort in category
Petr Skoda [Mon, 21 Jul 2014 06:21:54 +0000 (18:21 +1200)]
MDL-46449 fix username prompt in login block when authloginviaemail enabled
Daniel Thies [Thu, 24 Jul 2014 20:01:17 +0000 (15:01 -0500)]
MDL-45044 filter_tex: properly escape excutable pathnames for Windows
Tony Butler [Fri, 11 Jul 2014 13:39:14 +0000 (14:39 +0100)]
MDL-43908 mod_assign: Order submissions by course id then cm id
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Tony Butler [Fri, 11 Jul 2014 11:10:50 +0000 (12:10 +0100)]
MDL-43908 mod_assign: Remove redundant code and improve SQL query
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Tony Butler [Fri, 13 Jun 2014 09:36:09 +0000 (10:36 +0100)]
MDL-43908 mod_assign: Prevent notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Tony Butler [Wed, 29 Jan 2014 12:01:53 +0000 (12:01 +0000)]
MDL-43908 mod_assign: Defer notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Dan Poltawski [Thu, 24 Jul 2014 08:50:52 +0000 (09:50 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 24 Jul 2014 08:50:49 +0000 (09:50 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Thu, 24 Jul 2014 03:25:22 +0000 (11:25 +0800)]
MDL-46506 Assign: fix php warning on grant extension page
This code was missed when the extensionduedate was moved to the userflags table.
David Monllao [Thu, 24 Jul 2014 03:15:36 +0000 (11:15 +0800)]
MDL-46504 libraries: Fixing typo
Damyon Wiese [Thu, 24 Jul 2014 02:50:20 +0000 (10:50 +0800)]
MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup
