moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63921 commits 37 branches 544 tags 1.3 GiB
Commit graph

63921 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marina Glancy
f0655ecb71 Merge branch 'MDL-40737-master' of git://github.com/FMCorz/moodle 2013-08-06 13:04:38 +10:00
Sam Hemelryk
68736bd623 Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle 2013-08-06 14:47:38 +12:00
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
AMOS bot
e637a5b3f0 Automatically generated installer lang files 2013-08-06 00:42:16 +00: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
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
Frederic Massart
42f4ba9b65 MDL-40737 tool_uploadcourse: Prove that category equals to 0 is handled 2013-08-05 15:32:43 +08:00
Frederic Massart
0e8f56103c MDL-40737 tool_uploadcourse: Prevent update of frontpage 2013-08-05 15:23:22 +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
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
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
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
529342bb9f MDL-41002 fix typo causing fatal error on other users page 
Credit goes to Bernhard Brandstetter, thanks!
 2013-08-04 15:00:53 +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
7f0ffc544a MDL-41020 fix installer notices 2013-08-04 10:18:10 +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
Ruslan Kabalin
f8e28244cb MDL-31226: quiz: Fix message for attempts built on previous. 
At the moment, when attempt is built on the last one, "not yet answered"
message is shown, which confuses many people. This patch modifies the state to
"complete" for attempt based on previous and modifies the output string.

Many thanks to Tim Hunt for guiding me through quiz infrastructure and some code
suggestions.
 2013-08-02 16:19:18 +01:00
Petr Škoda
f0f0e1fe73 MDL-40815 deprecate events_trigger() 2013-08-02 16:48:19 +02:00