Sam Hemelryk [Wed, 9 Oct 2013 19:34:11 +0000 (08:34 +1300)]
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 9 Oct 2013 10:16:56 +0000 (18:16 +0800)]
Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle
Petr Škoda [Sun, 29 Sep 2013 21:28:50 +0000 (23:28 +0200)]
MDL-42054 fix incorrect email redirection in unit tests
Dan Poltawski [Wed, 9 Oct 2013 09:23:44 +0000 (17:23 +0800)]
Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)]
Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:54:02 +0000 (16:54 +0800)]
Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
Rajesh Taneja [Wed, 9 Oct 2013 08:37:01 +0000 (16:37 +0800)]
MDL-42222 Assignment: Added type check before checking mimetype
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
Damyon Wiese [Wed, 9 Oct 2013 08:53:21 +0000 (16:53 +0800)]
MDL-40493 Question: Explain why setAdminUser is needed for tests
Dan Poltawski [Wed, 9 Oct 2013 08:46:56 +0000 (16:46 +0800)]
Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Wed, 9 Oct 2013 08:28:53 +0000 (16:28 +0800)]
Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:27:50 +0000 (16:27 +0800)]
Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle
Tim Hunt [Wed, 9 Oct 2013 08:14:24 +0000 (09:14 +0100)]
MDL-32188 fix type in question/engine/upgrade.txt
Damyon Wiese [Wed, 9 Oct 2013 06:42:23 +0000 (14:42 +0800)]
Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 9 Oct 2013 05:30:40 +0000 (13:30 +0800)]
Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:09:10 +0000 (12:09 +0800)]
Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)]
Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
Jason Fowler [Tue, 24 Sep 2013 06:55:40 +0000 (14:55 +0800)]
MDL-39776 Javascript - enable formautosubmit from a select box on android
Sam Hemelryk [Wed, 9 Oct 2013 03:25:22 +0000 (16:25 +1300)]
Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 9 Oct 2013 03:20:32 +0000 (11:20 +0800)]
MDL-40046 events: Use correct variable for page instance id
Dan Poltawski [Wed, 9 Oct 2013 03:16:34 +0000 (11:16 +0800)]
Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 9 Oct 2013 02:57:30 +0000 (15:57 +1300)]
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Dan Poltawski [Wed, 9 Oct 2013 02:54:24 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 9 Oct 2013 02:27:07 +0000 (10:27 +0800)]
Merge branch 'mdl41908-master' of https://github.com/tlock/moodle
Damyon Wiese [Wed, 9 Oct 2013 01:39:09 +0000 (09:39 +0800)]
Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:48:45 +0000 (01:48 +0200)]
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Sam Hemelryk [Tue, 8 Oct 2013 23:41:36 +0000 (12:41 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:29:17 +0000 (01:29 +0200)]
Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:26:52 +0000 (01:26 +0200)]
Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle
Petr Škoda [Tue, 8 Oct 2013 21:21:34 +0000 (23:21 +0200)]
MDL-40493 question: set real $USER before testing question walktrough
Petr Škoda [Tue, 8 Oct 2013 21:08:27 +0000 (23:08 +0200)]
MDL-41792 fix calendar test typos
Sam Hemelryk [Tue, 8 Oct 2013 20:23:53 +0000 (09:23 +1300)]
Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 Oct 2013 19:54:46 +0000 (08:54 +1300)]
Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges
Petr Škoda [Mon, 30 Sep 2013 20:39:21 +0000 (22:39 +0200)]
MDL-16073 add test for connection to external database for authentication and enrolments
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:25:46 +0000 (21:25 +0200)]
Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:23:56 +0000 (21:23 +0200)]
Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Tue, 1 Oct 2013 18:55:12 +0000 (14:55 -0400)]
MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED
Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.
FORUM_TRACKING_ON retained but marked depreciated.
Eric Merrill [Thu, 26 Sep 2013 14:47:46 +0000 (10:47 -0400)]
MDL-29663 forum: Option to allow Forced for read tracking.
Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.
With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.
The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)]
Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Oct 2013 08:42:17 +0000 (16:42 +0800)]
Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 8 Oct 2013 08:19:25 +0000 (16:19 +0800)]
Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)]
Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle
Petr Škoda [Tue, 8 Oct 2013 07:57:09 +0000 (09:57 +0200)]
MDL-42199 fix course revision test
Dan Poltawski [Tue, 8 Oct 2013 07:19:09 +0000 (15:19 +0800)]
Merge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle
Ankit Agarwal [Wed, 2 Oct 2013 07:45:55 +0000 (15:45 +0800)]
MDL-40053 events: Replace add_to_log() with new events in core_notes
Ankit Agarwal [Thu, 3 Oct 2013 03:11:11 +0000 (11:11 +0800)]
MDL-40053 events: Write unit tests for note events
Ankit Agarwal [Wed, 2 Oct 2013 08:47:49 +0000 (16:47 +0800)]
MDL-40053 events: write events for core_notes
Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed
Ankit Agarwal [Wed, 2 Oct 2013 08:19:41 +0000 (16:19 +0800)]
MDL-40053 events: Generator for core_notes
Damyon Wiese [Tue, 8 Oct 2013 06:43:14 +0000 (14:43 +0800)]
Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle
Dan Poltawski [Tue, 8 Oct 2013 06:33:27 +0000 (14:33 +0800)]
Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 1 Oct 2013 05:48:35 +0000 (13:48 +0800)]
MDL-40060 mod_book: Replace add_to_log with events
Damyon Wiese [Tue, 8 Oct 2013 05:47:49 +0000 (13:47 +0800)]
Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:33:25 +0000 (13:33 +0800)]
Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:25:12 +0000 (13:25 +0800)]
Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 8 Oct 2013 05:21:30 +0000 (13:21 +0800)]
Merge branch 'MDL-38655' of git://github.com/aolley/moodle
Damyon Wiese [Tue, 8 Oct 2013 04:48:10 +0000 (12:48 +0800)]
Merge branch 'MDL-42122' of git://github.com/aolley/moodle
Damyon Wiese [Tue, 8 Oct 2013 04:45:43 +0000 (12:45 +0800)]
Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 Oct 2013 03:04:05 +0000 (16:04 +1300)]
Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 8 Oct 2013 02:31:56 +0000 (10:31 +0800)]
MDL-23692 login: Revert change to files copyright
Damyon Wiese [Tue, 8 Oct 2013 02:30:57 +0000 (10:30 +0800)]
Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 8 Oct 2013 01:43:36 +0000 (14:43 +1300)]
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Conflicts:
lib/db/upgrade.php
Damyon Wiese [Tue, 1 Oct 2013 04:05:09 +0000 (12:05 +0800)]
MDL-41993 Atto: Strip yui ids from generated HTML.
Marina Glancy [Tue, 8 Oct 2013 01:03:15 +0000 (12:03 +1100)]
Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle
Marina Glancy [Tue, 8 Oct 2013 00:52:39 +0000 (11:52 +1100)]
Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 22:20:51 +0000 (11:20 +1300)]
Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle
Petr Škoda [Mon, 7 Oct 2013 19:57:07 +0000 (21:57 +0200)]
MDL-41197 normalize ascii text conversion
Sam Hemelryk [Mon, 7 Oct 2013 19:52:42 +0000 (08:52 +1300)]
Merge branch 'MDL-42188' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 7 Oct 2013 19:48:43 +0000 (08:48 +1300)]
Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 7 Oct 2013 19:44:13 +0000 (21:44 +0200)]
MDL-42188 shifter: delete some orphaned files
Sam Hemelryk [Mon, 7 Oct 2013 19:27:46 +0000 (08:27 +1300)]
Merge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)]
Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle
Petr Škoda [Fri, 4 Oct 2013 20:40:44 +0000 (22:40 +0200)]
MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
Peter Bulmer [Mon, 7 Oct 2013 10:29:29 +0000 (23:29 +1300)]
MDL-23692 forgotpw:adhere to site autocomp setting
Damyon Wiese [Mon, 7 Oct 2013 07:58:59 +0000 (15:58 +0800)]
MDL-31830 course: Remove unused shifter built js files
Peter Bulmer [Mon, 5 Aug 2013 02:14:55 +0000 (14:14 +1200)]
MDL-23692 forgotpw: Coding style tidyups.
Damyon Wiese [Mon, 7 Oct 2013 07:28:45 +0000 (15:28 +0800)]
Merge branch '31830-26' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 7 Oct 2013 05:48:52 +0000 (18:48 +1300)]
MDL-31830 course: fixed up minor points as noted by Damyon's integration review
* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button
rwijaya [Mon, 7 Oct 2013 04:40:16 +0000 (12:40 +0800)]
MDL-35926 notification dialog: trap tab focus within dialog modal.
Sam Hemelryk [Mon, 7 Oct 2013 04:38:25 +0000 (17:38 +1300)]
Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 6 Oct 2013 20:13:23 +0000 (09:13 +1300)]
MDL-31830 course: management behat tests corrected after fixes
Dan Poltawski [Mon, 7 Oct 2013 03:26:37 +0000 (11:26 +0800)]
Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 7 Oct 2013 02:51:45 +0000 (15:51 +1300)]
Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 02:40:48 +0000 (15:40 +1300)]
Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges
Conflicts:
badges/assertion.php
Adrian Greeve [Mon, 7 Oct 2013 02:02:44 +0000 (10:02 +0800)]
MDL-42098 - mod_forum: Update webservice sql query to include all name fields.
Sam Hemelryk [Mon, 7 Oct 2013 00:43:08 +0000 (13:43 +1300)]
Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 6 Oct 2013 23:50:29 +0000 (12:50 +1300)]
Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Thu, 3 Oct 2013 23:59:32 +0000 (12:59 +1300)]
MDL-31830 course: several management interface improvements
* Tidied up course detail permissions so that user is not shown information they couldn't access elsewhere.
* category link dimming now accounts for course creation as an action as well.
* category single select when in courses view mode is now limited to courses user can action in.
* There is now a check at the start of the management page to redirect to course/index.php if the user isn't able to manage in any category.
* Tweaked navigation again, to give the limited users a navbar structure similar to the system cap'd user.
* Cancelling a category delete now takes you back to the category you were viewing.
* Fixed undefined notice
* Improved placement of course request and approval links.
* Several styling tweaks/improvements to the base theme.
* Several styling tweaks/improvements to the bootstrapbase theme.
Sam Hemelryk [Wed, 2 Oct 2013 23:15:34 +0000 (12:15 +1300)]
MDL-31830 course: improvements to JS coding style
Sam Hemelryk [Wed, 2 Oct 2013 21:28:58 +0000 (10:28 +1300)]
MDL-31830 course: fixed interface issues with limited user
* Navigation/settings now show best available option.
* Resorting categories works now for limited access user.
* Display of up and down arrows corrected.
* Checkboxes no longer displayed if an action can't be performed.
Sam Hemelryk [Wed, 2 Oct 2013 02:32:09 +0000 (15:32 +1300)]
MDL-31830 course: management interface fixes as noted
* Fixed the highlighing of the default category when no categories have been selected.
* Fixed the bug preventing the action menu for AJAX loaded categories from functioning.
* Repositioned course idnumber infront of course actions.
* Fixed display of moveup on first item and movedown on last item (courses and categories)
* Fixed up resort selected categories string.
Sam Hemelryk [Mon, 30 Sep 2013 20:40:29 +0000 (09:40 +1300)]
MDL-31830 course: renamed functions for consistency
* course_move_by_one => course_change_sortorder_by_one
* course_move_after_course => course_move_after_course
* helper::action_course_move_after_course => helper::action_course_change_sortorder_after_course
* helper::action_course_moveup => helper::action_course_change_sortorder_up_one
* helper::action_course_movedown => helper::action_course_change_sortorder_down_one
* helper::action_course_moveup_by_record => helper::action_course_change_sortorder_up_one_by_record
* helper::action_course_movedown_by_record => helper::action_course_change_sortorder_down_one_by_record
* helper::action_category_movedown => helper::action_category_change_sortorder_down_one
* helper::action_category_movedown_by_id => helper::action_category_change_sortorder_down_one_by_id
* helper::action_category_moveup => helper::action_category_change_sortorder_up_one
* helper::action_category_moveup_by_id => helper::action_category_change_sortorder_up_one_by_id
* coursecat::move_by_one => coursecat::change_sortorder_by_one
Sam Hemelryk [Mon, 30 Sep 2013 20:02:08 +0000 (09:02 +1300)]
MDL-31830 course: several small code improvements
* I can rebase this for you/the integrator before it goes in for sure no probs :)
* Fixed double phpdoc block of course_change_visibility
* Moved permission checks out of course_move_after_course and into helper function.
* Reviewed setType calls for editcategory_form.php.
* Reviewed all uses of can_resort and added more specific methods.
* Fixed method mentioned in exception for resort methods.
* Converted calls to fetch courses to call get_course.
* Exceptions now thrown when trying to move courses and problems arise.
* Fixed unnecessary namespace hinting in core_course_management_renderer.
* Abstracted common logic of can_resort_any and can_change_parent_any.
* Removed check for system level capability from has_manage_capability_on_any.
* Reviewed debugging calls I've introduced.
Sam Hemelryk [Mon, 30 Sep 2013 02:31:46 +0000 (15:31 +1300)]
MDL-31830 course: added behat test of category creation
Sam Hemelryk [Sun, 29 Sep 2013 20:08:07 +0000 (09:08 +1300)]
MDL-31830 core_course: new course category management interface
* Implemented a new course and category management page.
* Deprecated the old management interface.
* Unit tests to cover the new API and core functions.
* Behat tests to cover the new interface.
Matteo Scaramuccia [Sun, 6 Oct 2013 14:17:31 +0000 (16:17 +0200)]
MDL-40226 Files: Added the correct MIME Type for JNLP files.
JNLP stands for Java Network Launch Protocol, used to launch
Java Web Start applications. More details in:
http://docs.oracle.com/javase/tutorial/deployment/webstart/deploying.html
Marina Glancy [Fri, 4 Oct 2013 13:26:03 +0000 (23:26 +1000)]
MDL-42016 repository: Implement new sync method in repositories
Marina Glancy [Fri, 13 Sep 2013 09:37:26 +0000 (19:37 +1000)]
MDL-42016 repository: Simplify API to sync external files
Too many functions, too different parameters, unnecessary DB queries.
All repositories developed for Moodle 2.3-2.5 will continue to work.
Also get rid of DB field files_reference.lifetime, it is not used by
anybody except repository itself.
Marina Glancy [Sun, 6 Oct 2013 06:22:36 +0000 (17:22 +1100)]
MDL-42016 files: Properly synchronise internal references
Tim Hunt [Thu, 3 Oct 2013 15:25:39 +0000 (16:25 +0100)]
MDL-32188 question CBM: use short certainty name in response summaries.