Dan Poltawski [Mon, 7 Jan 2013 05:59:52 +0000 (13:59 +0800)]
Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle
Dan Poltawski [Mon, 7 Jan 2013 05:56:57 +0000 (13:56 +0800)]
Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 7 Jan 2013 05:53:14 +0000 (13:53 +0800)]
Merge branch 'w51_MDL-36893_m25_mnetestrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 7 Jan 2013 05:41:16 +0000 (13:41 +0800)]
Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 7 Jan 2013 05:30:24 +0000 (13:30 +0800)]
Merge branch 'MDL-27884-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 7 Jan 2013 04:39:45 +0000 (17:39 +1300)]
MDL-29996 filters: fixed bug when upgrading filter plugin names
Damyon Wiese [Thu, 20 Dec 2012 07:19:14 +0000 (15:19 +0800)]
MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
This allows anyone to view or modify anyone elses submission comments.
Ankit Agarwal [Mon, 25 Jun 2012 06:10:42 +0000 (14:10 +0800)]
MDL-33340 completion: Incorrect logic in hidden field check
Credit to Jody Steele
Sam Hemelryk [Mon, 7 Jan 2013 02:22:37 +0000 (15:22 +1300)]
Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle
Simon Coggins [Mon, 7 Jan 2013 02:09:20 +0000 (10:09 +0800)]
MDL-35991 - use PARAM_LOCALURL for local urls
Dan Poltawski [Mon, 7 Jan 2013 01:42:31 +0000 (09:42 +0800)]
Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 7 Jan 2013 01:15:50 +0000 (14:15 +1300)]
Merge branch 'MDL-37161-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 7 Jan 2013 00:45:15 +0000 (13:45 +1300)]
Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Jan 2013 00:40:08 +0000 (13:40 +1300)]
Merge branch 'MDL-37068' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 7 Jan 2013 00:35:25 +0000 (13:35 +1300)]
Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 6 Jan 2013 23:05:26 +0000 (12:05 +1300)]
Merge branch 'MDL-36855-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 6 Jan 2013 22:58:17 +0000 (11:58 +1300)]
Merge branch 'w51_MDL-37302_m25_roleedit' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 6 Jan 2013 22:40:11 +0000 (11:40 +1300)]
Merge branch 'wip-MDL-7660-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 6 Jan 2013 22:14:47 +0000 (11:14 +1300)]
Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Sun, 6 Jan 2013 22:06:41 +0000 (11:06 +1300)]
Merge branch 'MDL-35887_dnd_completion' of git://github.com/davosmith/moodle
Sam Hemelryk [Sun, 6 Jan 2013 21:15:38 +0000 (10:15 +1300)]
Merge branch 'MDL-16730-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 6 Jan 2013 20:53:06 +0000 (09:53 +1300)]
Merge branch 'w51_MDL-37105_m25_catlimit' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 6 Jan 2013 20:47:02 +0000 (09:47 +1300)]
Merge branch 'MDL-37359_master' of git://github.com/markn86/moodle
Sam Hemelryk [Sun, 6 Jan 2013 20:38:31 +0000 (09:38 +1300)]
Merge branch 'MDL-29327_none' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 6 Jan 2013 20:15:53 +0000 (09:15 +1300)]
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
Sam Hemelryk [Sun, 6 Jan 2013 20:09:50 +0000 (09:09 +1300)]
Merge branch 'w51_MDL-37315_m25_ldappaging' of git://github.com/skodak/moodle
Jean-Philippe Gaudreau [Fri, 4 Jan 2013 14:59:59 +0000 (09:59 -0500)]
MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course
Mark Nelson [Fri, 4 Jan 2013 07:23:12 +0000 (15:23 +0800)]
MDL-37359 groups: fixing typo in the web service function create_groupings_parameters
Damyon Wiese [Wed, 21 Nov 2012 08:26:47 +0000 (16:26 +0800)]
MDL-36712: Assignment - Do not always send feedback available emails when grade is created
The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".
Adrian Greeve [Fri, 21 Dec 2012 03:52:10 +0000 (11:52 +0800)]
MDL-7660 - mod_data: Changed the filepicker to filemanager for field elements.
This allows users to delete their files or pictures when editing their entries
which was previously unavailable.
Also the use of the filemanager allows for drag and drop to be active.
Andrew Davis [Fri, 21 Dec 2012 03:48:54 +0000 (11:48 +0800)]
MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used
Ankit Agarwal [Thu, 3 Jan 2013 06:40:03 +0000 (14:40 +0800)]
MDL-36855 scorm: update to api get_scorm_question_count()
get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
Ankit Agarwal [Wed, 2 Jan 2013 05:59:31 +0000 (13:59 +0800)]
MDL-27884 Implement proper username validation during csv import
Ankit Agarwal [Wed, 17 Oct 2012 08:06:06 +0000 (16:06 +0800)]
MDL-27884 blocks: Correcting config title string
AMOS BEGIN
CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END
Petr Škoda [Sun, 30 Dec 2012 16:02:18 +0000 (17:02 +0100)]
MDL-29996 remove deprecated stuff from filter code
Petr Škoda [Sun, 30 Dec 2012 11:04:29 +0000 (12:04 +0100)]
MDL-29996 remove legacy_filter support
Petr Škoda [Sun, 30 Dec 2012 11:02:48 +0000 (12:02 +0100)]
MDL-29996 remove unnecessary signed tricks
Eloy Lafuente (stronk7) [Sun, 30 Dec 2012 00:07:00 +0000 (01:07 +0100)]
weekly on-sync release 2.5dev
Petr Škoda [Sat, 29 Dec 2012 23:57:43 +0000 (00:57 +0100)]
MDL-37315 fix connection reopening in ldap paging
Petr Škoda [Thu, 27 Dec 2012 13:32:31 +0000 (14:32 +0100)]
MDL-36893 fix mnet E_STRICT issue
Petr Škoda [Thu, 27 Dec 2012 12:52:14 +0000 (13:52 +0100)]
MDL-37105 prevent fatal error when category limit reached
Petr Škoda [Thu, 27 Dec 2012 12:39:09 +0000 (13:39 +0100)]
MDL-37128 fix E_STRICT rss restore issue
Petr Škoda [Wed, 26 Dec 2012 11:02:08 +0000 (12:02 +0100)]
MDL-37302 allow admin to unassign any role on enrolment and other users pages
Petr Škoda [Fri, 21 Dec 2012 12:53:26 +0000 (13:53 +0100)]
MDL-37302 allow removal of enrol roles if plugin allows it
Dan Poltawski [Mon, 24 Dec 2012 04:23:03 +0000 (12:23 +0800)]
Merge branch 'MDL-37037-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 24 Dec 2012 03:34:40 +0000 (11:34 +0800)]
Merge branch 'w51_MDL-37233_m25_skype' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 24 Dec 2012 03:22:43 +0000 (11:22 +0800)]
Merge branch 'wip-MDL-37263-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 24 Dec 2012 02:54:51 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 24 Dec 2012 02:35:33 +0000 (10:35 +0800)]
Merge branch 'w51_MDL-37283_m25_spell' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Dec 2012 00:05:56 +0000 (13:05 +1300)]
MDL-37290 course: fixed up navbar when editing categories
Sam Hemelryk [Sun, 23 Dec 2012 22:43:59 +0000 (11:43 +1300)]
Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 23 Dec 2012 22:16:26 +0000 (11:16 +1300)]
Merge branch 'MDL-36966-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)]
Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Sun, 23 Dec 2012 20:40:55 +0000 (09:40 +1300)]
Merge branch 'wip-MDL-35653-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 23 Dec 2012 20:34:46 +0000 (09:34 +1300)]
Merge branch 'master_MDL-37225_static_cache_purge' of git://github.com/brki/moodle
Sam Hemelryk [Sun, 23 Dec 2012 20:30:35 +0000 (09:30 +1300)]
Merge branch 'MDL-36455_master' of git://github.com/markn86/moodle
Tim Hunt [Tue, 11 Dec 2012 16:21:05 +0000 (16:21 +0000)]
MDL-37068 qformat_learnwise: fix UTF8 and other issues.
Petr Škoda [Sat, 22 Dec 2012 15:44:55 +0000 (16:44 +0100)]
MDL-37283 import tinymce spellchecker 2.0.6.1
Petr Škoda [Sat, 22 Dec 2012 13:58:39 +0000 (14:58 +0100)]
MDL-37281 fix other users current navigation node
Petr Škoda [Fri, 21 Dec 2012 16:26:36 +0000 (17:26 +0100)]
MDL-37233 do not show skype status icon on https sites
Funny that the same company that implemented the IE security warnings is unable to set up SSL on the Skype status server…
Sam Hemelryk [Thu, 20 Dec 2012 21:50:07 +0000 (10:50 +1300)]
MDL-37263 cache: fixed event invalidation coding error
Petr Škoda [Sun, 9 Dec 2012 13:23:59 +0000 (14:23 +0100)]
MDL-36212 rework html entity conversions
This should resolve all html entity conversion problems in different PHP versions.
Eloy Lafuente (stronk7) [Thu, 20 Dec 2012 20:13:26 +0000 (21:13 +0100)]
weekly on-sync release 2.5dev
Eloy Lafuente (stronk7) [Thu, 20 Dec 2012 19:56:58 +0000 (20:56 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Charles Fulton [Tue, 3 Jul 2012 15:22:21 +0000 (08:22 -0700)]
MDL-4781 forum: show discussion link when user has ability to view discussion
Eloy Lafuente (stronk7) [Thu, 20 Dec 2012 09:22:46 +0000 (10:22 +0100)]
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
Jason Fowler [Fri, 7 Dec 2012 03:32:21 +0000 (11:32 +0800)]
MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button
Rajesh Taneja [Tue, 11 Dec 2012 08:50:30 +0000 (16:50 +0800)]
MDL-37015 Resource: link in onclick should not contain html special char
Dan Poltawski [Thu, 20 Dec 2012 00:45:04 +0000 (08:45 +0800)]
Revert "MDL-36704: wrap pending conditions in span tags"
This reverts commit
5e9fd83df8f2c175681fa5a81d36df5ee313cb1e.
AMOS bot [Thu, 20 Dec 2012 00:40:36 +0000 (00:40 +0000)]
Automatically generated installer lang files
Tim Hunt [Wed, 19 Dec 2012 09:31:02 +0000 (09:31 +0000)]
MDL-32245 question bank: update URL after moving question between categories.
Also, improve the URL when you go to edit the questions in a category.
Petr Škoda [Wed, 19 Dec 2012 08:54:53 +0000 (09:54 +0100)]
MDL-37171 fix some more E_STRICT issues
Credit goes to Mark Nelson, thanks.
Adrian Greeve [Fri, 30 Nov 2012 07:00:19 +0000 (15:00 +0800)]
MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.
Thanks to Tõnis Tartes for part of this solution.
When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.
When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.
I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
AMOS bot [Wed, 19 Dec 2012 00:41:59 +0000 (00:41 +0000)]
Automatically generated installer lang files
Brian King [Tue, 18 Dec 2012 22:57:22 +0000 (23:57 +0100)]
MDL-37225 reset cachstore_static store when purging
Eloy Lafuente (stronk7) [Tue, 18 Dec 2012 22:41:48 +0000 (23:41 +0100)]
Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle
Davo Smith [Tue, 18 Dec 2012 20:46:26 +0000 (20:46 +0000)]
MDL-35887 course dndupload - correct default used for completion tracking when resources created by drag and drop
Eloy Lafuente (stronk7) [Tue, 18 Dec 2012 20:36:42 +0000 (21:36 +0100)]
Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle
Didier Raboud [Tue, 18 Dec 2012 13:32:15 +0000 (14:32 +0100)]
MDL-37157: Normalize short answers before comparison
This ensures that ambiguous Unicode representations can be compared sanely.
Also add some tests to ensure it keeps working.
Thanks to Tim Hunt for the syntax check.
Dan Poltawski [Tue, 18 Dec 2012 06:57:43 +0000 (14:57 +0800)]
Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 18 Dec 2012 06:52:27 +0000 (14:52 +0800)]
Merge branch 'MDL-37014_webdav_folders' of git://github.com/davosmith/moodle
Dan Poltawski [Tue, 18 Dec 2012 06:26:55 +0000 (14:26 +0800)]
MDL-36259 - change case of table alias to match definition
Dan Poltawski [Tue, 18 Dec 2012 06:25:52 +0000 (14:25 +0800)]
Merge branch 'MDL-36259' of git://github.com/timhunt/moodle
Mark Nelson [Thu, 29 Nov 2012 06:12:58 +0000 (14:12 +0800)]
MDL-36455 blocks: removed ability to add blocks to the My Moodle page that did not make sense in that context
Damyon Wiese [Tue, 18 Dec 2012 01:02:15 +0000 (09:02 +0800)]
MDL-37037 Assignment Some minor refactoring of the previous patch
This just makes the control flow a bit easier to read.
I also added a continue button to take you back to the grading page.
Dan Poltawski [Tue, 18 Dec 2012 01:10:42 +0000 (09:10 +0800)]
Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle
Michael Aherne [Fri, 7 Dec 2012 15:34:58 +0000 (15:34 +0000)]
MDL-37037 assign Show message if no files to download
AMOS bot [Tue, 18 Dec 2012 00:45:13 +0000 (00:45 +0000)]
Automatically generated installer lang files
Damyon Wiese [Tue, 20 Nov 2012 06:56:03 +0000 (14:56 +0800)]
MDL-35740 Assignment: Change the assignment index page to use a renderer.
This also cleans up the patch to prevent students from seeing the number of submissions for the assignment.
Raymond Wijaya [Wed, 3 Oct 2012 03:55:20 +0000 (11:55 +0800)]
MDL-35740 Assignment: Hide the number of assignment submissions for all students that was visible to all students through the activities block
Raymond Wijaya [Mon, 3 Dec 2012 04:34:43 +0000 (15:04 +1030)]
MDL-36966 Assignment: Bug - Student submission appears graded by themselves.
Fix a bug when a student editing his submission after it has been graded, it changes the 'graded by' details to the student's name in the feeback summary
Eloy Lafuente (stronk7) [Mon, 17 Dec 2012 23:17:51 +0000 (00:17 +0100)]
Merge branch 'MDL-36842' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 17 Dec 2012 23:13:45 +0000 (00:13 +0100)]
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:43:00 +0000 (10:43 +1300)]
Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:40:46 +0000 (10:40 +1300)]
Merge branch 'MDL-36490_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:32:10 +0000 (10:32 +1300)]
Merge branch 'MDL-37035' of git://github.com/adrianfish/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:24:53 +0000 (10:24 +1300)]
Merge branch 'w50_MDL-37111_m25_forumsinglefirst' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:12:37 +0000 (10:12 +1300)]
Merge branch 'MDL-37176' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 17 Dec 2012 21:07:28 +0000 (10:07 +1300)]
Merge branch 'MDL-35530' of git://github.com/rwijaya/moodle
Jason Fowler [Thu, 8 Nov 2012 05:57:03 +0000 (13:57 +0800)]
MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user