moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63309 commits 37 branches 540 tags 1.3 GiB
Commit graph

16741 commits

Author SHA1 Message Date
Sam Hemelryk
823c0c80e9 Merge branch 'MDL-40086-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/filestorage/file_storage.php
 2013-08-07 10:39:40 +12:00
Sam Hemelryk
774b1089a5 Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle 
Conflicts:
	lib/weblib.php
 2013-08-07 10:23:32 +12:00
Sam Hemelryk
2e1d38db6f MDL-41023 weblib: improved coding style 2013-08-07 08:22:05 +12:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
sam marshall
b010a736b3 MDL-41050 Progress bar: Width parameter does not work 2013-08-06 17:35:25 +01:00
Marina Glancy
e7c21ac3be Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle 2013-08-07 00:16:53 +10:00
Marina Glancy
25b8ce9278 Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle 2013-08-07 00:10:44 +10:00
Marina Glancy
9be9b412b1 Merge branch 'wip-mdl-40126' of git://github.com/rajeshtaneja/moodle 2013-08-06 22:53:19 +10:00
Marina Glancy
18a4335366 Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle 2013-08-06 22:33:55 +10:00
Marina Glancy
2cf88d54fb MDL-40682 MDL-41000 event name and description return strings 
event description is non-localised string
 2013-08-06 22:25:21 +10:00
Marina Glancy
4b96f2ae62 Merge branch 'MDL-40682-master' of git://github.com/ankitagarwal/moodle 2013-08-06 21:05:47 +10:00
Marina Glancy
287e2a34db MDL-41034 Additional check to be extra sure that no JS error occurs 2013-08-06 20:59:21 +10:00
Marina Glancy
e7328732e9 Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle 2013-08-06 20:49:13 +10:00
Ankit Agarwal
c1ff221eee MDL-40682 events: Add phpdocs for class and init method 2013-08-06 15:13:05 +08:00
David Monllao
81cd8572ba MDL-40673 behat: Data generator for permission overrides 2013-08-06 15:04:48 +08:00
Ankit Agarwal
320aee339c MDL-40935 phpunit: Remove assertLegacyEventName() since get_legacy_eventname() is public now 2013-08-06 14:58:30 +08:00
Ankit Agarwal
2244600337 MDL-40935 events: get_legacy_eventname() should be public and static 2013-08-06 14:25:37 +08:00
Frederic Massart
bc42e97989 MDL-40086 file: Correct ordering of subdirectories 
Thanks to Mohamed Alsharaf for the proposed solution.
 2013-08-06 13:53:54 +08:00
Sam Hemelryk
d2132f02e2 Merge branch 'wip-mdl-41000' of git://github.com/rajeshtaneja/moodle 2013-08-06 17:45:16 +12:00
Sam Hemelryk
9c83b82b1b Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle 2013-08-06 17:39:41 +12:00
David Monllao
95b43d6b90 MDL-40852 behat: Wrong URLs detection 2013-08-06 13:23:07 +08:00
Marina Glancy
0fb7a90363 Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle 2013-08-06 15:03:26 +10:00
Sam Hemelryk
17440b2198 Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-08-06 15:38:18 +12:00
Andrew Davis
9279cae63b MDL-37962 core_message:reimplemented the beep on new message functionality from 1.9 2013-08-06 10:30:07 +07: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
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
Kyle Temkin
f936128f5b MDL-41034 fix TinyMCE managefiles plugin for textareas that do not support file uploads 
The current managefiles plugin assumes that every file manager will be created
by either calling use_editor without filepicker options ($fpoptions) or with
filepicker options that include options for the moodleimage plugin.
 2013-08-05 16:12:16 -04: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
Sam Hemelryk
2b80bb33df Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle 2013-08-05 14:15:27 +12:00
Damyon Wiese
ade4695de0 MDL-36002 dragdrop: Add simulated event for keyboard drag drop. 
This is to prevent any accidental state change in Y.DD.DDM.
 2013-08-05 09:39:11 +08:00
Sam Hemelryk
d89733f6c7 MDL-41025 moodlelib: addressed todo on truncate_userinfo 2013-08-05 09:34:55 +12:00
Sam Hemelryk
0142523d08 MDL-41024 lib: deprecate isediting 2013-08-05 09:24:06 +12: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
f0f0e1fe73 MDL-40815 deprecate events_trigger() 2013-08-02 16:48:19 +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
Ruslan Kabalin
b2b2c136b6 MDL-40947: Fix segmentation fault issue in get_fast_modinfo. 2013-08-02 09:53:28 +01:00