Commit graph

65147 commits

Author SHA1 Message Date
Andrew Nicols
bc80ea017c MDL-40975 Course: Add back JavaScript drag/drop for bootstrap on mobile 2013-11-06 11:40:52 +08:00
Andrew Nicols
a4400cefdb MDL-40975 JavaScript: Make drag/drop respond to a single click as well as a drag 2013-11-06 11:40:51 +08:00
Andrew Nicols
81dc079654 MDL-40975 Course: Hide commands when editing titles 2013-11-06 11:40:51 +08:00
Andrew Nicols
3072040cff MDL-40975 JavaScript: Standardise the location of the activity spinner 2013-11-06 11:40:51 +08:00
Andrew Nicols
9797becd71 MDL-40975 ActionMenu: Remove background color when menu is active 2013-11-06 11:40:50 +08:00
Andrew Nicols
4657ba81d2 MDL-40975 Course: Move drag/drop to start of the line 2013-11-06 11:40:50 +08:00
Andrew Nicols
a83d83e42b MDL-40975 Course: Change which actions are in the menu and which are outside it 2013-11-06 11:40:49 +08:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Andrew Nicols
f549dd64a4 MDL-40975 Course: Change the activity drag icon to prevent icon flash 2013-11-06 10:59:26 +08:00
Barbara Ramiro
e3d0acf6ac MDL-42564 Theme: Add new dropdown icons 2013-11-06 10:59:26 +08:00
Andrew Nicols
8ef1aa40d1 MDL-40975 Theme: Standardise size of icons in headings 2013-11-06 10:59:26 +08:00
Andrew Nicols
69a3457fe9 MDL-40975 Theme: Tidy up block icons to line up in columns 2013-11-06 10:59:26 +08:00
Andrew Nicols
803912ae69 MDL-40975 Blocks: Move most block actions into the block menu 2013-11-06 10:59:25 +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
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01: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
Tim Hunt
94ffbef19a MDL-40481 quiz responses report needs cols need text_sorting 2013-11-05 14:13:53 +00:00
Sam Hemelryk
05bce411cb MDL-42719 course: management view mode wrap fixed 2013-11-05 21:52:45 +08:00
Sam Hemelryk
e69a0251dc MDL-42710 course: management cat sorting perfecting taking place 2013-11-05 21:52:45 +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