mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 20:26:32 +01:00
Code Issues Projects Releases Wiki Activity
64,909 Commits 36 Branches 523 Tags
Commit Graph

64909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Hemelryk
62846237ee MDL-42629 course: set a better management page title 2013-11-05 09:49:14 +08:00
Sam Hemelryk
d3670843eb MDL-42629 course: changed new course to create new course 2013-11-05 09:49:14 +08:00
Sam Hemelryk
bd7ee7ada4 MDL-42629 course: moving a course now updates counts and pagination totals 2013-11-05 09:49:14 +08:00
Sam Hemelryk
83886a49a0 MDL-42629 course: changed sub category to subcategory 2013-11-05 09:49:13 +08:00
Sam Hemelryk
cfd1e08a50 MDL-42629 actionmenu: alt and title on icon removed if the same as text being displayed 2013-11-05 09:49:13 +08:00
Sam Hemelryk
017518d4f8 MDL-42629 course: fixed up create category management actions 2013-11-05 09:49:13 +08:00
Sam Hemelryk
115e5f052f MDL-42629 course: renamed re-sort to sort 2013-11-05 09:49:13 +08:00
Sam Hemelryk
f8ddf782dd MDL-42629 course: tweaks CSS for management interface 
* Removed grey background from checkboxes and bulk actions.
* Removed blue colouring on subheadings.
* Changed greys to the clean theme greys
 2013-11-05 09:49:13 +08:00
Sam Hemelryk
21a57b04de MDL-42629 course: improved wording on move course dialogue 2013-11-05 09:48:38 +08:00
Sam Hemelryk
09ae02b7aa MDL-42300 course: improved category re-sort controls. 
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
 2013-11-05 09:48:38 +08:00
Eloy Lafuente (stronk7)
6644b04666 MDL-42701 Bump main version to observe all deps 2013-11-05 02:37:19 +01:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
9995aa3852 Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle 2013-11-05 09:31:41 +08:00
Dan Poltawski
24a922e953 Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle 2013-11-04 23:40:33 +08:00
Dan Poltawski
dcc08e55b5 Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle 2013-11-04 23:34:18 +08:00
Dan Poltawski
a28c6b440e Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle 2013-11-04 22:54:09 +08:00
Dan Poltawski
5e70fc1f9c Merge branch 'MDL-42548' of git://github.com/timhunt/moodle 2013-11-04 22:34:27 +08:00
Dan Poltawski
efe938fca5 Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle 2013-11-04 22:31:55 +08:00
Dan Poltawski
4a17894ac5 Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle 2013-11-04 22:27:49 +08:00
Dan Poltawski
2c7b23a239 Merge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle 2013-11-04 22:17:19 +08:00