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
67,906 Commits 36 Branches 519 Tags
Commit Graph

67906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
4d1becbbab MDL-40716 report_completion: Set RTL 2014-04-22 15:06:23 +08:00
Sam Hemelryk
23a9a5632c Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle 
Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
 2014-04-22 10:46:51 +12:00
Sam Hemelryk
65ffd68179 Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle 2014-04-22 10:39:09 +12:00
Sam Hemelryk
24901691a1 Merge branch 'mdl45012-master' of https://github.com/tlock/moodle 2014-04-22 10:10:04 +12:00
Sam Hemelryk
7ecb30d765 Merge branch 'wip-MDL-45037-master' of git://github.com/abgreeve/moodle 2014-04-22 09:59:01 +12:00
Sam Hemelryk
e237b23ebf Merge branch 'MDL-44270' of git://github.com/jonof/moodle 2014-04-22 09:18:20 +12:00
Sam Hemelryk
c6d1088db0 Merge branch 'MDL-45118-shibboleth-login-warning' of https://github.com/mpetrowi/moodle 2014-04-22 09:15:55 +12:00
Sam Hemelryk
4e61249dd9 Merge branch 'MDL-42761-master' of git://github.com/FMCorz/moodle 2014-04-22 08:57:25 +12:00
Sam Hemelryk
56418292f1 Merge branch 'MDL-45138-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
 2014-04-22 08:29:38 +12:00
Eloy Lafuente (stronk7)
b69e9d8724 Merge branch 'MDL-45205-master-option2' of git://github.com/danpoltawski/moodle 2014-04-21 15:26:37 +02:00
Dan Poltawski
452ef53428 MDL-45205 backup: avoid oracle incompatible query 
Instead of aliasing column name with sql, use the backup API.
 2014-04-21 20:36:52 +08:00
Dan Poltawski
95f7bd8c0d Merge branch 'MDL-45114-master' of git://github.com/jamiepratt/moodle 2014-04-21 14:45:10 +08:00
Dan Poltawski
b576d3fec0 Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle 2014-04-21 14:41:23 +08:00
Dan Poltawski
eec3795270 Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle 2014-04-21 10:51:38 +08:00
Dan Poltawski
085c68d959 Merge branch 'MDL-45171' of git://github.com/stronk7/moodle 2014-04-21 10:12:34 +08:00
James Pratt
9b604f28d2 MDL-45114 quiz simulate report : multi-choice multi qtype response data 
fixing download.
 2014-04-19 15:04:16 +07:00
Eloy Lafuente (stronk7)
6b139edaf9 MDL-45171 log reports: fix sql for cross support 
Rules for cross-db support are:

- Always use the 'AS' keyword for columns.
- Never use the 'AS' keyword for tables/views.
 2014-04-18 17:34:06 +02:00
Dan Poltawski
c8ca0cea77 Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle 2014-04-18 15:27:41 +08:00
Dan Poltawski
c1985943de Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle 2014-04-18 15:12:21 +08:00
Dan Poltawski
3497702ae5 Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle 2014-04-18 14:54:54 +08:00
Dan Poltawski
3c9016eff1 Merge branch '45147-27' of git://github.com/samhemelryk/moodle 2014-04-18 14:16:23 +08:00
Dan Poltawski
d2907f5cb9 Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle 2014-04-18 14:07:53 +08:00
Dan Poltawski
ac13361b77 Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle 2014-04-18 13:47:10 +08:00
Dan Poltawski
f658717108 Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle 2014-04-18 12:03:23 +08:00
Dan Poltawski
aee01173f7 Merge branch '45123-27' of git://github.com/samhemelryk/moodle 2014-04-18 11:54:48 +08:00
Dan Poltawski
d2b8b67a9c Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-18 11:49:39 +08:00
Dan Poltawski
3ff2fae230 Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle 2014-04-18 11:42:36 +08:00
Dan Poltawski
3bc5fbebc5 Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle 2014-04-18 11:10:39 +08:00
Rajeev S
4a8347b294 MDL-43789: coursename disallows spaces in user bulk actions filter 
Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.
 2014-04-18 11:07:14 +08:00
Dan Poltawski
a6d4ba1d97 Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle 2014-04-18 10:52:45 +08:00
Dan Poltawski
768a10f066 Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle 2014-04-18 10:50:06 +08:00
Dan Poltawski
a94b4c6e55 Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle 2014-04-18 10:47:04 +08:00
Dan Poltawski
166dfd56b8 Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle 2014-04-18 10:30:12 +08:00
Dan Poltawski
2e6b251de2 Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle 2014-04-18 10:26:38 +08:00
Dan Poltawski
af80f7b4a5 Merge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
 2014-04-18 10:23:45 +08:00
Dan Poltawski
b8d2340bb7 Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle 2014-04-18 10:05:26 +08:00
Dan Poltawski
b67362cf98 Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle 2014-04-18 09:57:21 +08:00
Mark Nelson
a97a7585ff MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event 2014-04-17 18:44:58 -07:00
Eloy Lafuente (stronk7)
a0461340ff on-demand release 2.7beta+ 2014-04-17 15:49:54 +02:00
sam marshall
1282c47446 MDL-45138 Conditional availability: toggling AND/OR affects nested groups 2014-04-17 14:09:12 +01:00
Dan Poltawski
63476b0f6f Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle 2014-04-17 17:02:04 +08:00
Damyon Wiese
186f092ee8 Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle 2014-04-17 16:17:12 +08:00
Marina Glancy
c18c7869fa Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle 2014-04-17 15:57:03 +08:00
Simey Lameze
da223c11a5 MDL-44990 logging: Capabilites removed from legacy and standard log. 2014-04-17 15:50:59 +08:00
Petr Skoda
c95f956851 MDL-45144 describe mod_book events changes 2014-04-17 15:35:03 +08:00
Marina Glancy
5bbc92e19c Merge branch 'MDL-44658' of git://github.com/danielneis/moodle 2014-04-17 15:06:09 +08:00
Damyon Wiese
5cfa441ba7 MDL-41101 assign: Add relateduserid to some events 
When events are acting on another users submission, it makes
sense to put the submission->userid in the relateduserid field.
 2014-04-17 15:05:24 +08:00
Frederic Massart
970c44196c MDL-39607 theme: Update Moodle logo 2014-04-17 14:33:39 +08:00
Petr Skoda
ef2a9ece71 MDL-45144 convert book events to create_from_xxx() helpers 2014-04-17 14:29:31 +08:00
Marina Glancy
3e5ee8073b MDL-45154 user profiles: avoid redirection warnings 2014-04-17 14:25:52 +08:00