Sam Hemelryk [Tue, 12 Nov 2013 03:34:39 +0000 (11:34 +0800)]
Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle
Adrian Greeve [Mon, 11 Nov 2013 09:18:16 +0000 (17:18 +0800)]
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.
Andrew Nicols [Mon, 11 Nov 2013 08:27:50 +0000 (16:27 +0800)]
MDL-42810 ActionMenu: Hide the ActionMenu when clicking on primary links
Marina Glancy [Tue, 12 Nov 2013 02:34:01 +0000 (13:34 +1100)]
Merge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 12 Nov 2013 02:27:22 +0000 (03:27 +0100)]
Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 12 Nov 2013 02:02:09 +0000 (10:02 +0800)]
Merge branch '42806-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 12 Nov 2013 00:23:51 +0000 (11:23 +1100)]
Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 11 Nov 2013 23:38:35 +0000 (00:38 +0100)]
Merge branch 'MDL-40481' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 11 Nov 2013 10:48:39 +0000 (21:48 +1100)]
Merge branch '42805-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 11 Nov 2013 10:34:48 +0000 (21:34 +1100)]
NOBUG: convert tabs to whitespaces
Marina Glancy [Mon, 11 Nov 2013 10:10:47 +0000 (21:10 +1100)]
Merge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Fri, 8 Nov 2013 08:24:50 +0000 (16:24 +0800)]
MDL-42783 Course: Improve accessiblity of various course actions
Marina Glancy [Mon, 11 Nov 2013 09:55:19 +0000 (20:55 +1100)]
Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle
Damyon Wiese [Mon, 11 Nov 2013 09:25:30 +0000 (17:25 +0800)]
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 11 Nov 2013 09:20:26 +0000 (17:20 +0800)]
MDL-42754 Messages: Fixed typo
Sam Hemelryk [Mon, 11 Nov 2013 09:18:23 +0000 (17:18 +0800)]
MDL-42806 block_mentees: can only be docked if it has a valid title set.
Damyon Wiese [Mon, 11 Nov 2013 09:16:51 +0000 (17:16 +0800)]
Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 11 Nov 2013 07:54:44 +0000 (15:54 +0800)]
MDL-41392 course: management checkbox accessibility improvement
Sam Hemelryk [Mon, 11 Nov 2013 09:09:44 +0000 (17:09 +0800)]
MDL-41392 course: management accessibility tweaking
Sam Hemelryk [Mon, 11 Nov 2013 08:51:06 +0000 (16:51 +0800)]
MDL-42806 dock: check title exists before using it
Sam Hemelryk [Mon, 11 Nov 2013 08:26:12 +0000 (16:26 +0800)]
MDL-42805 dock: fixed {} appearing in undock icon title
Jerome Mouneyrac [Mon, 11 Nov 2013 08:01:32 +0000 (16:01 +0800)]
MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install
Andrew Nicols [Mon, 11 Nov 2013 07:33:08 +0000 (15:33 +0800)]
MDL-42809 ActionMenu: Increase specifity of hide on select selector
Sam Hemelryk [Mon, 11 Nov 2013 06:10:21 +0000 (14:10 +0800)]
Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle
Ankit Agarwal [Mon, 11 Nov 2013 02:51:41 +0000 (10:51 +0800)]
MDL-42803 behat: Fix random behat errors in CI
Sam Hemelryk [Mon, 11 Nov 2013 05:10:44 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle
Damyon Wiese [Mon, 11 Nov 2013 04:40:21 +0000 (12:40 +0800)]
MDL-42699 Bootstrap tinymce css. Whitespace fix.
Jason Fowler [Thu, 7 Nov 2013 01:58:56 +0000 (09:58 +0800)]
MDL-42699 TinyMCE: adding padding to editor content in clean
Marina Glancy [Mon, 11 Nov 2013 04:02:48 +0000 (15:02 +1100)]
Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Marina Glancy [Mon, 11 Nov 2013 04:02:01 +0000 (15:02 +1100)]
Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Mon, 11 Nov 2013 03:39:27 +0000 (11:39 +0800)]
MDL-42081 EditPDF: Add default stamp images
Adrian Greeve [Wed, 30 Oct 2013 06:41:59 +0000 (14:41 +0800)]
MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
Adrian Greeve [Wed, 30 Oct 2013 06:41:33 +0000 (14:41 +0800)]
MDL-40612 libraries: Unit test expansion for get_all_user_name_fields()
and the inclusion of tests for set_user_name_object()
Damyon Wiese [Mon, 11 Nov 2013 02:41:40 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
Renaat Debleu [Mon, 11 Nov 2013 02:19:46 +0000 (10:19 +0800)]
MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
Damyon Wiese [Mon, 11 Nov 2013 02:17:07 +0000 (10:17 +0800)]
Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
version.php
Damyon Wiese [Mon, 11 Nov 2013 02:04:10 +0000 (10:04 +0800)]
MDL-36224 LTI: Whitespace fix
Damyon Wiese [Mon, 11 Nov 2013 01:57:36 +0000 (09:57 +0800)]
Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle
Andreas Grabs [Fri, 8 Nov 2013 09:42:49 +0000 (10:42 +0100)]
MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes
Damyon Wiese [Fri, 8 Nov 2013 08:15:17 +0000 (16:15 +0800)]
Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 8 Nov 2013 08:08:20 +0000 (16:08 +0800)]
Merge branch 'MDL-42743' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 8 Nov 2013 08:05:06 +0000 (16:05 +0800)]
Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 8 Nov 2013 07:32:11 +0000 (15:32 +0800)]
Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle
Rajesh Taneja [Fri, 8 Nov 2013 06:44:04 +0000 (14:44 +0800)]
MDL-42777 courses: Added behat to test ajax on course view page
Damyon Wiese [Fri, 8 Nov 2013 06:26:49 +0000 (14:26 +0800)]
MDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder.
Mark Nielsen [Fri, 26 Apr 2013 23:00:33 +0000 (16:00 -0700)]
MDL-36224: Improving lti_get_types
If there are no LTI source plugins that
need to be added to the activity chooser
menu, then fallback to the default
activity chooser display.
Mark Nielsen [Tue, 27 Nov 2012 17:26:01 +0000 (09:26 -0800)]
MDL-36224: Minor updates to LTI
* No debug display on service.php
* Send a 400 header on error
Chris Scribner [Mon, 29 Oct 2012 14:49:17 +0000 (10:49 -0400)]
MDL-36224: Adding subplugins.php
Chris Scribner [Mon, 29 Oct 2012 14:10:50 +0000 (10:10 -0400)]
MDL-36224: Add support for pluggable extensions to add new LTI services
Rajesh Taneja [Fri, 8 Nov 2013 05:59:15 +0000 (13:59 +0800)]
MDL-42777 courses: removed unneeded category check
On course view manage page, JS was not getting initalised as category-listing
is not visible, initialiseCourses is doing unnessary check for category as
it takes care of empty category so it should not return on empty category
Frederic Massart [Fri, 8 Nov 2013 03:11:08 +0000 (11:11 +0800)]
MDL-42772 upgrade: Force alternate fields in session user
Marina Glancy [Fri, 8 Nov 2013 05:37:55 +0000 (16:37 +1100)]
Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle
Frederic Massart [Fri, 8 Nov 2013 05:15:23 +0000 (13:15 +0800)]
MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()
Jason Fowler [Fri, 8 Nov 2013 04:48:53 +0000 (12:48 +0800)]
MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt
Jason Fowler [Thu, 7 Nov 2013 06:55:10 +0000 (14:55 +0800)]
MDL-42684 TinyMCE: make tinymce start at full width
Dan Poltawski [Fri, 8 Nov 2013 04:23:40 +0000 (12:23 +0800)]
MDL-42775 dml: remove invalid unit test assertion
Damyon Wiese [Fri, 8 Nov 2013 03:54:48 +0000 (11:54 +0800)]
MDL-42679 Scorm: Remove stale yui shifted css files.
Damyon Wiese [Fri, 8 Nov 2013 03:43:10 +0000 (11:43 +0800)]
Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle
Damyon Wiese [Fri, 8 Nov 2013 03:23:00 +0000 (11:23 +0800)]
Merge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Fri, 8 Nov 2013 03:13:24 +0000 (14:13 +1100)]
Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Fri, 8 Nov 2013 03:09:46 +0000 (11:09 +0800)]
MDL-42704 quiz statistics: make test more tolerant
Dan Poltawski [Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)]
Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
Marina Glancy [Fri, 8 Nov 2013 03:10:41 +0000 (14:10 +1100)]
Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 8 Nov 2013 03:02:35 +0000 (11:02 +0800)]
MDL-42666 repository_boxnet: fix broken version
The last commit here looked like Fred had broken the version,
but it was my mistake. I owe Fred a beer at the next available
opportunity.
Ankit Agarwal [Fri, 8 Nov 2013 02:49:35 +0000 (10:49 +0800)]
MDL-41586 libaries: Fix issues with scale in sqlsrv libraries
0 is a valid value
null is the default scale we set in other DBs
Marina Glancy [Fri, 8 Nov 2013 02:17:47 +0000 (13:17 +1100)]
MDL-40883 ddl: unittest for objects name length
Jason Fowler [Thu, 7 Nov 2013 23:22:59 +0000 (07:22 +0800)]
MDL-42660 TinyMCE: Ensure upgrade is only performed when possible
Conflicts:
lib/editor/tinymce/db/upgrade.php
Marina Glancy [Fri, 8 Nov 2013 00:58:35 +0000 (11:58 +1100)]
MDL-40883 ddl: make sure object name never exceeds max length
Many thanks to Ray Bon for finding the problem
Damyon Wiese [Fri, 8 Nov 2013 00:45:11 +0000 (08:45 +0800)]
Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle
Petr Škoda [Thu, 7 Nov 2013 22:51:59 +0000 (23:51 +0100)]
MDL-42769 use only text area editor before install completed
Jamie Pratt [Thu, 7 Nov 2013 10:28:58 +0000 (17:28 +0700)]
MDL-42704 quiz statistics : SQL Errors under MSSQL
Tim Hunt [Wed, 6 Nov 2013 12:32:30 +0000 (12:32 +0000)]
MDL-42743 improve wording of the CBM summary on quiz review
Dan Poltawski [Thu, 7 Nov 2013 10:10:55 +0000 (18:10 +0800)]
MDL-41615 question: fix unit tests
Heading levels have been changed.
Dan Poltawski [Thu, 7 Nov 2013 09:21:54 +0000 (17:21 +0800)]
Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 7 Nov 2013 09:17:32 +0000 (17:17 +0800)]
Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Yuliya [Thu, 7 Nov 2013 08:44:15 +0000 (21:44 +1300)]
MDL-39923 badges: Fix unit tests
Andrew Nicols [Thu, 7 Nov 2013 08:46:34 +0000 (16:46 +0800)]
MDL-40975 Course: Ensure that editinstructions line up with activity rename again
Marina Glancy [Thu, 7 Nov 2013 08:31:52 +0000 (19:31 +1100)]
Merge branch 'MDL-42748-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Thu, 7 Nov 2013 08:20:53 +0000 (16:20 +0800)]
Merge branch 'MDL-42668-master' of git://github.com/FMCorz/moodle
Jerome Mouneyrac [Thu, 7 Nov 2013 08:11:51 +0000 (16:11 +0800)]
MDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf
Andrew Nicols [Thu, 7 Nov 2013 03:02:19 +0000 (11:02 +0800)]
MDL-42679 mod_scorm: Include gallery-sm-treeview for https support
Frederic Massart [Thu, 7 Nov 2013 06:50:50 +0000 (14:50 +0800)]
MDL-42666 repository_boxnet: Do not run the upgrade multiple times
Frederic Massart [Thu, 7 Nov 2013 07:35:21 +0000 (15:35 +0800)]
MDL-42668 portfolio_boxnet: Do not run upgrade multiple times
Frederic Massart [Thu, 7 Nov 2013 06:29:35 +0000 (14:29 +0800)]
MDL-42668 portfolio_boxnet: Disable the portfolio when non-HTTPS
Frederic Massart [Wed, 6 Nov 2013 08:20:34 +0000 (16:20 +0800)]
MDL-42668 portfolio_boxnet: Disable the portfolio during upgrade
Frederic Massart [Tue, 5 Nov 2013 08:08:22 +0000 (16:08 +0800)]
MDL-42668 portfolio_boxnet: Notify the admins about the upgrade process
Frederic Massart [Mon, 4 Nov 2013 07:30:47 +0000 (15:30 +0800)]
MDL-42668 portfolio_boxnet: Migration to APIv2
Dan Poltawski [Thu, 7 Nov 2013 06:19:14 +0000 (14:19 +0800)]
Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle
Marina Glancy [Thu, 7 Nov 2013 06:17:42 +0000 (17:17 +1100)]
Merge branch 'w46_MDL-42708_m26_mymobile' of https://github.com/skodak/moodle
Marina Glancy [Thu, 7 Nov 2013 06:08:03 +0000 (17:08 +1100)]
Merge branch '42375-26' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Thu, 7 Nov 2013 06:00:01 +0000 (14:00 +0800)]
MDL-42375 course: management interface icon tweaks
* Drag and drop icon switched to a 12x12px icon.
* Drag and drop icon now uses cursor:pointer
* Improved alignment of the caret for course listing actions.
Frederic Massart [Thu, 7 Nov 2013 05:32:09 +0000 (13:32 +0800)]
MDL-42666 tests: Setting new Box.net mandatory arguments
Andrew Nicols [Thu, 7 Nov 2013 05:53:43 +0000 (13:53 +0800)]
MDL-42748 Theme: Add back missing overflow on help tooltips
Marina Glancy [Thu, 7 Nov 2013 05:31:01 +0000 (16:31 +1100)]
Merge branch 'MDL-42697-master' of git://github.com/andrewnicols/moodle
Rajesh Taneja [Thu, 7 Nov 2013 04:56:01 +0000 (12:56 +0800)]
MDL-42754 Messages: Show noreply user notifications
With fake noreply and support users, the notifications were not accessible by user
Support for viewing messages from noreply user has been added.
Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
Damyon Wiese [Thu, 7 Nov 2013 04:23:25 +0000 (12:23 +0800)]
Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Jason Fowler [Wed, 6 Nov 2013 04:14:02 +0000 (12:14 +0800)]
MDL-42660 TinyMCE: Shuffle icons in default toolbar layout
Jason Fowler [Wed, 6 Nov 2013 03:12:45 +0000 (11:12 +0800)]
MDL-42600 EditPDF: Fix padding etc on toolbars
Jason Fowler [Wed, 6 Nov 2013 01:40:46 +0000 (09:40 +0800)]
MDL-42660 Filepicker: Fix padding etc on filepicker/manager toolbars
Conflicts:
theme/bootstrapbase/style/moodle.css
Jason Fowler [Tue, 5 Nov 2013 09:04:22 +0000 (17:04 +0800)]
MDL-42660 TinyMCE: Fix padding etc to make TinyMCE work better on small screens
