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

69345 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Petr Skoda
98cb244de1 MDL-45144 delete duplicated legacy log entries in mod_book 
The general agreement is we should trigger one event
per simple action.

This partially resolves MDL-39963.
 2014-04-17 13:30:30 +08:00
Frederic Massart
d9a4f52927 MDL-42761 badges: Remove H2s from help popup 2014-04-17 12:46:07 +08:00
Charles Fulton
2f9c7f45dc MDL-45148 unit testing: pass role id instead of user id 2014-04-16 20:46:00 -07:00
Andrew Nicols
8ae76e1388 MDL-45119 editpdf: Do not load quick comments in read-only mode 2014-04-17 11:43:51 +08:00
Andrew Nicols
5344148b34 MDL-45119 ajax: Correct use of COUNT in exception dialogue 2014-04-17 11:43:51 +08:00
Andrew Nicols
10d7d8f2b7 MDL-45119 ajax: AJAX exceptions need a String in the Link 2014-04-17 11:43:51 +08:00
Marina Glancy
43a7ac723d MDL-45087 report_log: do not show anonymous actions, use indexes 2014-04-17 11:40:50 +08:00
Sam Hemelryk
3bf384d0e3 MDL-45147 my: automate testing of block restriction 2014-04-17 15:30:00 +12:00
Marina Glancy
0b10dfce9d Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle 2014-04-17 11:20:51 +08:00
Marina Glancy
127daca011 Merge branch 'wip-mdl-45143' of git://github.com/rajeshtaneja/moodle 2014-04-17 11:04:26 +08:00
Marina Glancy
2d6221b2ae Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle 2014-04-17 11:04:10 +08:00
Marina Glancy
8416d55261 Merge branch 'MDL-44618_master' of git://github.com/dmonllao/moodle 2014-04-17 11:03:52 +08:00
Marina Glancy
c5b027629f Merge branch 'MDL-44617_master' of git://github.com/dmonllao/moodle 2014-04-17 11:03:25 +08:00
Petr Skoda
0202d43dd4 MDL-41101 verify contextlevel in all assign events 2014-04-17 11:01:18 +08:00
Marina Glancy
354aca95f4 Merge branch 'MDL-44992-master' of git://github.com/sammarshallou/moodle 2014-04-17 11:01:16 +08:00
Damyon Wiese
7c9b2aafeb MDL-35373 mod_assign: Add a behat test for word count limit. 2014-04-17 10:27:07 +08:00
Petr Škoda
4781ff2e5f MDL-41101 use snapshots for submissions and grades in assign events 2014-04-17 09:59:09 +08:00