Commit graph

71055 commits

Author SHA1 Message Date
Dan Poltawski
3194ca4b02 Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle 2014-11-11 19:05:45 +00:00
Dan Poltawski
e0fa3e952b Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle 2014-11-11 18:59:55 +00:00
Dan Poltawski
4bd5445447 Merge branch 'MDL-48168' of git://github.com/timhunt/moodle 2014-11-11 18:48:39 +00:00
Dan Poltawski
20ac3aa5e5 Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle 2014-11-11 17:21:09 +00:00
Dan Poltawski
cae0c46b9b Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle 2014-11-11 17:16:00 +00:00
Dan Poltawski
c69183a40f Merge branch 'MDL-48144' of git://github.com/stronk7/moodle 2014-11-11 08:07:19 +00:00
Tim Hunt
080839c421 MDL-48168 quiz editing: max grade should be editable after attempts
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
2014-11-10 19:00:05 +00:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
53fd1ae5ce Merge branch 'MDL-48143' of git://github.com/stronk7/moodle 2014-11-10 17:39:54 +01:00
Eloy Lafuente (stronk7)
00c78e2623 MDL-48143 backup: Bump release to 2.9 dev branch 2014-11-10 17:32:34 +01:00
sam marshall
540af6f38e MDL-48093 HTML 5 video: Firefox now supports .mp4 2014-11-10 10:48:28 +00:00
David Mudrák
5429afc042 MDL-48156 task: Skip the scheduled task only for really disabled plugins 2014-11-10 11:09:25 +01:00
Darko Miletic
ea99201d7d MDL-39376 enrol: Optimized setting for ldap and database 2014-11-10 16:45:43 +08:00
Eloy Lafuente (stronk7)
683d7de4d1 weekly back-to-dev release 2.9dev 2014-11-09 04:04:17 +01:00
Eloy Lafuente (stronk7)
21db825b19 Moodle release 2.8 2014-11-08 23:30:59 +01:00
Eloy Lafuente (stronk7)
3789b47f16 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-11-08 23:30:53 +01:00
AMOS bot
7a6b9b1e90 Automatically generated installer lang files 2014-11-09 00:05:33 +08:00
Eloy Lafuente (stronk7)
bea7509414 Merge branch 'MDL-48107_master' of https://github.com/markn86/moodle 2014-11-08 11:19:59 +01:00
Mark Nelson
8145ab3372 MDL-48107 tool_monitor: extended automated tests
Also adjusted them so they will pass with these changes.
2014-11-08 00:50:51 -08:00
Mark Nelson
884652378a MDL-48107 tool_monitor: prevent site rule removal when deleting a course 2014-11-08 00:49:00 -08:00
Mark Nelson
cbc4ecc7f9 MDL-48107 tool_monitor: added total subs to the delete rule string
Also made some minor language string changes.
2014-11-08 00:26:56 -08:00
Eloy Lafuente (stronk7)
17cc9fcd84 Moodle release 2.8rc2 2014-11-07 16:59:39 +01:00
Damyon Wiese
f2e5a435a6 MDL-47900 Event monitor: Fix name of cache lang string for event monitor
AMOS BEGIN
 MOV [cachedef_rules, tool_monitor],[cachedef_eventsubscriptions, tool_monitor]
AMOS END
2014-11-07 17:40:21 +08:00
Damyon Wiese
d04803595c Merge branch 'MDL-47900_master' of https://github.com/markn86/moodle 2014-11-07 16:58:52 +08:00
Eloy Lafuente (stronk7)
d79af819c6 Merge branch 'wip-mdl-48035' of https://github.com/rajeshtaneja/moodle 2014-11-07 09:37:32 +01:00
Damyon Wiese
3d4de122f2 Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle 2014-11-07 16:08:20 +08:00
Simey Lameze
8c674e80ec MDL-46986 mod_assign: Change the asserting to false 2014-11-07 15:54:14 +08:00
John Okely
a481e32f02 MDL-47949 mod_wiki: Validate parameters for page deletion 2014-11-07 15:29:40 +08:00
Marina Glancy
293f1b4d85 Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle 2014-11-07 15:03:32 +08:00
Rajesh Taneja
ea2b511d9a MDL-48035 mod_forum: Reverted string change in step to keep correct functionality 2014-11-07 13:43:19 +08:00
Marina Glancy
2f1d0ea663 Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle 2014-11-07 11:54:13 +08:00
Mark Nelson
c490ede369 MDL-47900 tool_monitor: expanded unit tests
Expanded the unit tests to ensure unnecessary events are not
saved in the DB and altered existing tests so they pass with
the introduction of this feature.
2014-11-06 18:46:45 -08:00
Mark Nelson
475635f52d MDL-47900 tool_monitor: created list of rules MUC 2014-11-06 18:46:44 -08:00
Damyon Wiese
419d1abdad MDL-48091 users: Revert "MDL-42875 users: Show only profile visible..."
This reverts commit a09a837f20.
2014-11-07 09:30:42 +08:00
Simey Lameze
274962a1e7 MDL-46986 mod_assign: Remove duplicate column identifier 2014-11-07 09:19:18 +08:00
Eloy Lafuente (stronk7)
415fc3d2f9 Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle 2014-11-06 18:44:38 +01:00
Eloy Lafuente (stronk7)
ed34ab47e1 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 17:40:50 +01:00
David Mudrák
f7dd19f01d MDL-48035 Fix more Behat tests regressions after merging en_fix strings 2014-11-06 16:19:11 +01:00
Andrew Nicols
a211c54388 MDL-48090 mod_forum: Optimise subquery out of discussion subs list 2014-11-06 13:39:44 +00:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Dan Poltawski
e323635e1b Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle 2014-11-06 09:14:48 +00:00
Dan Poltawski
4c37593dcd Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle 2014-11-06 08:58:27 +00:00
Dan Poltawski
4aeebe34b4 Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle 2014-11-06 08:53:55 +00:00
Andrew Nicols
2b0a7419c6 MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub 2014-11-06 16:50:36 +08:00
Jetha Chan
b7ee86966b MDL-47980 gradebook: fixed label for bulk insert select box 2014-11-06 16:37:23 +08:00
Marina Glancy
f2db391f59 Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle 2014-11-06 15:14:05 +08:00
Simey Lameze
7c2a2e1a93 MDL-47869 tool_monitor: Add sorting on event monitor pages 2014-11-06 14:53:10 +08:00
Damyon Wiese
527464a618 MDL-43430 ldap: whitespace fix 2014-11-06 12:05:32 +08:00
Damyon Wiese
bd6ee5c58a Merge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle 2014-11-06 12:00:12 +08:00