e5c6694de8
MDL-39477 repository: Introducing data generators for repositories
2013-05-28 11:08:54 +08:00
d3aeeb93c2
Merge branch 'w22_MDL-39802_m25_deletedusers' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-05-28 09:56:08 +08:00
e58af1dfcd
Merge branch 'wip-MDL-39836_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-05-28 01:24:58 +02:00
4f0d6118ff
Merge branch 'wip-MDL-39456-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
2013-05-28 01:02:34 +02:00
8b77e81201
Merge branch 'MDL-39853_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-28 00:57:06 +02:00
d6e2b0a03e
Merge branch 'MDL-39795_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-28 00:45:02 +02:00
a665577b37
Merge branch 'MDL-39686_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-27 16:28:48 +08:00
f32e55c8d7
Merge branch 'MDL-39680-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-05-27 16:21:44 +08:00
6a3a3bd868
Merge branch 'MDL-39640-master-int' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
2013-05-27 16:14:59 +08:00
f70d382498
MDL-39194 theme_formal_white: cleaned the category page showing course listing
2013-05-27 15:23:08 +08:00
e132b54a6a
MDL-39853 behat: Useful info for $CFG->behat_config setting
2013-05-27 15:14:06 +08:00
c0b59154ba
MDL-39686 behat: Add option to restart the browser
2013-05-27 15:06:15 +08:00
268cb03e2d
MDL-39686 behat: Adding into to config-dist.php
2013-05-27 15:06:09 +08:00
ad97a56875
MDL-39806 theme_bootstrapbase: run less with --compress
2013-05-27 14:42:44 +08:00
8d94299b02
Merge branch 'MDL-39806_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
2013-05-27 14:36:55 +08:00
0653761da2
MDL-39795 behat: Adapting features to consider spaces
2013-05-27 14:25:40 +08:00
e489df87bf
MDL-39795 behat: Improving find-texts-in-page-contents performance
2013-05-27 14:25:34 +08:00
87a445ec70
MDL-39785 bug fix: filter_activitynames was not applied correctly
2013-05-27 14:17:15 +08:00
121e2492e8
Merge branch 'MDL-38239-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE
2013-05-27 14:13:36 +08:00
6c16494f03
Merge branch 'w22_MDL-39688_m25_etag' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-05-27 13:43:37 +08:00
191e70c2e2
Merge branch 'w22_MDL-38408_m25_paypalcost' of git://github.com/skodak/moodle into MOODLE_25_STABLE
2013-05-27 13:05:14 +08:00
7291b026a0
MDL-39778 badges: Fix missing library error in delete_course()
2013-05-27 12:00:38 +08:00
ceb4030763
Merge branch 'MDL-39768_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
2013-05-27 10:18:32 +08:00
69ecf8c0a9
MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar
2013-05-27 02:09:01 +01:00
039c78702d
MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less
...
Squashed commit of the following:
commit 58f5e063a8b333c184ca83ece7f61ec40d2a5080
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Sun May 26 13:45:11 2013 +0100
MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less
commit 575594257a9f4fab75977d2334d07659abea0b65
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Sun May 26 02:07:00 2013 +0100
MDL-39680 theme_bootstrapbase: Centralised text in footer.
2013-05-26 13:55:45 +01:00
7fa470de03
MDL-38408 always validate PayPal dates and cost, improve float formatting
2013-05-25 22:48:44 +02:00
6ceb6eb672
MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment.
2013-05-25 17:16:39 +01:00
161be92065
MDL-39688 do not set Etag when sending http ranges
2013-05-25 09:12:03 +02:00
5878ac3957
MDL-39802 ignore deleted users in meta enrolments
2013-05-24 21:28:38 +02:00
761227cfc6
MDL-39802 ignore deleted users in cohort enrolments
2013-05-24 21:28:38 +02:00
97d68b5652
MDL-39802 ignore deleted users in category enrolments
2013-05-24 21:28:37 +02:00
3ecf7ddd15
MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin
2013-05-24 21:28:37 +02:00
b6ef79950e
MDL-39802 add cli script for fixing of all deleted users
...
Use this script if something just set the user.deleted flag instead of calling the delete_user() method.
2013-05-24 21:28:37 +02:00
f65261d096
weekly release 2.5+
2013-05-24 13:26:46 +08:00
93f645f0ae
Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE
2013-05-24 13:12:11 +08:00
e5184cac0e
MDL-39456 cachestore_file: added reference to global $CFG
...
By holding onto a reference of the global $CFG object we
can be sure that it isn't destroyed before we are done
with it.
This allows for caches to be used within destructors for
purposes such as delayed writes.
2013-05-24 09:54:18 +12:00
caaad8b08d
MDL-39177 make sure we don't remove existing directories when cleaning up unzip
2013-05-23 15:59:53 +02:00
cb033b9fab
Automatically generated installer lang files
2013-05-22 08:26:02 +00:00
4f629bc677
MDL-39768 behat: Adding focused panels CSS selector
2013-05-22 15:11:55 +08:00
d917dc9e40
MDL-36482 Fix slipped error, thanks Petr!
2013-05-22 04:14:01 +02:00
d74f740722
Merge branch 'MDL-39697-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
2013-05-22 09:03:31 +08:00
6168502474
MDL-39177 Updating userid when file is overwritten
2013-05-22 02:25:18 +02:00
751cebfc3d
MDL-39177 More comments about confusing files.source field
2013-05-22 02:25:12 +02:00
acfd39cbf8
MDL-39177 New function file_storage::get_unused_dirname()
2013-05-22 02:25:07 +02:00
2efc8ff39f
MDL-39177 Ensure files are overwritten correctly on unzip
2013-05-22 02:25:02 +02:00
2a0b243137
MDL-39177 Perform all checks on draftfile area before saving the files
2013-05-22 02:24:56 +02:00
b8aca19538
MDL-39177 Remove code duplication
2013-05-22 02:24:50 +02:00
2fbfedb310
MDL-39177 Update file in filearea only if original is present
...
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
2013-05-22 02:24:40 +02:00
6c43ee510f
MDL-39177 Discard file origin when moving/renaming a file in filemanager
...
Created one function that handles file update to be used from both JS and nonJS filepicker
2013-05-22 02:24:32 +02:00
d262212a1f
MDL-39177 Original info is not preserved when overwriting a file in filemanager
...
original file location is used by filemanager to indicate that file is a source of reference and file the list of referencing files
2013-05-22 02:24:24 +02:00
Frederic Massart