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

68666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
2eb4176242 Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle 2014-05-20 15:54:25 +08:00
Frederic Massart
a71ece3757 MDL-45563 message: Inverting IDs in description of event message_viewed 2014-05-20 15:51:07 +08:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Mark Nelson
9d4b3d42fc MDL-45629 mod_assign: removed use of '$this->objectid' in the submission_status_viewed event 2014-05-19 23:51:09 -07:00
Marina Glancy
78ee646dd9 Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:28:36 +08:00
Marina Glancy
143eef0e37 Merge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:25:10 +08:00
Marina Glancy
fdece45b06 Merge branch 'wip-MDL-45512-master' of git://github.com/abgreeve/moodle 2014-05-20 14:21:56 +08:00
Marina Glancy
4cc89d51eb Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle 2014-05-20 14:12:38 +08:00
Marina Glancy
4d46c88b9f Merge branch 'MDL-44333' of git://github.com/timhunt/moodle 2014-05-20 14:10:03 +08:00
Dan Poltawski
287a42e49a Merge branch 'MDL-45571_master' of https://github.com/markn86/moodle 2014-05-20 14:06:42 +08:00
Damyon Wiese
702c08cbee Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle 2014-05-20 13:31:06 +08:00
Damyon Wiese
5dc3d0ca2b Merge branch 'MDL-45323-master' of git://github.com/lameze/moodle 2014-05-20 13:27:48 +08:00
Dan Poltawski
959599a929 Merge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle 2014-05-20 13:23:35 +08:00
Frederic Massart
2236a5655b MDL-45566 message: Send blocking events when user is not in contact list 2014-05-20 13:17:58 +08:00
Damyon Wiese
c186e87ab7 Merge branch 'MDL-45476-master' of git://github.com/phalacee/moodle 2014-05-20 13:06:09 +08:00
Andrew Nicols
2789afa842 MDL-45627 mod_fourm: Move subscriber classes to separate class files 2014-05-20 13:03:02 +08:00
Andrew Nicols
6add5fb752 MDL-41313 mod_forum: Remove deprecated post_form.php 2014-05-20 12:41:11 +08:00
Frederic Massart
93f05f049d MDL-45545 csslib: Chunking handles commas in media query definitions 2014-05-20 12:21:45 +08:00
Marina Glancy
497974f3e8 MDL-45469 Move profile tests to the location recognised by phpunit 2014-05-20 11:58:35 +08:00
Dan Poltawski
c51ad7cbe2 Merge branch 'wip-MDL-45466-master' of git://github.com/marinaglancy/moodle 2014-05-20 11:51:53 +08:00
Sam Hemelryk
46921d74a6 Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 15:42:32 +12:00
Dan Poltawski
c3c424a05c MDL-44027 groups: remove some junk html 2014-05-20 15:40:37 +12:00
Dan Poltawski
3bd9c97774 Merge branch 'MDL-45605-master' of git://github.com/damyon/moodle 2014-05-20 10:51:16 +08:00
Frederic Massart
885650c70c MDL-45546 mod_forum: Login the user before getting its context 2014-05-20 10:25:07 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Sam Hemelryk
37fddc545c Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle 2014-05-20 13:59:23 +12:00
Marina Glancy
f0085cd6ab Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle 2014-05-20 09:52:25 +08:00
Dan Poltawski
0c722830d9 Merge branch 'MDL-44449' of git://github.com/timhunt/moodle 2014-05-20 09:50:43 +08:00
Dan Poltawski
93b9ded2de Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle 2014-05-20 09:30:19 +08:00
Sam Hemelryk
7be0b69893 Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle 2014-05-20 13:09:34 +12:00
Damyon Wiese
cf229a526c Merge branch '44974-28' of git://github.com/samhemelryk/moodle 2014-05-20 08:49:56 +08:00
Sam Hemelryk
00a8c0d956 Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle 2014-05-20 12:07:12 +12:00
Sam Hemelryk
4dc5c77f33 Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:58:12 +12:00
Sam Hemelryk
a3abb19716 Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:55:35 +12:00
Sam Hemelryk
58a3ed7df3 Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle 2014-05-20 11:43:13 +12:00
Frederic Massart
e722133aee MDL-45474 atto_undo: Remove notice when undo stack is empty 2014-05-20 10:47:32 +12:00
Sam Hemelryk
08480b7a0f Merge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle 2014-05-20 10:42:09 +12:00
Simon Coggins
9811cb650c MDL-45623: Fix assigned users count on role delete confirmation page 2014-05-20 10:01:00 +12:00
Sam Hemelryk
d57e3f8201 Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 08:52:54 +12:00
Sam Hemelryk
adb5d8a5d6 Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle 2014-05-20 08:47:16 +12:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Tim Hunt
35cbe84bf7 MDL-44449 quiz access rules should have a delete hook. 
So they can clean up their settings when the quiz is deleted.

See
babf149c2c
for an example of using this.
 2014-05-19 16:59:04 +01:00
Damyon Wiese
495243f35c Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle 2014-05-19 21:20:10 +08:00
Damyon Wiese
e9e12c97fe Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle 2014-05-19 20:52:19 +08:00
Damyon Wiese
e1a83b8327 Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle 2014-05-19 20:18:59 +08:00
Damyon Wiese
cc3dfc2c5f Merge branch 'MDL-43833' of git://github.com/timhunt/moodle 2014-05-19 20:11:50 +08:00
Damyon Wiese
2b3a371239 Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle 2014-05-19 20:04:50 +08:00
Damyon Wiese
0cce8af367 Merge branch 'MDL-45455' of git://github.com/timhunt/moodle 2014-05-19 19:54:42 +08:00
Dan Poltawski
c1e3f99249 Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle 2014-05-19 18:43:15 +08:00
sam marshall
abdbfc76fc MDL-45469 Conditional availability: Restrict by text area broken 
It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field.
 2014-05-19 11:37:51 +01:00