moodle.git
9 years agoMDL-30337 : removed extra css affecting LTR when it shouldn't.
Aparup Banerjee [Tue, 19 Jun 2012 06:26:32 +0000 (14:26 +0800)]
MDL-30337 : removed extra css affecting LTR when it shouldn't.

9 years agoMDL-33121 book - improve a lang string
Dan Poltawski [Tue, 19 Jun 2012 06:09:58 +0000 (14:09 +0800)]
MDL-33121 book - improve a lang string

+ Make a comment match coding style

9 years agoMerge branch 'MDL-33121' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 19 Jun 2012 06:14:54 +0000 (14:14 +0800)]
Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 19 Jun 2012 05:27:07 +0000 (13:27 +0800)]
Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle

9 years agoMDL-33469 repository_picasa: oops, wrong pluginname in string
Dan Poltawski [Tue, 19 Jun 2012 03:56:45 +0000 (11:56 +0800)]
MDL-33469 repository_picasa: oops, wrong pluginname in string

9 years agoMerge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:09:30 +0000 (03:09 +0200)]
Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle

9 years agoMerge branch 'MDL-33623' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:05:52 +0000 (03:05 +0200)]
Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33469' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:01:30 +0000 (03:01 +0200)]
Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33294' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 00:59:46 +0000 (02:59 +0200)]
Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33724' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 00:56:19 +0000 (02:56 +0200)]
Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33778' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 22:54:39 +0000 (00:54 +0200)]
Merge branch 'MDL-33778' of git://github.com/timhunt/moodle

9 years agoMDL-33821 Fix SQL syntax for recent glossary activity
Andrew Robert Nicols [Mon, 18 Jun 2012 15:02:02 +0000 (16:02 +0100)]
MDL-33821 Fix SQL syntax for recent glossary activity

9 years agoMDL-33778 quiz statistics: part and class ids can be strings, not just ints.
Tim Hunt [Fri, 15 Jun 2012 12:53:02 +0000 (13:53 +0100)]
MDL-33778 quiz statistics: part and class ids can be strings, not just ints.

9 years agoMerge branch 'MDL-33818' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jun 2012 13:33:26 +0000 (21:33 +0800)]
Merge branch 'MDL-33818' of git://github.com/timhunt/moodle

9 years agoMDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ
Tim Hunt [Mon, 18 Jun 2012 13:09:06 +0000 (14:09 +0100)]
MDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ

This field was new in 2.3, so we need to set it when restoring backups
from 2.2 or before, using the same logic as in upgrade.

9 years agoMerge branch 'MDL-33552' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 10:31:37 +0000 (12:31 +0200)]
Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith...
Dan Poltawski [Mon, 18 Jun 2012 09:36:03 +0000 (17:36 +0800)]
Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle

9 years agoMerge branch 'MDL-33175' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Mon, 18 Jun 2012 09:14:11 +0000 (17:14 +0800)]
Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle

9 years agoMoodle release 2.3beta v2.3.0-beta
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:34:52 +0000 (10:34 +0200)]
Moodle release 2.3beta

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:29:12 +0000 (10:29 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-33121 Book Module: removing prev/next value from book_preload_chapters and more...
Rossiani Wijaya [Mon, 18 Jun 2012 08:10:15 +0000 (16:10 +0800)]
MDL-33121 Book Module: removing prev/next value from book_preload_chapters and more code cleaning

9 years agoMerge branch 'MDL-33794' of git://github.com/stronk7/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

9 years agoMerge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle
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

9 years agoMDL-30337 theme : cleanup after conflict.
Aparup Banerjee [Mon, 18 Jun 2012 08:02:34 +0000 (16:02 +0800)]
MDL-30337 theme : cleanup after conflict.

9 years agoMDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons...
Davo Smith [Mon, 18 Jun 2012 07:56:39 +0000 (08:56 +0100)]
MDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons onto new line

9 years agoMDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping...
Davo Smith [Sat, 16 Jun 2012 14:42:07 +0000 (15:42 +0100)]
MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name

9 years agoMerge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle
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

9 years agoMerge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/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

9 years agoMDL-33775 Course: fix redirect to course/section in paged mode
Frederic Massart [Fri, 15 Jun 2012 08:16:52 +0000 (16:16 +0800)]
MDL-33775 Course: fix redirect to course/section in paged mode

9 years agoMerge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle
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

9 years agoMerge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/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

9 years agoMerge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign
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

9 years agoMerge branch 'MDL-33779' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jun 2012 05:43:36 +0000 (13:43 +0800)]
Merge branch 'MDL-33779' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign
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

9 years agoMerge branch 'MDL-33697' 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

