mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-05 15:57:04 +02:00
Code Issues Projects Releases Wiki Activity
68,766 Commits 37 Branches 536 Tags
85ee901b5e
Commit Graph

68766 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
85ee901b5e MDL-46045 whitespace fix 2014-06-24 21:50:05 +02:00
Eloy Lafuente (stronk7)
046930cfba Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle 2014-06-24 21:48:30 +02:00
Eloy Lafuente (stronk7)
e5d7c55151 Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	mod/forum/tests/maildigest_test.php
 2014-06-24 20:25:58 +02:00
Damyon Wiese
dd6279788d Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle 2014-06-24 16:58:04 +08:00
Marina Glancy
89d91403f9 Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle 2014-06-24 16:14:31 +08:00
Damyon Wiese
582abd9414 Merge branch 'MDL-10115-master' of git://github.com/xow/moodle 2014-06-24 16:03:21 +08:00
John Okely
3e40c056e8 MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers 2014-06-24 15:38:15 +08:00
Andrew Nicols
ca14c76f3b MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions 2014-06-24 14:48:23 +08:00
Damyon Wiese
2ef26ad94f Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle 2014-06-24 14:19:20 +08:00
Damyon Wiese
d9640a99ba Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-06-24 14:10:51 +08:00
Damyon Wiese
e9018b50a2 Merge branch 'MDL-46031' of git://github.com/timhunt/moodle 2014-06-24 14:05:54 +08:00
Marina Glancy
9cd5966168 Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle 2014-06-24 13:52:30 +08:00
Marina Glancy
8d879f3928 Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle 2014-06-24 13:51:30 +08:00
Marina Glancy
bb9fd6b29d Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle 2014-06-24 13:51:20 +08:00
Damyon Wiese
c10fa5da47 MDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign 2014-06-24 13:43:42 +08:00
Damyon Wiese
e70f8d0a30 MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages. 2014-06-24 13:42:53 +08:00
Marina Glancy
5c5d182301 Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle 2014-06-24 13:32:13 +08:00
Marina Glancy
245697d7bd Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle 2014-06-24 13:28:51 +08:00
Damyon Wiese
2b48432da2 Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle 2014-06-24 13:10:32 +08:00
Damyon Wiese
b63bf750bd Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle 2014-06-24 13:07:57 +08:00
Marina Glancy
e28d6b29dc MDL-42716 assign: whitespace fix 2014-06-24 13:04:49 +08:00
Michael Hughes
323f221b11 MDL-42716 Assign: Implemented capability based viewing of blind details (squashed) 2014-06-24 12:27:10 +08:00
Andrew Nicols
035746504a MDL-1626 mod_forum: Update discussion subscriptions when moving discussions 2014-06-24 12:16:34 +08:00
Andrew Nicols
ebfb73db7b MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions 
AMOS BEGIN
  MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END
 2014-06-24 12:16:34 +08:00
Barbara Ramiro
a42d781864 MDL-1626 mod_forum: Add icons for subscription status 2014-06-24 12:16:34 +08:00
Andrew Nicols
49566c8a67 MDL-1626 mod_forum: Make cron handle discussion subscriptions 2014-06-24 12:16:34 +08:00
Andrew Nicols
e3bbfb52c4 MDL-1626 mod_forum: Add functions to change user discussion subscription state 2014-06-24 12:16:34 +08:00
Andrew Nicols
59075a4349 MDL-1626 mod_forum: Move subscription management to a separate class 2014-06-24 12:16:33 +08:00
Andrew Nicols
361a41d355 MDL-1626 mod_forum: Create new discussion subscription tracking table 2014-06-24 12:16:33 +08:00
Andrew Nicols
dc0464801d MDL-1626 mod_forum: Add behat tests for existing functionality 2014-06-24 12:16:33 +08:00
Andrew Nicols
a7a849038a MDL-1626 mod_forum: Add unit tests for forum cron mail behaviour 2014-06-24 12:16:33 +08:00
Damyon Wiese
95664d548f Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle 2014-06-24 11:44:42 +08:00
Damyon Wiese
44a0b1e700 Merge branch 'MDL-46056-master' of git://github.com/mudrd8mz/moodle 2014-06-24 11:34:23 +08:00
Damyon Wiese
5d71e8b51a Merge branch 'wip-MDL-36003-master' of git://github.com/abgreeve/moodle 2014-06-24 11:23:21 +08:00
Damyon Wiese
c32161a82c Merge branch 'MDL-44512-master' of git://github.com/jethac/moodle 2014-06-24 10:38:48 +08:00
Damyon Wiese
f8793245e8 Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle 2014-06-24 10:08:28 +08:00
Eloy Lafuente (stronk7)
af03e18f48 Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle 2014-06-24 00:56:31 +02:00
Eloy Lafuente (stronk7)
b362c8f90d Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle 2014-06-24 00:46:36 +02:00
Eloy Lafuente (stronk7)
fbdb6497d6 Merge branch 'MDL-45958-master' of git://github.com/ankitagarwal/moodle 2014-06-24 00:17:27 +02:00
Eloy Lafuente (stronk7)
70465e7cb5 Merge branch 'MDL-45764_generalTool' of https://github.com/moodlerooms/moodle 2014-06-24 00:01:51 +02:00
Damyon Wiese
2dffa24f10 Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle 2014-06-23 15:17:45 +08:00
Frederic Massart
b4148e4688 MDL-45580 assignfeedback_editpdf: Save readonly version in backup 2014-06-23 14:46:18 +08:00
Damyon Wiese
e3c82bc974 Merge branch '37145-28' of git://github.com/samhemelryk/moodle 2014-06-23 14:31:46 +08:00
Frederic Massart
7dbbb848c6 MDL-45580 assignfeedback_editpdf: Delete draft content on new submission 2014-06-23 14:17:24 +08:00
Frederic Massart
098f7dd438 MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF 2014-06-23 14:16:49 +08:00
Damyon Wiese
0faba5386c Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle 2014-06-23 14:11:30 +08:00
Damyon Wiese
7fb32aaafc MDL-41746 External api: Allow multiple calls to validate_context at different levels 
(Only from webservices)
 2014-06-23 13:38:53 +08:00
Damyon Wiese
2404605ad4 Merge branch 'MDL-35453' of git://github.com/timhunt/moodle 2014-06-23 12:29:36 +08:00
Damyon Wiese
69377ddfab Merge branch 'MDL-46086' of git://github.com/timhunt/moodle 2014-06-23 12:26:00 +08:00
Damyon Wiese
a51201a433 Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle 2014-06-23 12:20:04 +08:00