Commit graph

59367 commits

Author SHA1 Message Date
Dan Poltawski
35b5c04f0b Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle 2013-02-18 15:59:48 +08:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Frederic Massart
dd1c2f5a02 MDL-31983 navigation: Renaming the Settings block to Administration
AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END
2013-02-18 15:48:12 +08:00
Damyon Wiese
74f3d44d37 Merge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle 2013-02-18 14:51:50 +08:00
Jean-Michel Vedrine
ded5cddb32 MDL-37967 Improve XML question import format handling of duplicated files 2013-02-18 07:38:22 +01:00
Dan Poltawski
69898d6b9a Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle 2013-02-18 14:22:02 +08:00
Dan Poltawski
3672b3b9b0 Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle 2013-02-18 14:18:25 +08:00
Damyon Wiese
82a6332837 Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 13:35:36 +08:00
Rossiani Wijaya
62a973cef0 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:22:07 +08:00
Dan Poltawski
93d5dc1c03 Merge branch 'MDL-35336' of git://github.com/rwijaya/moodle 2013-02-18 12:23:51 +08:00
Dan Poltawski
32c3446fab Merge branch 'MDL-37337-master' of git://github.com/damyon/moodle 2013-02-18 12:00:45 +08:00
Dan Poltawski
219faacc33 MDL-35622 - fix crazy character causing upgrade problems
Can you see it?!
2013-02-18 11:55:29 +08:00
Dan Poltawski
28d72ad973 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 11:31:07 +08:00
Dan Poltawski
8450149249 Merge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle 2013-02-18 11:07:28 +08:00
Damyon Wiese
7866b094cb MDL-37683 cache: - Comments cleanup and remove ;; 2013-02-18 10:35:31 +08:00
Rossiani Wijaya
4be3ed4b3d MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:28:23 +08:00
Marina Glancy
7d579b1e61 MDL-37987 bugfix: swapped column headings in the category management table 2013-02-18 13:24:06 +11:00
Rossiani Wijaya
17b57ec881 MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports 2013-02-18 10:21:53 +08:00
Rossiani Wijaya
2975c3429e MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable 2013-02-18 10:21:53 +08:00
Mary Evans
167114a27c MDL-28692 theme_base: Added background-color to admin settings form overridden in base/style/admin.css 2013-02-18 01:42:16 +00:00
Frederic Massart
2d10823a7c MDL-38076 usability: Fix wrong position of new 2.4 icons 2013-02-18 09:40:49 +08:00
Damyon Wiese
cd747874a4 Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle 2013-02-18 09:30:47 +08:00
Sam Hemelryk
7634410b6e MDL-37683 cache: improved indentifier collection and storage 2013-02-18 10:20:02 +13:00
Sam Hemelryk
04cfa387f9 MDL-38000 css: fixed handling of CSS files by outputlib. 2013-02-18 08:34:19 +13:00
Sam Hemelryk
e0d9b7c0d4 MDL-37683 cache: siteidentifier is now included in the keys 2013-02-18 08:32:03 +13:00
Sam Hemelryk
95cf54e1c9 MDL-38075 csslib: fixed coding error when working with an array of styles 2013-02-18 08:21:43 +13:00
Petr Škoda
2752739cc8 MDL-38059 explain that cachedir must be shared in cluster 2013-02-16 14:43:16 +01:00
Andrew Robert Nicols
3f61e4cbf3 MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly 2013-02-15 21:28:50 +00:00
Andrew Robert Nicols
59a0ba3bdc MDL-37939 Course: Correct broken sequence data 2013-02-15 21:28:33 +00:00
Jean-Michel Vedrine
7bae3a12fd MDL-38051 Annihilate all the CRLFs present in some questions/fixtures... 2013-02-15 18:26:38 +01:00
Dan Marsden
61fbdb0eec MDL-37660 SCORM: move time related settings into general section and improve lang 2013-02-15 23:48:32 +13:00
Rajesh Taneja
db47f68f28 MDL-37329 Navigation: Navigation node My Courses will only show enrolled courses 2013-02-15 17:55:28 +08:00
Frederic Massart
304baba01a MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-15 15:02:54 +08:00
David Monllao
ee7447a9f4 MDL-37858 behat: Testing the step arguments replacements 2013-02-15 13:38:14 +08:00
David Monllao
b08b0a2875 MDL-37858 behat: Arguments transformations
To remove the escape characters and to
replace var names for nasty strings
2013-02-15 13:38:14 +08:00
David Monllao
110761997a MDL-37858 testing: Adding nasty strings generator 2013-02-15 13:38:14 +08:00
David Monllao
02ca6219a6 MDL-37858 behat: Removing fixStepArgument
It can be managed by a @Transform in
a centralized way
2013-02-15 13:38:14 +08:00
David Monllao
9305c29f35 MDL-37912 behat: Use text area if there is no html editor 2013-02-15 13:37:14 +08:00
Frederic Massart
444c49fa57 MDL-38048 documentation: Typo in README file 2013-02-15 13:14:39 +08:00
Frederic Massart
ebd9ae6523 MDL-31983 navigation: Move reports from Navigation to Settings 2013-02-15 13:06:26 +08:00
Damyon Wiese
a5c793c38c MDL-38047 Assignment unit tests - Shave 1 minute from the unit tests for mod_assign. 2013-02-15 12:36:21 +08:00
Dan Poltawski
47570cc67d MDL-35750 - update to the ISO list of countries
Netherlands Antilles has been split up as specified in ISO 3166-1
Newsletter VI-8 (2010-12-15). Users will need to choose their country.
http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf

PLEASE NOTE: if you are updating this list again, i've written a script
to automate it from now on, linked from the bug.
2013-02-15 12:26:08 +08:00
Damyon Wiese
b0da618b61 MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy" 2013-02-15 11:26:21 +08:00
Jerome Mouneyrac
85e6bf8e71 MDL-29938 throw exception when a criteria is repeated, used self instead classname when possible, return only not deleted users 2013-02-15 11:03:13 +08:00
Frederic Massart
982f4bc40e MDL-38301 usability: Fixed wrong icon size 2013-02-15 10:04:57 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
Mary Evans
6e8f7688cc MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE. 2013-02-15 00:48:08 +00:00
Paul Charsley
45c0a7d002 MDL-36541 modify get_groupings to optionally return associated groups 2013-02-15 13:13:06 +13:00
Matteo Scaramuccia
f1e316870d MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918) 2013-02-14 21:38:05 +01:00
Davo Smith
04a38bd311 MDL-38033 dndupload - ignore case when comparing dropped file extensions with those supported by activity modules 2013-02-14 20:19:41 +00:00