Dan Poltawski [Mon, 21 May 2012 05:26:36 +0000 (13:26 +0800)]
Merge branch 'MDL-33079' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 21 May 2012 02:06:00 +0000 (14:06 +1200)]
MDL-32709 Pre-integration trivial clean up
* Added a comment for the BOOK_NUM_* defines.
* Fixed broken redirects in tool/importhtml/index.php
* Fixed typo in book_preload_chapters [subchpaters => subchapters]
* Fixed copy paste docblock error in tool/print/locallib.php
* Removed the .gitignore file as Eloy had previously mentioned that.
Eloy Lafuente (stronk7) [Sun, 20 May 2012 23:50:20 +0000 (01:50 +0200)]
MDL-32709 book: finish coding style review (errors only)
Eloy Lafuente (stronk7) [Sun, 20 May 2012 23:27:40 +0000 (01:27 +0200)]
MDL-32709 book: fix send_stored_file() call
Eloy Lafuente (stronk7) [Sun, 20 May 2012 23:26:52 +0000 (01:26 +0200)]
MDL-32709 book: delete some not needed stuff
Eloy Lafuente (stronk7) [Sun, 20 May 2012 22:54:53 +0000 (00:54 +0200)]
MDL-32709 book: now standard module + new strings added
Note the lang file is completely disordered yet
Eloy Lafuente (stronk7) [Sun, 20 May 2012 22:33:58 +0000 (00:33 +0200)]
MDL-32709 book: Fix logs handling
Eloy Lafuente (stronk7) [Tue, 15 May 2012 01:12:32 +0000 (03:12 +0200)]
MDL-32709 book: DB definition & upgrade cleanup
Eloy Lafuente (stronk7) [Mon, 14 May 2012 23:58:37 +0000 (01:58 +0200)]
MDL-32709 book: coding style, deprecated and minor fixes
Eloy Lafuente (stronk7) [Tue, 1 May 2012 00:13:32 +0000 (02:13 +0200)]
MDL-32709 book: replace some deprecated stuff. Some pending yet, blame $PAGE
Eloy Lafuente (stronk7) [Mon, 30 Apr 2012 23:06:50 +0000 (01:06 +0200)]
MDL-32709 book: Add some missing MOODLE_INTERNALs
Eloy Lafuente (stronk7) [Mon, 30 Apr 2012 22:44:06 +0000 (00:44 +0200)]
MDL-32709 book: general comments and phpdocs cleanup
Eloy Lafuente (stronk7) [Sun, 20 May 2012 19:43:40 +0000 (21:43 +0200)]
Subtree merged git://github.com/skodak/moodle-mod_book.git (master branch) into mod/book
Eloy Lafuente (stronk7) [Sat, 19 May 2012 10:24:31 +0000 (12:24 +0200)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Sat, 19 May 2012 10:17:09 +0000 (12:17 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
AMOS bot [Sat, 19 May 2012 00:31:42 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 18 May 2012 11:02:30 +0000 (13:02 +0200)]
MDL-32005 Avoid some notices restoring old backup files without idnumber
Dan Poltawski [Fri, 18 May 2012 09:40:33 +0000 (17:40 +0800)]
Merge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle
Adrian Greeve [Fri, 18 May 2012 08:39:53 +0000 (16:39 +0800)]
MDL-32126 replaced _order with sortorder to make sorting work in oracle
Andrew Robert Nicols [Fri, 18 May 2012 09:28:53 +0000 (10:28 +0100)]
MDL-30617 Center dialogue title
Andrew Robert Nicols [Fri, 18 May 2012 08:55:04 +0000 (09:55 +0100)]
MDL-30617 Adjustments to styling of module chooser
These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'
Dan Poltawski [Fri, 18 May 2012 07:08:07 +0000 (15:08 +0800)]
MDL-32727 - quiz: fix incorrect variable name in upgrade
Dan Poltawski [Fri, 18 May 2012 06:56:00 +0000 (14:56 +0800)]
MDL-24419 section availability: display availability info to teachers
Dan Poltawski [Fri, 18 May 2012 04:46:13 +0000 (12:46 +0800)]
MDL-30617 lang: improve mod chooser strings
Dan Poltawski [Fri, 18 May 2012 04:12:51 +0000 (12:12 +0800)]
Merge branch 'MDL-33048' of git://github.com/timhunt/moodle
Sam Hemelryk [Fri, 18 May 2012 04:07:20 +0000 (16:07 +1200)]
Merge branch 'MDL-32727' of git://github.com/timhunt/moodle
Conflicts:
mod/quiz/db/upgrade.php
Dan Poltawski [Fri, 18 May 2012 03:23:47 +0000 (11:23 +0800)]
Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Fri, 18 May 2012 03:05:28 +0000 (11:05 +0800)]
Merge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 18 May 2012 02:30:22 +0000 (10:30 +0800)]
Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 18 May 2012 02:28:19 +0000 (10:28 +0800)]
Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 18 May 2012 02:05:32 +0000 (10:05 +0800)]
Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign
AMOS bot [Fri, 18 May 2012 00:31:47 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Thu, 17 May 2012 23:35:07 +0000 (01:35 +0200)]
MDL-33079 Enable IMS-CC export (backup converter)
Sam Hemelryk [Thu, 17 May 2012 22:48:23 +0000 (10:48 +1200)]
Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 17 May 2012 22:06:42 +0000 (00:06 +0200)]
MDL-32941 Add transaction support to delete_categories
Eloy Lafuente (stronk7) [Thu, 17 May 2012 20:13:28 +0000 (22:13 +0200)]
MDL-32941 Reorganise functions a bit
Eloy Lafuente (stronk7) [Thu, 17 May 2012 20:35:57 +0000 (22:35 +0200)]
Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle
Conflicts:
course/externallib.php
lib/db/services.php
version.php
Dan Poltawski [Thu, 17 May 2012 15:35:14 +0000 (23:35 +0800)]
MDL-30617 modchoser: minor tweaks
* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string
Andrew Robert Nicols [Fri, 25 Nov 2011 10:20:34 +0000 (10:20 +0000)]
MDL-30617 Add a javascript interface for adding modules to a course
This interface allows for additional metadata, such as the module's help
and icon, to be displayed.
Helen Foster [Mon, 14 May 2012 15:56:09 +0000 (16:56 +0100)]
MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.
AMOS BEGIN
REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
Tim Hunt [Thu, 17 May 2012 09:58:29 +0000 (10:58 +0100)]
MDL-33048 quiz / my moodle: fatal error due to missing include.
Dan Poltawski [Thu, 17 May 2012 13:19:37 +0000 (21:19 +0800)]
Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 17 May 2012 13:04:30 +0000 (21:04 +0800)]
Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 17 May 2012 12:46:21 +0000 (20:46 +0800)]
Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)]
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
sam marshall [Thu, 17 May 2012 12:37:33 +0000 (13:37 +0100)]
MDL-24419 Fix bug with section creation for new courses
Andrew Robert Nicols [Thu, 17 May 2012 10:49:53 +0000 (11:49 +0100)]
MDL-33073 Fix application of toolbox JS for drag/dropped content
Dan Poltawski [Thu, 17 May 2012 09:26:50 +0000 (17:26 +0800)]
MDL-33069 assignment: change pluralname to (2.2)
Aparup Banerjee [Thu, 17 May 2012 09:17:37 +0000 (17:17 +0800)]
Merge branch 'MDL-32087' of git://github.com/timhunt/moodle
Aparup Banerjee [Thu, 17 May 2012 08:57:01 +0000 (16:57 +0800)]
Merge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 17 May 2012 08:48:07 +0000 (16:48 +0800)]
Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Thu, 17 May 2012 06:47:44 +0000 (14:47 +0800)]
Merge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:33:42 +0000 (14:33 +0800)]
Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:30:30 +0000 (14:30 +0800)]
Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:11:14 +0000 (14:11 +0800)]
Merge branch 'MDL-31814' of git://github.com/timhunt/moodle
Jerome Mouneyrac [Thu, 17 May 2012 05:36:40 +0000 (13:36 +0800)]
MDL-32941 fix criteriaerror exception code + wrong phpdoc scope
Dan Poltawski [Thu, 17 May 2012 04:35:45 +0000 (12:35 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 03:57:12 +0000 (11:57 +0800)]
MDL-24419: redirect_if_major_upgrade_required version update
The conditional topics changes need users to go to /admin/index.php
Dan Poltawski [Thu, 17 May 2012 03:29:04 +0000 (11:29 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 03:19:02 +0000 (11:19 +0800)]
Merge branch 'MDL-24419' of git://github.com/stronk7/moodle
Sam Hemelryk [Thu, 17 May 2012 02:55:21 +0000 (14:55 +1200)]
Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 17 May 2012 02:49:03 +0000 (14:49 +1200)]
Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle
Jerome Mouneyrac [Fri, 11 May 2012 06:37:59 +0000 (14:37 +0800)]
Fix codecheck/moodlechecker errors
Jerome Mouneyrac [Fri, 11 May 2012 04:33:17 +0000 (12:33 +0800)]
MDL-32941 change category name limit from 30 to 255
Fábio Souto [Wed, 11 Apr 2012 14:28:07 +0000 (15:28 +0100)]
MDL-32941 Implement core_course_update_categories, add webform and unittests
Conflicts:
admin/webservice/testclient_forms.php
course/externallib.php
lib/db/services.php
Jerome Mouneyrac [Tue, 8 May 2012 08:04:53 +0000 (16:04 +0800)]
MDL-32941 use + operator instead array merge to avoid duplicate. Sort resulting array for better display to the client and for entring in the excluding algo. Exception reformatting. Minor formatting fixes.
Eloy Lafuente (stronk7) [Fri, 4 May 2012 00:29:28 +0000 (02:29 +0200)]
MDL-32941 external: core_course_get_categories() fixing.
This includes:
- Multiple coding violations.
- Better detection of criteria, avoiding troublemaker 0 != ''
- Minor formatting.
- Ordering by path always to cause excludes to work ok.
jleyva [Fri, 27 Apr 2012 08:20:21 +0000 (10:20 +0200)]
MDL-32941 Some changes to the core_course_get_categories functions. Adding key parameters
Jerome Mouneyrac [Tue, 3 Apr 2012 07:03:24 +0000 (15:03 +0800)]
MDL-32941 parameters moved on top level, little performance improvement, filter and format the description, browse all sub categories level and adjust checks
Fábio Souto [Thu, 16 Feb 2012 18:12:46 +0000 (18:12 +0000)]
MDL-32941 Add implementation for core_course_get_categories()
Fábio Souto [Thu, 29 Dec 2011 12:10:34 +0000 (12:10 +0000)]
MDL-32941 Added service definition and implementation for core_course_delete_categories()
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)
Conflicts:
admin/webservice/testclient_forms.php
lib/db/services.php
Fábio Souto [Wed, 28 Mar 2012 17:29:17 +0000 (18:29 +0100)]
MDL-32941 complete unit tests and webform
Jerome Mouneyrac [Thu, 15 Mar 2012 03:06:24 +0000 (11:06 +0800)]
MDL-32941 improve create_categories() web service function (wip)
Fábio Souto [Thu, 29 Dec 2011 14:07:42 +0000 (14:07 +0000)]
MDL-32941 Create service definition and implementation for
core_course_create_categories()
Sam Hemelryk [Thu, 17 May 2012 02:24:40 +0000 (14:24 +1200)]
Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Thu, 17 May 2012 00:57:56 +0000 (02:57 +0200)]
MDL-24419 (6): Backup and restore fixes and improvements
- annotate used grouping
- reorganize restore methods
- roll availability dates
- observe $CFG->enableavailability
- observe $CFG->enablegroupmembersonly
- TODO: 2 TODOs
Damyon Wiese [Thu, 10 May 2012 07:44:32 +0000 (15:44 +0800)]
MDL-32903: Remove unused variable $tempsettings from mod_assign
This was left over from when I removed all the pass by reference calls.
Sam Hemelryk [Thu, 17 May 2012 00:30:44 +0000 (12:30 +1200)]
Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 17 May 2012 00:27:50 +0000 (12:27 +1200)]
Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 16 May 2012 23:54:07 +0000 (11:54 +1200)]
Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Wed, 16 May 2012 23:53:08 +0000 (11:53 +1200)]
Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Wed, 16 May 2012 23:29:38 +0000 (11:29 +1200)]
MDL-22504 course-dndupload: Fixed up a couple of minor bugs
Sam Hemelryk [Wed, 16 May 2012 22:55:35 +0000 (10:55 +1200)]
Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle
Conflicts:
course/lib.php
theme/base/style/course.css
Eloy Lafuente (stronk7) [Wed, 16 May 2012 22:51:50 +0000 (00:51 +0200)]
MDL-24419 (5): Coding style cleanup
Sam Hemelryk [Wed, 16 May 2012 22:09:27 +0000 (10:09 +1200)]
MDL-32881 Prevent course/view.php from being cached
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.
This reverts commit
3aaa1843999eeb1832331ec5c8b30865fdba9710.
Eloy Lafuente (stronk7) [Wed, 16 May 2012 21:48:50 +0000 (23:48 +0200)]
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
Conflicts:
lib/db/upgrade.php
lib/phpunit/lib.php
version.php
Fixed:
lib/db/upgrade.php - duplicate course->sectioncache add code
lib/db/install.xml - cleanup needed because xmldb editor was not used
lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
Eloy Lafuente (stronk7) [Wed, 16 May 2012 14:28:59 +0000 (16:28 +0200)]
NOBUG: Minibump to get latest WS installed
Eloy Lafuente (stronk7) [Wed, 16 May 2012 14:23:00 +0000 (16:23 +0200)]
Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 16 May 2012 14:10:47 +0000 (16:10 +0200)]
MDL-32233 core_course_duplicate_course: Forcing backup and restore in MODE_SAMESITE always as suggested by Eloy.
Juho Viitasalo [Fri, 2 Mar 2012 13:16:07 +0000 (15:16 +0200)]
MDL-31850 wiki: extra whitespace removed from form
Juan Leyva [Wed, 16 May 2012 10:10:09 +0000 (12:10 +0200)]
MDL-32233 core_course_duplicate_course: Fixed integrator review details described here tracker.moodle.org/browse/MDL-32233?focusedCommentId=157707&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157707
Andrew Robert Nicols [Wed, 16 May 2012 09:56:45 +0000 (10:56 +0100)]
MDL-33025 Ensure that hitting cancel clears the resource title editor
Andrew Robert Nicols [Wed, 16 May 2012 09:46:09 +0000 (10:46 +0100)]
MDL-33025 Ensure that popups aren't triggered when editing resource titles
Eloy Lafuente (stronk7) [Wed, 16 May 2012 09:41:48 +0000 (11:41 +0200)]
Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 16 May 2012 08:45:40 +0000 (10:45 +0200)]
MDL-32662 core_group_xxx_groupings: Fixed integrator review potential problem detected in update_groupings. More info: tracker.moodle.org/browse/MDL-32662?focusedCommentId=157706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157706
Aparup Banerjee [Wed, 16 May 2012 07:59:07 +0000 (15:59 +0800)]
Merge branch 'MDL-32633' of git://github.com/timhunt/moodle
Davo Smith [Wed, 16 May 2012 07:25:22 +0000 (08:25 +0100)]
MDL-22504 Course drag and drop upload - moved file locations
Aparup Banerjee [Wed, 16 May 2012 06:32:51 +0000 (14:32 +0800)]
Merge branch 'MDL-31657' of git://github.com/scriby/moodle
Aparup Banerjee [Wed, 16 May 2012 06:03:56 +0000 (14:03 +0800)]
Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle
Aparup Banerjee [Wed, 16 May 2012 05:49:32 +0000 (13:49 +0800)]
MDL-32921 lti : reused a moodle_url.