9 years agoMerge branch 'MDL-33327-2' 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

9 years agoMDL - RTL Theme fixes for Moodle 2 (theme/canvas)
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)

9 years agoMDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
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

9 years agoMDL-33469 google plugins - string update
Dan Poltawski [Fri, 15 Jun 2012 15:50:19 +0000 (23:50 +0800)]
MDL-33469 google plugins - string update

Improved strings to try and ensure maximum support for users during
upgrade.

9 years agoMDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
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

9 years agoMDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
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)

9 years agoMDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
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

9 years agoMDL-33603 - data - added another sql query to allow links to records to work.
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.

9 years agoMDl-33607 wiki-2: check subwiki before fetching it from db
Rajesh Taneja [Fri, 15 Jun 2012 08:43:01 +0000 (16:43 +0800)]
MDl-33607 wiki-2: check subwiki before fetching it from db

9 years agoMDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700
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

9 years agoMDL-33794 assign: fix some incorrect function names
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 00:17:03 +0000 (02:17 +0200)]
MDL-33794 assign: fix some incorrect function names

9 years agoMDL-33794 version.php: Fix some missing bits before bump.
Eloy Lafuente (stronk7) [Sun, 17 Jun 2012 17:29:44 +0000 (19:29 +0200)]
MDL-33794 version.php: Fix some missing bits before bump.

9 years agoMDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade...
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.

9 years agoMDL-33294 - block_blog_recent: fix E_STRICT error
Dan Poltawski [Sat, 16 Jun 2012 04:46:07 +0000 (12:46 +0800)]
MDL-33294 - block_blog_recent: fix E_STRICT error

Default object from empty value

9 years agoMDL-33294 - block_blog_tags: fix E_STRICT error
Dan Poltawski [Sat, 16 Jun 2012 04:35:15 +0000 (12:35 +0800)]
MDL-33294 - block_blog_tags: fix E_STRICT error

Default object from empty value

9 years agoAutomatically generated installer lang files
AMOS bot [Sat, 16 Jun 2012 00:31:27 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoon-demand release 2.3dev
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 18:29:04 +0000 (20:29 +0200)]
on-demand release 2.3dev

9 years agoMDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix
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.

9 years agoMDL-33779 question: code clean-up
Tim Hunt [Fri, 15 Jun 2012 13:02:15 +0000 (14:02 +0100)]
MDL-33779 question: code clean-up

9 years agoMerge branch 'MDL-33756' of git://github.com/stronk7/moodle
Dan Poltawski [Fri, 15 Jun 2012 10:38:35 +0000 (18:38 +0800)]
Merge branch 'MDL-33756' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-33726' of git://github.com/danpoltawski/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

9 years agoMerge branch 'w24_MDL-33768_m23_filters' of git://github.com/skodak/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

9 years agoMerge branch 'MDL-33769-master-1' of git://git.luns.net.uk/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

9 years agoMDL-30337 Themes : RTL fixes for filepicker and filemanager
Aparup Banerjee [Wed, 13 Jun 2012 14:18:08 +0000 (22:18 +0800)]
MDL-30337 Themes : RTL fixes for filepicker and filemanager

9 years agoMDL-32279 filters: filters: setup() before filter() is better.
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 08:12:53 +0000 (10:12 +0200)]
MDL-32279 filters: filters: setup() before filter() is better.

9 years agoMDL-33768 enable activitynames filter by default in new installs
Petr Skoda [Fri, 15 Jun 2012 07:50:45 +0000 (09:50 +0200)]
MDL-33768 enable activitynames filter by default in new installs

9 years agoMDL-33768 enable multimedia 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

9 years agoMDL-33769 Switch Submit and Cancel buttons around on Activity Chooser
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

9 years agoMDL-33699: Allow grades of 0 in assignment quickgrading
Damyon Wiese [Fri, 15 Jun 2012 06:42:19 +0000 (14:42 +0800)]
MDL-33699: Allow grades of 0 in assignment quickgrading

9 years agoMerge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle
Aparup Banerjee [Fri, 15 Jun 2012 06:54:10 +0000 (14:54 +0800)]
Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle

9 years agoMDL-33513: Make files->source field consistent
Dongsheng Cai [Sun, 10 Jun 2012 07:47:00 +0000 (17:47 +1000)]
MDL-33513: Make files->source field consistent

9 years agoMDL-33136 upload dnd files one after another
Marina Glancy [Fri, 15 Jun 2012 06:48:02 +0000 (14:48 +0800)]
MDL-33136 upload dnd files one after another

9 years agoMDL-33468 - fix illegal whitespace
Dan Poltawski [Fri, 15 Jun 2012 04:17:40 +0000 (12:17 +0800)]
MDL-33468 - fix illegal whitespace

