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

62832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sam Hemelryk
36671670e1 Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle 2013-08-06 17:51:30 +12: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
Sam Hemelryk
2ad4a763ab Merge branch 'wip-mdl-40469' of git://github.com/rajeshtaneja/moodle 2013-08-06 17:36:33 +12:00
Sam Hemelryk
206f18c836 Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle 2013-08-06 17:31:14 +12: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
5261f26e0e Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle 2013-08-06 16:55:48 +12:00
Marina Glancy
87934924be Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle 2013-08-06 14:38:08 +10:00
Sam Hemelryk
1d92024f99 Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle 2013-08-06 15:50:18 +12:00
Mark Nelson
b573724a03 MDL-27953 auth: documented the newly introduced function can_be_manually_set() in upgrade.txt 2013-08-06 15:46:14 +12: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
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
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