mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
62,788 Commits 36 Branches 519 Tags
Commit Graph

62788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
c3aefeb5a6 Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle 2013-08-06 14:39:49 +12:00
Sam Hemelryk
e145762b17 Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle 
Conflicts:
	auth/tests/auth_test.php
 2013-08-06 14:37:43 +12:00
Sam Hemelryk
3550fc28fb NOBUG: fixed whitespace 2013-08-06 14:03:54 +12:00
Sam Hemelryk
471dd4ff67 Merge branch 'MDL-40963-master' of git://github.com/ankitagarwal/moodle 2013-08-06 13:59:23 +12:00
Sam Hemelryk
fe33106bb1 Merge branch 'MDL-40955-m' of git://github.com/andrewnicols/moodle 
Conflicts:
	course/format/upgrade.txt
 2013-08-06 12:49:28 +12:00
Sam Hemelryk
468ee9863d Merge branch 'MDL-40953-m' of git://github.com/andrewnicols/moodle 2013-08-06 12:45:20 +12:00
Sam Hemelryk
c7c020aad2 Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle 2013-08-06 10:23:45 +12:00
Sam Hemelryk
911b271215 Merge branch 'MDL-27953_master' of https://github.com/markn86/moodle 2013-08-06 10:11:20 +12:00
Sam Hemelryk
b09abb05ab Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle 2013-08-06 08:53:24 +12:00
Sam Hemelryk
1eebbc2854 Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle 2013-08-06 08:49:28 +12:00
Marina Glancy
50c6e3ebac Merge branch 'MDL-41029-master' of git://github.com/FMCorz/moodle 2013-08-05 17:46:22 +10:00
Marina Glancy
698be6bbd0 Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle 2013-08-05 17:42:09 +10:00
Frederic Massart
513d879381 MDL-41029 core: Fix wrong guessing of course id in event base 2013-08-05 15:41:16 +08:00
Marina Glancy
fd6d13bab1 Merge branch 'MDL-36011-master' of git://github.com/damyon/moodle 2013-08-05 17:15:38 +10:00
Shane Elliott
0604e03bf9 MDL-40684 Fix conditional field name for custom user fields 2013-08-05 15:51:37 +12:00
Marina Glancy
f5472d1fd4 Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle 2013-08-05 13:49:55 +10:00
Sam Hemelryk
6aed99dd0a Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle 2013-08-05 15:46:59 +12:00
Sam Hemelryk
2c5c56e974 Merge branch 'MDL-38758_master' of https://github.com/markn86/moodle 2013-08-05 15:37:37 +12:00
Sam Hemelryk
176a60227d Merge branch 'MDL-35922-master' of git://github.com/phalacee/moodle 2013-08-05 15:33:09 +12:00
Damyon Wiese
1196cc4d28 MDL-30852 grade report: More coding guideline cleanups. 2013-08-05 11:23:29 +08:00
Marina Glancy
f64777a93f Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle 2013-08-05 13:15:25 +10:00
Sam Hemelryk
4c7f0562d0 Merge branch 'MDL-35927' of git://github.com/rwijaya/moodle 2013-08-05 14:38:47 +12:00
Marina Glancy
40e0dbd5ac Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle 2013-08-05 12:30:56 +10:00
Marina Glancy
e22e263fa0 Merge branch 'MDL-35981-master' of git://github.com/damyon/moodle 2013-08-05 12:19:45 +10:00
Sam Hemelryk
2b80bb33df Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle 2013-08-05 14:15:27 +12:00
Sam Hemelryk
335fcfa4f9 Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle 2013-08-05 14:06:26 +12:00
Damyon Wiese
31d861d19b MDL-35981 comments: Fix for keyboard control of "add a comment" 2013-08-05 09:49:38 +08:00
Sam Hemelryk
324b489bdb Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle 2013-08-05 13:36:56 +12:00
Marina Glancy
98260b31a5 Merge branch 'wip-mdl-40933' of git://github.com/rajeshtaneja/moodle 2013-08-05 10:48:36 +10:00
Marina Glancy
a9881c1750 MDL-34785 performance improvement with big list of courses 2013-08-05 10:13:19 +10:00
Petr Škoda
aed2b9ba9c MDL-40901 use assertInternalType() 2013-08-04 22:16:03 +02:00
Petr Škoda
8252b7c291 MDL-40901 standardise core test case class and file names 
This finally allows us to type only the class name when executing individual core test cases.
 2013-08-04 22:10:31 +02:00
Petr Škoda
2e242f4c6b MDL-40940 try to guess testcase location using info from /phpunit.xml 
This will help with core tests in non-standard core subsystem locations.
 2013-08-04 21:44:13 +02:00
Petr Škoda
2d1884d987 MDL-40943 use observer priority only inside group of observers 
This makes the '*' observers to be executed always first. This change allows us to implement parent event class catching if we ever decide we need it without breaking BC. This change includes some more unit test fixes.
 2013-08-04 13:48:03 +02:00
Petr Škoda
6b32d6bc93 MDL-40995 simplify minify integration and fix all known issues 2013-08-03 17:16:17 +02:00
Petr Škoda
528a7b447a MDL-41017 improve purify caching 
The improvements include:

* HTMLPurifier cache is stored in localcachedir
* allowobjectembed changes are not ignored any more
* the cache keys include revision and all options which makes
  this suitable for local caches on cluster nodes
* unchanged test is replaced by "true" value which should
  significantly improve performance
* removal of purge_all_caches() hack for directory recreation
* comments and coding style cleanup
 2013-08-03 11:31:18 +02:00
Petr Škoda
7c3943ad0c MDL-40889 prevent 304 when minimising JS 2013-08-02 16:27:34 +02:00
Frederic Massart
d6277b0ca0 MDL-40997 phpunit: Assertions for events legacy data 2013-08-02 18:30:02 +08:00
Damyon Wiese
e1e9ade581 MDL-30852 grade: Coding style fix for user report. 2013-08-02 14:40:23 +08:00
Steve Bader
f19dd840ff MDL-30852 grade report: Add aria attributes 
Converted to git branch by Damyon
 2013-08-02 13:57:27 +08:00
Damyon Wiese
fe1c01e751 MDL-35981 comments: Add comment about keycodes for space and enter. 2013-08-02 11:42:45 +08:00
Damyon Wiese
afc9ebd3e8 MDL-35981 comments: Remove confirm step from behat delete comments. 2013-08-02 11:42:45 +08:00
Damyon Wiese
ba29e212cd MDL-35981 comments: Make delete comment keyboard accessible. 2013-08-02 11:42:44 +08:00
Damyon Wiese
fdf70473a5 MDL-36011 tablelib: Make column headers expand/collapse links accessible. 2013-08-02 11:24:53 +08:00
Sam Hemelryk
a31e811563 weekly release 2.6dev 2013-08-02 08:21:15 +12:00
Sam Hemelryk
3d2128f6d4 NOBUG: fix file permissions 2013-08-02 08:17:40 +12:00
Sam Hemelryk
b3db9ddaf8 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-08-02 08:11:35 +12:00
sam marshall
be108c7ab0 MDL-40320 Course page: Text greyed when conditional activity available 2013-08-01 14:14:43 +01:00
Sam Hemelryk
6cd213567b MDL-40842 behat: fixed a typo 2013-08-01 20:15:29 +12:00
Rossiani Wijaya
f26cc2bea7 MDL-35927 filepicker: add aria attribute to display modal error 2013-08-01 15:38:07 +08:00