64414 Commits

Author SHA1 Message Date
Petr Škoda
29c43343a2 MDL-38743 add private cache headers 2013-10-18 15:54:43 +02:00
Dan Poltawski
4e47920f08 Moodle release 2.6beta v2.6.0-beta 2013-10-18 16:21:45 +08:00
Dan Poltawski
2a3129b322 NOBUG: Fixed file access permissions 2013-10-18 16:16:18 +08:00
Dan Poltawski
8982470452 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-10-18 16:16:11 +08:00
Dan Poltawski
c68bf34f83 Merge branch 'MDL-42411-master' of git://github.com/damyon/moodle 2013-10-17 16:29:05 +08:00
Damyon Wiese
5d5c4c0b73 MDL-43411 Backup: Fix restore from 1.9
The restore progress bars introduced a bug when restoring Moodle 1.9 backups.
build_plan needs to be surrounded with start_progress/end_progress with the mode
set to indeterminite or it throws coding errors.
2013-10-17 15:54:24 +08:00
Eloy Lafuente (stronk7)
059d7bd275 Merge branch 'MDL-42380-master' of git://github.com/damyon/moodle 2013-10-16 15:19:36 +02:00
Damyon Wiese
2288969269 Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle 2013-10-16 15:45:40 +08:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Petr Škoda
80dc19699c MDL-42224 fix log output regression in auth test 2013-10-16 07:25:28 +02:00
Damyon Wiese
6de4beb8dd MDL-42380 Course unit tests: Remove assert causing oracle unit tests to die 2013-10-16 13:20:33 +08:00
Damyon Wiese
fc69508f01 Merge branch 'MDL-42029-master-nomerge' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
2013-10-16 12:45:07 +08:00
Jerome Mouneyrac
ea6d86743f MDL-42029 Editpdf: Page selector should indicate what page you are on 2013-10-16 11:55:30 +08:00
Damyon Wiese
2ec214806f Merge branch '42294-26' of git://github.com/samhemelryk/moodle 2013-10-16 11:36:16 +08:00
Eloy Lafuente (stronk7)
11182e2eb1 Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle 2013-10-16 01:23:01 +02:00
Eloy Lafuente (stronk7)
77631383f0 Merge branch 'MDL-42240' of git://github.com/danpoltawski/moodle 2013-10-16 01:04:36 +02:00
Eloy Lafuente (stronk7)
cbef1d9d3f MDL-42302 course: re-shitfering management module. 2013-10-16 00:53:58 +02:00
Eloy Lafuente (stronk7)
e60637052c Merge branch '42302-26' of git://github.com/samhemelryk/moodle 2013-10-16 00:39:46 +02:00
Sam Hemelryk
b155a17034 MDL-42302 course: fixed bugs while changing visibility
* No longer uses show which is resvered on MySQL
* Selected category courses are now always returned.
2013-10-16 08:25:08 +13:00
Sam Hemelryk
af321e0f20 MDL-42294 course: fixed delete script ordering
Added a behat test for the creation and deletion of a new course.
This should turn up any such errors like this during automated
testing in the future.
2013-10-16 08:24:56 +13:00
Damyon Wiese
2c94d858f0 Merge branch 'MDL-37877-master' of git://github.com/ankitagarwal/moodle 2013-10-15 16:54:40 +08:00
Dan Poltawski
bca2951282 Merge branch 'MDL-42209_master' of https://github.com/markn86/moodle 2013-10-15 14:43:02 +08:00
Ankit Agarwal
b2e791d153 MDL-37877 backup: Fix issues with zipping of large files
Files bigger than 4GB is not supported at this point. Zip archiver doesn't know about it and always returns true. We need to verify if it is a valid file or not and delete if not
Also delete the backup file immediately if anything goes wrong anywhere in backup. We don't want to use up space
2013-10-15 12:14:23 +08:00
Dan Poltawski
e3aa1fa929 Merge branch 'wip-MDL-42288-master' of git://github.com/marinaglancy/moodle 2013-10-15 11:53:26 +08:00
Marina Glancy
e3d43f0d73 Merge branch 'wip-MDL-42234-master' of git://github.com/abgreeve/moodle 2013-10-15 14:11:15 +11:00
Damyon Wiese
ef2b0f5ca3 MDL-42152 Javascript: Add version bump for YUI update 2013-10-15 10:55:29 +08:00
Petr Škoda
2cd519fb71 MDL-42152 fix broken theme->yuicssmodules support 2013-10-15 10:54:34 +08:00
Petr Škoda
d3e5f04671 MDL-42152 add more YUI rollup explanation from Andrew 2013-10-15 10:53:21 +08:00
Petr Škoda
d17f25a56e MDL-42152 rename our rollup to start with 'yui-' to enable the stadnard regex base magic 2013-10-15 10:53:20 +08:00
Petr Škoda
2ea00a5867 MDL-42152 improve SimpleYUI docs 2013-10-15 10:53:20 +08:00
Andrew Nicols
c8b9f6d9b0 MDL-42152 Use new rollup system 2013-10-15 10:53:20 +08:00
Andrew Nicols
eee4cbb725 MDL-42152 AJAX: Add rollup support to YUI loader 2013-10-15 10:53:20 +08:00
Petr Škoda
8a47844629 MDL-42152 import YUI 3.13.0 and switch to emulated SimpleYUI
Includes @version@ fix
2013-10-15 10:53:08 +08:00
Tim Hunt
562684e3a0 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:47:27 +11:00
Adrian Greeve
40a473d5e7 MDL-42234 - Repositories: Fix undefined variable notice when no repositories are enabled. 2013-10-15 10:40:23 +08:00
Marina Glancy
41a403cd14 Merge branch '41959-26' of git://github.com/samhemelryk/moodle 2013-10-15 13:19:30 +11:00
Marina Glancy
38a5cc79f8 Merge branch 'MDL-42230' of git://github.com/timhunt/moodle 2013-10-15 13:19:20 +11:00
Dan Poltawski
bd81762784 Merge branch '42247-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-15 09:32:27 +08:00
Marina Glancy
30fb399455 Merge branch '42258-26' of git://github.com/samhemelryk/moodle 2013-10-15 12:10:34 +11:00
Eloy Lafuente (stronk7)
9bb34fb781 Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle 2013-10-15 02:09:11 +02:00
Eloy Lafuente (stronk7)
3745472f63 Merge branch 'MDL-42241-master' of git://github.com/ankitagarwal/moodle 2013-10-15 01:58:51 +02:00
Damyon Wiese
6350e5df45 Merge branch '42256-26' of git://github.com/samhemelryk/moodle 2013-10-14 16:55:39 +08:00
Damyon Wiese
35d7ba167a Merge branch 'MDL-42198_master' of git://github.com/dmonllao/moodle 2013-10-14 16:14:38 +08:00
Dan Poltawski
c79239b294 Merge branch 'MDL-42151_master' of git://github.com/dmonllao/moodle 2013-10-14 16:11:50 +08:00
Dan Poltawski
7159340f7f Merge branch 'MDL-41131_c' of git://github.com/rwijaya/moodle 2013-10-14 15:46:22 +08:00
Damyon Wiese
7aeb2cc335 Merge branch '42249-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:12:17 +08:00
Damyon Wiese
3abdd3273b Merge branch '42255-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:07:29 +08:00
Damyon Wiese
769b434ad9 Merge branch 'MDL-42225_master' of https://github.com/markn86/moodle 2013-10-14 15:04:46 +08:00
Damyon Wiese
71c2e40993 Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle 2013-10-14 14:50:53 +08:00
Dan Poltawski
7a1ce7769c Merge branch 'w42_MDL-42082_m26_authdbpass' of https://github.com/skodak/moodle 2013-10-14 14:36:14 +08:00