David Mudrák [Wed, 20 Jun 2012 09:48:42 +0000 (11:48 +0200)]
MDL-33430 Make file_storage::unpack_reference() more picky on what it gets
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:34:52 +0000 (10:34 +0200)]
Moodle release 2.3beta
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:29:12 +0000 (10:29 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)]
Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
Conflicts:
mod/assign/version.php
Aparup Banerjee [Mon, 18 Jun 2012 08:03:08 +0000 (16:03 +0800)]
Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle
Aparup Banerjee [Mon, 18 Jun 2012 08:02:34 +0000 (16:02 +0800)]
MDL-30337 theme : cleanup after conflict.
Dan Poltawski [Mon, 18 Jun 2012 07:35:05 +0000 (15:35 +0800)]
Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)]
Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 15 Jun 2012 08:16:52 +0000 (16:16 +0800)]
MDL-33775 Course: fix redirect to course/section in paged mode
Dan Poltawski [Mon, 18 Jun 2012 07:07:10 +0000 (15:07 +0800)]
Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 18 Jun 2012 06:34:35 +0000 (14:34 +0800)]
Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 18 Jun 2012 05:49:16 +0000 (13:49 +0800)]
Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 05:43:36 +0000 (13:43 +0800)]
Merge branch 'MDL-33779' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jun 2012 05:28:07 +0000 (13:28 +0800)]
Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 05:12:56 +0000 (13:12 +0800)]
Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 04:17:49 +0000 (12:17 +0800)]
Merge branch 'MDL-33327-2' of git://github.com/netspotau/moodle-mod_assign
Nadav Kavalerchik [Sat, 21 Apr 2012 15:22:21 +0000 (18:22 +0300)]
MDL - RTL Theme fixes for Moodle 2 (theme/canvas)
Right align Forms in Report pages (when in RTL mode)
Nadav Kavalerchik [Sat, 21 Apr 2012 15:20:42 +0000 (18:20 +0300)]
MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align Fields in forms (when in RTL mode)
Conflicts:
theme/base/style/course.css
Nadav Kavalerchik [Tue, 17 Apr 2012 11:11:33 +0000 (14:11 +0300)]
MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align item's content (when viewing a Glossary activity in RTL mode)
Conflicts:
mod/glossary/styles.css
Nadav Kavalerchik [Tue, 17 Apr 2012 11:10:38 +0000 (14:10 +0300)]
MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align content (when viewing a Lesson activity in RTL mode)
Nadav Kavalerchik [Tue, 17 Apr 2012 11:00:23 +0000 (14:00 +0300)]
MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Support for blocks columns switch when in rtl mode:
theme/base/layout/frontpage.php
theme/base/layout/general.php
Right align course completion checkbox to the right side of the activities and resources, when in RTL mode
theme/base/style/course.css
Right align DOCK bar, when in RTL mode
theme/base/style/dock.css
First-name and Last-name Initials (filter) bar (on every users list) letters spacing (usability issue, NOT RTL issue)
theme/base/style/core.css
Conflicts:
theme/base/style/core.css
theme/base/style/course.css
Adrian Greeve [Thu, 14 Jun 2012 06:55:08 +0000 (14:55 +0800)]
MDL-33603 - data - added another sql query to allow links to records to work.
Rajesh Taneja [Fri, 15 Jun 2012 08:43:01 +0000 (16:43 +0800)]
MDl-33607 wiki-2: check subwiki before fetching it from db
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 00:37:00 +0000 (02:37 +0200)]
MDL-33794 version.php: Bump all versions, requires and dependencies to
2012061700
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 00:17:03 +0000 (02:17 +0200)]
MDL-33794 assign: fix some incorrect function names
Eloy Lafuente (stronk7) [Sun, 17 Jun 2012 17:29:44 +0000 (19:29 +0200)]
MDL-33794 version.php: Fix some missing bits before bump.
Damyon Wiese [Sun, 17 Jun 2012 14:40:54 +0000 (22:40 +0800)]
MDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade items.
AMOS bot [Sat, 16 Jun 2012 00:31:27 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 18:29:04 +0000 (20:29 +0200)]
on-demand release 2.3dev
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 17:32:39 +0000 (19:32 +0200)]
MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
Tim Hunt [Fri, 15 Jun 2012 13:02:15 +0000 (14:02 +0100)]
MDL-33779 question: code clean-up
Dan Poltawski [Fri, 15 Jun 2012 10:38:35 +0000 (18:38 +0800)]
Merge branch 'MDL-33756' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 10:16:56 +0000 (12:16 +0200)]
Merge branch 'MDL-33726' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 10:07:59 +0000 (12:07 +0200)]
Merge branch 'w24_MDL-33768_m23_filters' of git://github.com/skodak/moodle
Aparup Banerjee [Fri, 15 Jun 2012 08:26:56 +0000 (16:26 +0800)]
Merge branch 'MDL-33769-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Wed, 13 Jun 2012 14:18:08 +0000 (22:18 +0800)]
MDL-30337 Themes : RTL fixes for filepicker and filemanager
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 08:12:53 +0000 (10:12 +0200)]
MDL-32279 filters: filters: setup() before filter() is better.
Petr Skoda [Fri, 15 Jun 2012 07:50:45 +0000 (09:50 +0200)]
MDL-33768 enable activitynames filter by default in new installs
Petr Skoda [Fri, 15 Jun 2012 07:44:58 +0000 (09:44 +0200)]
MDL-33768 enable multimedia filter by default in new installs
Andrew Robert Nicols [Fri, 15 Jun 2012 07:16:11 +0000 (08:16 +0100)]
MDL-33769 Switch Submit and Cancel buttons around on Activity Chooser
Damyon Wiese [Fri, 15 Jun 2012 06:42:19 +0000 (14:42 +0800)]
MDL-33699: Allow grades of 0 in assignment quickgrading
Aparup Banerjee [Fri, 15 Jun 2012 06:54:10 +0000 (14:54 +0800)]
Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle
Dongsheng Cai [Sun, 10 Jun 2012 07:47:00 +0000 (17:47 +1000)]
MDL-33513: Make files->source field consistent
Dan Poltawski [Fri, 15 Jun 2012 04:17:40 +0000 (12:17 +0800)]
MDL-33468 - fix illegal whitespace
Dan Poltawski [Fri, 15 Jun 2012 04:14:49 +0000 (12:14 +0800)]
Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 15 Jun 2012 04:10:34 +0000 (12:10 +0800)]
Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Fri, 15 Jun 2012 03:57:22 +0000 (11:57 +0800)]
MDL-32279 filter: fix undefined variable
Dan Poltawski [Fri, 15 Jun 2012 03:30:33 +0000 (11:30 +0800)]
Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 15 Jun 2012 03:07:48 +0000 (11:07 +0800)]
Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 15 Jun 2012 03:02:47 +0000 (11:02 +0800)]
Merge branch 'MDL-32279' of git://github.com/stronk7/moodle
Frederic Massart [Fri, 15 Jun 2012 02:12:57 +0000 (10:12 +0800)]
MDL-33758 Filepicker: using iframe instead of popup windows for download
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 00:27:18 +0000 (02:27 +0200)]
MDL-33756 backup: converters only available in general course backups.
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 23:24:18 +0000 (01:24 +0200)]
MDL-32279 filters: add documentation to upgrade.txt
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 17:51:35 +0000 (19:51 +0200)]
MDL-32279 glossary filter: take rid of unused courseid variable in yui module.
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 17:50:22 +0000 (19:50 +0200)]
MDL-32279 glossary filter: implement the setup() method.
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 17:49:13 +0000 (19:49 +0200)]
MDL-32279 filters: add support for setup() methods in filters.
Aparup Banerjee [Thu, 14 Jun 2012 13:29:45 +0000 (21:29 +0800)]
Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle
Aparup Banerjee [Thu, 14 Jun 2012 13:09:55 +0000 (21:09 +0800)]
Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle
Andrew Robert Nicols [Thu, 14 Jun 2012 10:30:13 +0000 (11:30 +0100)]
MDL-33731 Add exception for closebutton when drag/dropping activity chooser
Jerome Mouneyrac [Thu, 14 Jun 2012 10:16:03 +0000 (18:16 +0800)]
MDL-33730 missing description field cause error when call is done on default values
Dan Poltawski [Thu, 14 Jun 2012 09:24:49 +0000 (17:24 +0800)]
MDL-33726 course: don't list labels in section summary
Its a special 'non-activity' kind of activity ;-)
Aparup Banerjee [Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)]
Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 7 Jun 2012 01:29:40 +0000 (09:29 +0800)]
MDL-33442 Course: actions bring you back where you came from
Dan Poltawski [Thu, 14 Jun 2012 08:32:03 +0000 (16:32 +0800)]
Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 14 Jun 2012 08:23:08 +0000 (16:23 +0800)]
Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Jun 2012 08:21:04 +0000 (16:21 +0800)]
MDL-33550 reset repository static cache between unit tests
Martin Dougiamas [Thu, 14 Jun 2012 08:04:16 +0000 (16:04 +0800)]
MDL-33156 pix: standardise image icons for course pages
Damyon Wiese [Thu, 14 Jun 2012 07:29:06 +0000 (15:29 +0800)]
MDL-33697: Merge the 2 assignment notification types
This is the best solution until Moodle supports capabilities on module message providers.
Unfortunately we already changed the mod_assignment language string so I can't put an AMOS
command to copy the new string.
Damyon Wiese [Fri, 25 May 2012 06:47:58 +0000 (14:47 +0800)]
MDL-33327: Layout changes for the assignment grading table
Move the grading actions to a single drop down list above the header
Move the grading options below the grading table (although that is inconsistent)
Conflicts:
mod/assign/gradingtable.php
mod/assign/locallib.php
Marina Glancy [Thu, 14 Jun 2012 06:52:31 +0000 (14:52 +0800)]
MDL-33550 Set default status for file =0 and correct setting user in phpunit test
Dan Poltawski [Thu, 14 Jun 2012 05:57:06 +0000 (13:57 +0800)]
Sam Hemelryk [Thu, 14 Jun 2012 05:28:26 +0000 (17:28 +1200)]
MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test
Sam Hemelryk [Tue, 12 Jun 2012 04:49:18 +0000 (16:49 +1200)]
MDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines siblings and doesn't reorder
Sam Hemelryk [Thu, 14 Jun 2012 04:37:08 +0000 (16:37 +1200)]
Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:29:14 +0000 (12:29 +0800)]
Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:25:50 +0000 (12:25 +0800)]
Merge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 14 Jun 2012 04:22:39 +0000 (12:22 +0800)]
Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 14 Jun 2012 04:20:14 +0000 (12:20 +0800)]
Merge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 14 Jun 2012 04:12:39 +0000 (12:12 +0800)]
MDL-27156 - version bump for new capability
Dan Poltawski [Thu, 14 Jun 2012 04:00:18 +0000 (12:00 +0800)]
Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle
Damyon Wiese [Thu, 14 Jun 2012 03:23:27 +0000 (11:23 +0800)]
MDL-33718: Help text change for assignment module.
Dan Poltawski [Thu, 14 Jun 2012 03:12:21 +0000 (11:12 +0800)]
Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Thu, 14 Jun 2012 02:56:40 +0000 (10:56 +0800)]
MDL-33400 Lib : fixed character miscount
Dan Poltawski [Thu, 14 Jun 2012 02:52:59 +0000 (10:52 +0800)]
MDL-33513 repositories - fix misleading phpdocs
Dan Poltawski [Thu, 14 Jun 2012 02:28:34 +0000 (10:28 +0800)]
MDL-33400 questionlib - minor whitespace/equality imporvement
Dan Poltawski [Thu, 14 Jun 2012 02:27:23 +0000 (10:27 +0800)]
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
Andrew Davis [Mon, 11 Jun 2012 10:21:46 +0000 (17:21 +0700)]
MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size()
Andrew Davis [Fri, 8 Jun 2012 10:23:47 +0000 (17:23 +0700)]
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()
Andrew Davis [Tue, 27 Mar 2012 10:42:53 +0000 (17:42 +0700)]
MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions
Damyon Wiese [Thu, 14 Jun 2012 01:14:40 +0000 (09:14 +0800)]
MDL-33464: Do not create a grade item on upgrade (mod_assign) because we already reassigned the old one
Sam Hemelryk [Wed, 13 Jun 2012 23:31:46 +0000 (11:31 +1200)]
Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 13 Jun 2012 23:27:37 +0000 (11:27 +1200)]
Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Wed, 13 Jun 2012 23:20:16 +0000 (11:20 +1200)]
Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Wed, 13 Jun 2012 17:26:19 +0000 (01:26 +0800)]
MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix
Eloy Lafuente (stronk7) [Wed, 13 Jun 2012 16:01:31 +0000 (18:01 +0200)]
Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 13 Jun 2012 14:40:07 +0000 (16:40 +0200)]
Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle
Petr Skoda [Wed, 13 Jun 2012 14:37:56 +0000 (16:37 +0200)]
MDL-33635 improve collatorlib::ksort() coding style and perf
Thanks Eloy Lafuente for spotting my sloppy coding style!
Dan Poltawski [Wed, 13 Jun 2012 10:00:01 +0000 (18:00 +0800)]
Merge branch 'MDL-33611' of git://github.com/timhunt/moodle
Dongsheng Cai [Wed, 13 Jun 2012 09:57:10 +0000 (19:57 +1000)]
MDL-33513 Fixed source field
Dan Poltawski [Wed, 13 Jun 2012 09:45:27 +0000 (17:45 +0800)]
Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle