64930 Commits

Author SHA1 Message Date
Frederic Massart
f591c247ca MDL-42666 repository_boxnet: Improved output during migration 2013-11-07 10:58:40 +08:00
Frederic Massart
51ada519a6 MDL-42666 repository_boxnet: Downloading a file follows locations 2013-11-07 10:54:48 +08:00
Frederic Massart
102a241998 MDL-42666 repository_boxnet: Fix undefined variable usage 2013-11-07 10:54:48 +08:00
Frederic Massart
d7274bfead MDL-42666 repository_boxnet: Convert all the references asap
This has been done in case the script fails during the processing
and needs to be re-run. Now all the references are converted as soon
as we can, where as before they could have ended up being re-downloaded.
2013-11-07 10:54:47 +08:00
Frederic Massart
ab227cc6a9 MDL-42666 repository_boxnet: Warn on HTTPS requirement when non HTTPS 2013-11-07 10:54:47 +08:00
Frederic Massart
090976b966 MDL-42666 repository_boxnet: Alert the admins of the migration process 2013-11-07 10:54:38 +08:00
Frederic Massart
e27ed28785 MDL-42666 repository_boxnet: Revoke access token when logging out 2013-11-06 10:46:29 +08:00
Frederic Massart
79d89136f0 MDL-42666 oauthlib: Getter methods for accesstoken, client id and secret 2013-11-06 10:46:29 +08:00
Frederic Massart
b2f9028559 MDL-42666 repository_boxnet: Remove hardcoded date for APIv1 end of life 2013-11-06 10:46:29 +08:00
Frederic Massart
091ac5969e MDL-42666 repository_boxnet: Disabling file references 2013-11-06 10:46:29 +08:00
Frederic Massart
05eaf64397 MDL-42666 repository_boxnet: Advise the user to run the migration tool 2013-11-06 10:46:29 +08:00
Frederic Massart
cc4de9ea58 MDL-42666 repository_boxnet: Tool to launch the migration 2013-11-06 10:46:29 +08:00
Frederic Massart
4cdb94cce7 MDL-42666 repository_boxnet: Function to convert APIv1 references to true copies 2013-11-06 10:46:29 +08:00
Frederic Massart
2d5c7d5057 MDL-42666 repository_boxnet: Convert repository to APIv2 2013-11-06 10:45:52 +08:00
Damyon Wiese
7fd16ca1fd Merge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com/skodak/moodle 2013-11-06 10:21:35 +08:00
Mary Evans
fe4848110a MDL-40244 forms: added setType() for groupinfo in forum and wiki 2013-11-06 12:23:18 +11:00
Marina Glancy
0f57d555a0 Merge branch '42629-26-r2' of git://github.com/samhemelryk/moodle 2013-11-06 11:56:20 +11:00
Marina Glancy
a43db075ff Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle 2013-11-06 11:52:15 +11:00
Sam Hemelryk
c820e700d8 ML-42629 course: management added can_resort checks 2013-11-06 08:49:36 +08:00
Damyon Wiese
cb35482abf MDL-42402 EditPDF: CSS fix for hover on drop down menus
Also required a fix for the comment search window because it was picking up the same styles.
2013-11-06 00:41:04 +08:00
Eloy Lafuente (stronk7)
233db99d65 Merge branch 'MDL-42671-master' of git://github.com/damyon/moodle 2013-11-05 17:27:04 +01:00
Damyon Wiese
237f484188 MDL-42671 EditPDF: Disable EditPDF is zlib is not available
Also put a warning on the admin page if this is the case.
2013-11-06 00:26:05 +08:00
Damyon Wiese
c5ae81ca38 Merge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-11-05 22:44:53 +08:00
Dan Poltawski
61bac37cf1 Merge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle 2013-11-05 17:25:53 +08:00
David Monllao
a57263d19d MDL-42332 behat: Adding a wait to let AJAX finish the request
The Mark as completed performs an AJAX request,
we need to give time to let it finish.
2013-11-05 17:13:20 +08:00
Dan Poltawski
bd706fb590 Merge branch 'MDL-42613_master' of https://github.com/markn86/moodle 2013-11-05 16:39:27 +08:00
Damyon Wiese
48bde0eed4 MDL-42629: Fixing dodgy merge conflict (oops) 2013-11-05 16:36:31 +08:00
Dan Poltawski
8d81bd5d1e Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle 2013-11-05 15:52:48 +08:00
David Monllao
622442765e MDL-42363 behat: Avoid random failure because of timing differences 2013-11-05 15:27:13 +08:00
Dan Poltawski
e957dfa549 Merge branch 'MDL-42402-master-fix2' of git://github.com/damyon/moodle 2013-11-05 15:06:36 +08:00
Damyon Wiese
1d38083c9d MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633 2013-11-05 14:49:06 +08:00
Marina Glancy
792eeb0053 Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle 2013-11-05 17:44:53 +11:00
Marina Glancy
edf21f0c56 Merge branch 'MDL-42706-master-int' of git://github.com/FMCorz/moodle 2013-11-05 17:13:38 +11:00
Damyon Wiese
9e16402727 Merge branch '42629-26' of git://github.com/samhemelryk/moodle
Conflicts:
	course/classes/management_renderer.php
2013-11-05 14:04:08 +08:00
Sam Hemelryk
38a15200b9 MDL-42629 course: management peer-review alterations
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
2013-11-05 13:57:01 +08:00
Frederic Massart
3ec7ea98a1 MDL-42706 mod_book: Undefined CFG in pluginfile function 2013-11-05 13:19:42 +08:00
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
Dan Poltawski
6ce30a3e2c Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle 2013-11-05 12:34:35 +08:00
Damyon Wiese
97c7b8a548 Merge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle 2013-11-05 12:24:41 +08:00
rwijaya
a80af8a652 MDL-42280 Behat: add behat test for block settings.
Test includes: modifying setting to hide and move block appearance
2013-11-05 11:37:28 +08:00
Dan Poltawski
0fe02089a4 Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle 2013-11-05 11:24:02 +08:00
Marina Glancy
47644f7d6a MDL-38228 upgrade: Rewrite and re-apply script that fixes corrupt course modules to sequence relation 2013-11-05 14:20:50 +11:00
Damyon Wiese
1ddbe7815d Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle 2013-11-05 11:06:23 +08:00
Michael de Raadt
2bec969e2a MDL-42703 Course: Remove alias from queries to satisfy MSSQL 2013-11-05 10:52:24 +08:00
Ray Morris
82d305fafa MDL-42265 make Browse Users list scrollable for smaller screens 2013-11-05 10:49:20 +08:00
Damyon Wiese
6655b6102a MDL-42402 EditPDF: Fix the styles again
More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.
2013-11-05 10:30:11 +08:00
Dan Poltawski
528ed758e6 MDL-40267 forms: fix utf8 string length rules 2013-11-05 10:20:22 +08:00
Eloy Lafuente (stronk7)
61dc1d26cd MDL-40267 forms: added some tests for the range rule 2013-11-05 09:57:46 +08:00
Andrew Nicols
4816e19a6f MDL-42464 mod_chat: Correct use of amp; in session link 2013-11-05 09:50:33 +08:00
Sam Hemelryk
c7a2291f8b MDL-42629 course: management resorting improvements 2013-11-05 09:49:20 +08:00