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
63309 commits 37 branches 544 tags 1.3 GiB
Commit graph

63309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
106c55fb9c MDL-22236 Webservice file upload - Allow webservice file uploads direct to a draft filearea. 
Via post to /webservice/upload.php
 2013-08-08 09:57:57 +08:00
sam marshall
5523c34462 MDL-41045 course_add_cm_to_section should not test for sections unless necessary 2013-08-07 17:17:04 +01:00
Frederic Massart
cbb3990bcb MDL-41071 core: plugininfo_mod caches in plugininfo_mod definition 2013-08-07 20:55:22 +08:00
Russell Smith
ba194bdf2b MDL-41068 profile: Repair profiling after box API change 
The box API was used with an extra incorrect parameter
in the profiling code.  It worked without issue until
the introduction of error checking in MDL-40842.  It
has failed since then.
 2013-08-07 19:02:56 +10:00
Sam Hemelryk
f05ea82cdc Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle 2013-08-07 15:19:49 +12:00
Mark Nelson
a739ff73da MDL-40662 block_course_overview: added addinstance capability string 2013-08-07 11:14:48 +08:00
Ankit Agarwal
d1554f599c MDL-40711 events: Resolve conflicts with MDL-41000 and add phpdocs 2013-08-07 11:01:05 +08:00
Ankit Agarwal
6c66b7f3b3 MDL-40711 blogs: Replace blog_entry_deleted with events2 2013-08-07 10:27:01 +08:00
Sam Hemelryk
d4519366f4 Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-08-07 14:01:51 +12:00
Frederic Massart
4d0752069e MDL-40934 core: Bump version requiring major upgrade 2013-08-07 09:37:50 +08:00
AMOS bot
8df80d25aa Automatically generated installer lang files 2013-08-07 00:42:59 +00:00
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
118d53f9ad MDL-40673 behat: New scenario for permission overrides 2013-08-06 15:04:48 +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
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
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
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