9 years agoMerge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle
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

9 years agoMerge branch 'MDL-33731-master-1' of git://git.luns.net.uk/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

9 years agoMDL-32279 filter: fix undefined variable
Dan Poltawski [Fri, 15 Jun 2012 03:57:22 +0000 (11:57 +0800)]
MDL-32279 filter: fix undefined variable

9 years agoMerge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle
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

9 years agoMerge branch 'MDL-33730' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 15 Jun 2012 03:07:48 +0000 (11:07 +0800)]
Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-32279' of git://github.com/stronk7/moodle
Dan Poltawski [Fri, 15 Jun 2012 03:02:47 +0000 (11:02 +0800)]
Merge branch 'MDL-32279' of git://github.com/stronk7/moodle

9 years agoMDL-33758 Filepicker: using iframe instead of popup windows for download
Frederic Massart [Fri, 15 Jun 2012 02:12:57 +0000 (10:12 +0800)]
MDL-33758 Filepicker: using iframe instead of popup windows for download

9 years agoMDL-33756 backup: converters only available in general course backups.
Eloy Lafuente (stronk7) [Fri, 15 Jun 2012 00:27:18 +0000 (02:27 +0200)]
MDL-33756 backup: converters only available in general course backups.

9 years agoMDL-32279 filters: add documentation to upgrade.txt
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 23:24:18 +0000 (01:24 +0200)]
MDL-32279 filters: add documentation to upgrade.txt

9 years agoMDL-33523: Fixed item C of the issue
Darko Miletic [Thu, 14 Jun 2012 20:12:53 +0000 (17:12 -0300)]
MDL-33523: Fixed item C of the issue

9 years agoMDL-32279 glossary filter: take rid of unused courseid variable in yui module.
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.

9 years agoMDL-32279 glossary filter: implement the setup() method.
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 17:50:22 +0000 (19:50 +0200)]
MDL-32279 glossary filter: implement the setup() method.

9 years agoMDL-32279 filters: add support for setup() methods in filters.
Eloy Lafuente (stronk7) [Thu, 14 Jun 2012 17:49:13 +0000 (19:49 +0200)]
MDL-32279 filters: add support for setup() methods in filters.

9 years agoMDL-33523: for for missing image (the folder.gif is no longer available)
Darko Miletic [Thu, 14 Jun 2012 15:34:10 +0000 (12:34 -0300)]
MDL-33523: for for missing image (the folder.gif is no longer available)

9 years agoMerge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle
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

9 years agoMerge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/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

9 years agoMDL-33731 Add exception for closebutton when drag/dropping activity chooser
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

9 years agoMDL-33730 missing description field cause error when call is done on default values
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

9 years agoMDL-33726 course: don't list labels in section summary
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 ;-)

9 years agoMerge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
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

9 years agoMDL-33442 Course: actions bring you back where you came from
Frederic Massart [Thu, 7 Jun 2012 01:29:40 +0000 (09:29 +0800)]
MDL-33442 Course: actions bring you back where you came from

9 years agoMDL-33724 repository_equella: missing string
Dan Poltawski [Thu, 14 Jun 2012 08:27:20 +0000 (16:27 +0800)]
MDL-33724 repository_equella: missing string

9 years agoMerge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle
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

9 years agoMerge branch 'wip-MDL-33550-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

9 years agoMDL-33550 reset repository static cache between unit tests
Marina Glancy [Thu, 14 Jun 2012 08:21:04 +0000 (16:21 +0800)]
MDL-33550 reset repository static cache between unit tests

9 years agoMDL-33156 pix: standardise image icons for course pages
Martin Dougiamas [Thu, 14 Jun 2012 08:04:16 +0000 (16:04 +0800)]
MDL-33156 pix: standardise image icons for course pages

9 years agoMDL-33697: Merge the 2 assignment notification types
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.

9 years agoMDL-33327: Layout changes for the assignment grading table
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

9 years agoMDL-33550 Set default status for file =0 and correct setting user in phpunit test
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

9 years agoRevert MDL-33513
Dan Poltawski [Thu, 14 Jun 2012 05:57:06 +0000 (13:57 +0800)]
Revert MDL-33513

This reverts commit b2cf2b807f7a7c8d1a02ebb52038c61cc63a1494.
This reverts commit 24b96f01702571989fa77a05c5cd11b9fedc2745.
This reverts commit 39c60294a6a027ae56f4b9eda159bb589b60c0c0.
This reverts commit 8a288971e25eaaa4c8cbd67e450cee0e12435d4e.

9 years agoMDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test
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

9 years agoMDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines sibli...
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