Jun Pataleta [Wed, 11 Oct 2017 03:07:14 +0000 (11:07 +0800)]
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 11 Oct 2017 01:37:30 +0000 (09:37 +0800)]
MDL-59921 calendar: fix missing course error on event form
Andrew Nicols [Wed, 11 Oct 2017 01:38:47 +0000 (09:38 +0800)]
Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:39:55 +0000 (01:39 +0200)]
Merge branch 'MDL-60300' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:34:17 +0000 (01:34 +0200)]
Merge branch 'MDL-60309-master-boostbackground' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:03:06 +0000 (01:03 +0200)]
Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:00:13 +0000 (01:00 +0200)]
Merge branch 'MDL-60364' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 22:00:10 +0000 (00:00 +0200)]
Merge branch 'MDL-55358-master' of https://github.com/davidknu/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 18:14:42 +0000 (20:14 +0200)]
Merge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 17:10:52 +0000 (19:10 +0200)]
Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle
Juan Leyva [Wed, 4 Oct 2017 19:01:50 +0000 (21:01 +0200)]
MDL-60396 mod_workshop: Add checks for maximum gradeover
Damyon Wiese [Tue, 10 Oct 2017 09:32:47 +0000 (17:32 +0800)]
Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle
Conflicts:
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 10 Oct 2017 09:17:56 +0000 (17:17 +0800)]
Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle
Jake Dallimore [Fri, 29 Sep 2017 01:43:43 +0000 (09:43 +0800)]
MDL-37361 completion: Consolidate icon logic and clarify web service
- Icon generation logic moved to the course renderer.
- Web service should return the completion info only, not HTML.
- JS modified to handle icon rendering in relevant cases.
Jake Dallimore [Mon, 4 Sep 2017 05:54:14 +0000 (13:54 +0800)]
MDL-37361 completion: minor code fixes.
Jake Dallimore [Fri, 2 Jun 2017 07:03:48 +0000 (15:03 +0800)]
MDL-37361 completion: accessibility fixes for completion overrides
- Fixed aria-roles for links acting as status override buttons
- Used custom_interaction_events for better activation handling
- Replaced core/notification with AMD modal which facilitates better
onhide focus control when cancelling or confirming the action.
Jake Dallimore [Fri, 7 Apr 2017 08:21:55 +0000 (16:21 +0800)]
MDL-37361 behat: added a test covering the activity completion report
Jake Dallimore [Mon, 3 Apr 2017 02:08:10 +0000 (10:08 +0800)]
MDL-37361 completion: make completion overrides visible to students
- Set icons in the course/renderer
- Use 'set' in lang strings for simplicity
- Code style fixes
Jake Dallimore [Mon, 3 Apr 2017 05:47:50 +0000 (13:47 +0800)]
MDL-37361 completion: automatic completion disabled when overridden
Changes:
- Activities with auto completion and a completion status overridden to
COMPLETION_COMPLETE are no longer processed by normal completion
triggers.
- All activities can still be completed by students when their
completion status has been overridden to COMPLETION_INCOMPLETE, via
either auto or manual triggers.
- Completion unit tests updated
Eiz Eddin Al Katrib [Fri, 17 Feb 2017 14:48:25 +0000 (14:48 +0000)]
MDL-37361 completion: Modified and Added phpunit tests
Eiz Eddin Al Katrib [Fri, 17 Feb 2017 14:48:02 +0000 (14:48 +0000)]
MDL-37361 completion: Enabled overriding activity completion status
Jun Pataleta [Tue, 10 Oct 2017 08:19:36 +0000 (16:19 +0800)]
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 10 Oct 2017 07:50:46 +0000 (15:50 +0800)]
MDL-59921 core_calendar: fix phpunit failures on event form
Jun Pataleta [Tue, 10 Oct 2017 07:26:38 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle
Simey Lameze [Tue, 10 Oct 2017 07:22:45 +0000 (15:22 +0800)]
MDL-59921 core_calendar: fix event form behat failures
Andrew Nicols [Tue, 10 Oct 2017 06:48:19 +0000 (14:48 +0800)]
Merge branch 'MDL-35429-master' of https://github.com/snake/moodle
Simey Lameze [Thu, 5 Oct 2017 07:20:37 +0000 (15:20 +0800)]
MDL-60092 core_calendar: remove unused calendar_get_upcoming method
Simey Lameze [Thu, 5 Oct 2017 07:18:19 +0000 (15:18 +0800)]
MDL-60092 block_calendar_upcoming: convert to template
Simey Lameze [Thu, 5 Oct 2017 07:16:50 +0000 (15:16 +0800)]
MDL-60092 core_calendar: new upcoming mini template
Jun Pataleta [Tue, 10 Oct 2017 05:30:34 +0000 (13:30 +0800)]
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 10 Oct 2017 05:05:31 +0000 (13:05 +0800)]
Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle
Damyon Wiese [Tue, 10 Oct 2017 04:46:55 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-59274-master' of git://github.com/marinaglancy/moodle
Jake Dallimore [Fri, 6 Oct 2017 03:12:22 +0000 (11:12 +0800)]
MDL-35429 backup: Only show relevant actions for automated backups
- Users without permission to download or restore won't see the
respective links.
- The 'Manage backup files' button for the 'automated' backup filearea
now requires the same permissions as downloading does for this filearea,
those being 'restore:userinfo' and 'backup:downloadfile'.
Marina Glancy [Sat, 30 Sep 2017 12:05:41 +0000 (20:05 +0800)]
MDL-59274 media_videojs: upgrade video.js library and plugins
Andrew Nicols [Tue, 10 Oct 2017 03:37:49 +0000 (11:37 +0800)]
Merge branch 'MDL-59694_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Tue, 10 Oct 2017 03:08:06 +0000 (11:08 +0800)]
Merge branch 'MDL-60205_group_hiding_clean' of git://github.com/davosmith/moodle
Damyon Wiese [Tue, 10 Oct 2017 02:54:27 +0000 (10:54 +0800)]
MDL-60046 participants: Update behat tests
The filter button was removed, so it needs to be removed from the tests.
Jun Pataleta [Tue, 10 Oct 2017 02:47:37 +0000 (10:47 +0800)]
Merge branch 'MDL-60238-master' of git://github.com/ankitagarwal/moodle
Jun Pataleta [Tue, 10 Oct 2017 02:10:09 +0000 (10:10 +0800)]
Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 10 Oct 2017 00:40:01 +0000 (08:40 +0800)]
Merge branch 'MDL-45366' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 9 Oct 2017 22:03:10 +0000 (00:03 +0200)]
Merge branch 'MDL-60070-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 9 Oct 2017 21:17:36 +0000 (23:17 +0200)]
Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 9 Oct 2017 21:11:08 +0000 (23:11 +0200)]
Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Mon, 9 Oct 2017 17:52:56 +0000 (19:52 +0200)]
Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 9 Oct 2017 08:18:36 +0000 (16:18 +0800)]
Merge branch 'MDL-60298' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 9 Oct 2017 06:05:57 +0000 (14:05 +0800)]
Merge branch 'MDL-60317' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 9 Oct 2017 05:58:49 +0000 (13:58 +0800)]
Merge branch 'MDL-59844-master' of git://github.com/Dagefoerde/moodle
David Monllao [Fri, 29 Sep 2017 08:50:26 +0000 (10:50 +0200)]
MDL-59694 analytics: Track processed analysables
Andrew Nicols [Mon, 9 Oct 2017 04:42:53 +0000 (12:42 +0800)]
Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 9 Oct 2017 02:37:19 +0000 (10:37 +0800)]
MDL-59897 accesslib: Remove unused reset
Andrew Nicols [Mon, 9 Oct 2017 02:31:34 +0000 (10:31 +0800)]
Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle
Jake Dallimore [Thu, 21 Sep 2017 03:36:23 +0000 (11:36 +0800)]
MDL-35429 roles: teachers and managers can restore automated backups
Changes the default for the 'moodle/restore:viewautomatedfilearea'
cap from 'Not set' to 'Allow' for the teacher and manager role
archetypes.
Jake Dallimore [Wed, 20 Sep 2017 08:42:28 +0000 (16:42 +0800)]
MDL-35429 restore: fixed downloading of automated backup files
Jake Dallimore [Wed, 20 Sep 2017 07:52:50 +0000 (15:52 +0800)]
MDL-35429 restore: capability clarification for automated backups
- added relevant cap check on restorefile.php to improve the error
message when attempting to restore automated backups. This cap is
already responsible for controlling restores from automated areas.
- Restored the 'viewautomatedfilearea' capabilities original lang
string.
Jun Pataleta [Wed, 23 Aug 2017 07:17:49 +0000 (15:17 +0800)]
MDL-59811 enrol: Move get_user_enrolment_actions logic to parent class
* These duplicated implementations can be simplified where the logic
can be moved to enrol_plugin::get_user_enrolment_actions() method
itself.
Jun Pataleta [Wed, 23 Aug 2017 07:18:22 +0000 (15:18 +0800)]
MDL-59811 enrol: Unit tests for get_user_enrolment_actions()
Simey Lameze [Tue, 19 Sep 2017 01:33:49 +0000 (09:33 +0800)]
MDL-60070 core_calendar: remove old iCal icon
Andrew Nicols [Mon, 9 Oct 2017 02:13:30 +0000 (10:13 +0800)]
Merge branch 'MDL-60012_form_neq_regression' of git://github.com/davosmith/moodle
Simey Lameze [Thu, 5 Oct 2017 07:14:41 +0000 (15:14 +0800)]
MDL-60092 core_calendar: add viewurl attribute to exporter
Simey Lameze [Mon, 9 Oct 2017 01:48:42 +0000 (09:48 +0800)]
MDL-59921 calendar: replace selector for groups events
Simey Lameze [Mon, 9 Oct 2017 01:35:51 +0000 (09:35 +0800)]
MDL-59921 calendar: replace selector for course events
Craig R Morton [Fri, 6 Jan 2017 05:48:07 +0000 (13:48 +0800)]
MDL-60309 theme_boost: Add background image filepicker to Boost
sam marshall [Tue, 22 Aug 2017 17:09:35 +0000 (18:09 +0100)]
MDL-59897 Accesslib: get_user_capability_course is slow
Jan Dageförde [Mon, 21 Aug 2017 13:57:24 +0000 (15:57 +0200)]
MDL-59889 oauth2: Remove check for storing new refresh token
Jan Dageförde [Wed, 16 Aug 2017 19:04:36 +0000 (21:04 +0200)]
MDL-59844 webdav: Add bearer auth method to WebDAV requests
Neill Magill [Fri, 29 Sep 2017 15:16:55 +0000 (16:16 +0100)]
MDL-60300 Quiz: Offline update time not set correctly
Neill Magill [Fri, 6 Oct 2017 09:36:06 +0000 (10:36 +0100)]
MDL-60364 Web service: E_ERROR in course_check_updates web service
The error stated that course_check_updates() is undefined, this function
is in the course lib.php file.
sam marshall [Wed, 4 Oct 2017 10:55:29 +0000 (11:55 +0100)]
MDL-60346 core_search: Solr connection ignores proxy settings
Jake Dallimore [Fri, 6 Oct 2017 06:34:29 +0000 (14:34 +0800)]
weekly release 3.4dev
Jake Dallimore [Fri, 6 Oct 2017 06:34:29 +0000 (14:34 +0800)]
NOBUG: Fixed file access permissions
Jake Dallimore [Fri, 6 Oct 2017 06:34:28 +0000 (14:34 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 5 Oct 2017 15:38:17 +0000 (17:38 +0200)]
MDL-59630 analytics: Unit tests fixes
Jun Pataleta [Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)]
Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 29 Sep 2017 03:16:57 +0000 (11:16 +0800)]
MDL-60096 calendar: Add JS for day view
Jun Pataleta [Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)]
Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 5 Oct 2017 06:56:57 +0000 (14:56 +0800)]
Merge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)]
Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle
Andrew Nicols [Thu, 5 Oct 2017 06:31:26 +0000 (14:31 +0800)]
MDL-60352 calendar: Do not select original event for collection
Simey Lameze [Thu, 5 Oct 2017 06:27:58 +0000 (14:27 +0800)]
MDL-59751 calendar: remove unused show_upcoming_events method
Andrew Nicols [Fri, 29 Sep 2017 03:16:20 +0000 (11:16 +0800)]
MDL-59751 calendar: Update JS to be more sharable
Simey Lameze [Fri, 29 Sep 2017 05:05:15 +0000 (13:05 +0800)]
MDL-59751 core_calendar: move code to avoid duplication
Simey Lameze [Fri, 29 Sep 2017 04:59:24 +0000 (12:59 +0800)]
MDL-59751 core_calendar: make upcoming view use AJAX
Simey Lameze [Fri, 29 Sep 2017 05:06:00 +0000 (13:06 +0800)]
MDL-59751 core_calendar: move new event button to header
Simey Lameze [Fri, 29 Sep 2017 04:48:13 +0000 (12:48 +0800)]
MDL-59751 core_calendar: add upcoming view templates
Simey Lameze [Fri, 29 Sep 2017 04:46:17 +0000 (12:46 +0800)]
MDL-59751 core_calendar: add calendar_upcoming exporter
Simey Lameze [Fri, 29 Sep 2017 04:43:48 +0000 (12:43 +0800)]
MDL-59751 core_calendar: add get_calendar_upcoming_view webservice
Jun Pataleta [Thu, 5 Oct 2017 03:00:47 +0000 (11:00 +0800)]
Merge branch 'MDL-59890-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 5 Oct 2017 02:14:35 +0000 (10:14 +0800)]
MDL-59890 calendar: Use calculated context instead of guessing
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)]
Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 21:06:17 +0000 (23:06 +0200)]
Merge branch 'MDL-60264-master' of git://github.com/jleyva/moodle
Abdullah Albanyan [Fri, 8 Sep 2017 23:13:51 +0000 (16:13 -0700)]
MDL-60002 js: Added a 'Save and show next' button to grading interface.
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 20:17:25 +0000 (22:17 +0200)]
MDL-59890 upgrade: bump redirect_if_major_update_required
Juan Leyva [Wed, 4 Oct 2017 11:09:59 +0000 (13:09 +0200)]
MDL-59241 mod_workshop: Fix testing found issues
- totalfilesize counting all submissions
- Improved function documentation
Juan Leyva [Wed, 4 Oct 2017 14:37:00 +0000 (16:37 +0200)]
MDL-59248 mod_workshop: Fix permissions checks
Jun Pataleta [Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)]
Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 4 Oct 2017 06:20:07 +0000 (14:20 +0800)]
MDL-59890 calendar: Reorganise data generation steps
* Reorganise the data generation steps to avoid creating cells with
empty string values.
Jun Pataleta [Wed, 4 Oct 2017 06:18:47 +0000 (14:18 +0800)]
MDL-59890 behat: Revert to checking if isset instead of not empty
Reverting changes made by commit
1957d33996309d6fd448ce34c8568b904f78953c
Jake Dallimore [Wed, 4 Oct 2017 05:42:51 +0000 (13:42 +0800)]
Merge branch 'MDL-57228' of git://github.com/timhunt/moodle
Derek Henderson [Tue, 10 Jan 2017 20:08:17 +0000 (15:08 -0500)]
MDL-55652 grades: Added timemodified as index grade tables
Added timemodified to grade_categories_history,
grade_items_history, grade_outcomes_history,and scale_history.
Jun Pataleta [Wed, 4 Oct 2017 03:19:33 +0000 (11:19 +0800)]
Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle
