71303 Commits

Author SHA1 Message Date
Frederic Massart
ba55be9151 MDL-43902 output: Final deprecation of classes r0/r1 in table rows 2014-12-09 14:52:30 +08:00
Dan Poltawski
d87bcfb325 weekly release 2.9dev 2014-11-28 08:04:39 +00:00
Dan Poltawski
1c4ace2064 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-11-28 08:04:36 +00:00
Damyon Wiese
3e116130b0 Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle"
This reverts commit 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba.

This reverts commit f376c2ffd7d8304bafff851ead3ed10dee34c805, reversing
changes made to abe9be7240d7bda36bd3831b3638795466987745.
2014-11-28 15:07:31 +08:00
David Monllao
861a0fd92a MDL-38128 mod_assign: Changes in grading summary page using team submissions
If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.
2014-11-27 18:08:43 +08:00
Dan Poltawski
853b6cff9b Revert "Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle"
This reverts commit 4e75dd78e6c93f7c341bca703d292606436610d5, reversing
changes made to f376c2ffd7d8304bafff851ead3ed10dee34c805.
2014-11-27 09:33:52 +00:00
Dan Poltawski
e6f5a4b268 Revert "Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle"
This reverts commit 7bd780835b2e9ff8002da218a5ca42de8dc321b4, reversing
changes made to 1e7e4d5f01c7eaa2278aa38f8abd8c04197d51cc.
2014-11-27 09:33:48 +00:00
Dan Poltawski
e7087cb4c6 MDL-20365 auth_db: upgrade.txt - make the hash comment clearer 2014-11-27 08:43:32 +00:00
Dan Poltawski
4832be5a40 MDL-20365 auth_db: refinement to the upgrade.txt 2014-11-27 08:26:43 +00:00
David Monllao
c00cbdc784 MDL-20365 auth_db: Warning users about case sensitive plain passwords
Also, changing returned passwords to lower case when
maching against an md5() string or a sha1() string.
2014-11-27 13:57:06 +08:00
David Monllao
bc92aace89 MDL-22309 enrol_self: Fixing get_role_users usage 2014-11-27 11:32:58 +08:00
Eloy Lafuente (stronk7)
22645c9573 Merge branch 'wip-mdl-48190-m' of https://github.com/rajeshtaneja/moodle 2014-11-26 13:25:17 +01:00
Eloy Lafuente (stronk7)
e3d9fc3f5a MDL-20365 auth_db: cross-db passfield case and saltedcrypt unit test 2014-11-26 12:11:46 +01:00
Dan Poltawski
7bd780835b Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle 2014-11-26 09:22:56 +00:00
Frederic Massart
18edf3a325 MDL-43127 tool_uploadcourse: Empty enrolment method is acceptable
Without the patch a course would not be created if it contained
an enrolment method column with an empty value. e.g.:

shortname,fullname,category,enrolment_1,enrolment_1_disable
courserestored,Course restored,1,,
courserestored2,Course restored 2,manual,1
2014-11-26 17:11:35 +08:00
Dan Poltawski
1e7e4d5f01 Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle 2014-11-26 08:20:36 +00:00
David Mudrák
26f72b0058 MDL-48210 updates checker: Fix empty return type
Credit goes to Marina Glancy for catching during the testing.
2014-11-26 09:10:04 +01:00
Andrew Nicols
72590a5139 MDL-48148 mod_forum: Use correct original subject when handling replies 2014-11-26 15:58:05 +08:00
Sam Hemelryk
ac8c153862 Merge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle 2014-11-26 09:06:08 +13:00
Jetha Chan
918de7968a MDL-48191 gradebook: fixed floating headers when emails not displayed 2014-11-26 09:04:25 +13:00
Sam Hemelryk
55dc0eb979 Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle 2014-11-26 08:56:27 +13:00
Eloy Lafuente (stronk7)
0b861e92d0 Merge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:45:26 +01:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Eloy Lafuente (stronk7)
d2142e7b7c Merge branch '23538-29' of git://github.com/samhemelryk/moodle
Conflicts:
	backup/util/ui/renderer.php
2014-11-25 17:00:06 +01:00
Heiko Schach
000f1488f0 MDL-48036 course: change multilang cache key 2014-11-25 14:34:45 +00:00
Ashley Holman
e629bd3ff3 MDL-46356 assign: remove unnecessary get_area_files call 2014-11-25 14:27:17 +00:00
Dan Poltawski
1c356fe9d7 Merge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle 2014-11-25 13:59:33 +00:00
Dan Poltawski
b56f00d057 Merge branch 'MDL-41155-master' of git://github.com/gurgus/moodle 2014-11-25 13:18:13 +00:00
Eloy Lafuente (stronk7)
f34996256d Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle 2014-11-25 13:21:47 +01:00
Dan Poltawski
0da32b82d7 Merge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle 2014-11-25 11:28:19 +00:00
Dan Poltawski
3e8fe4baef Merge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle 2014-11-25 11:21:19 +00:00
Dan Poltawski
4e75dd78e6 Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle 2014-11-25 11:18:50 +00:00
Dan Poltawski
f376c2ffd7 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-11-25 11:07:50 +00:00
Eloy Lafuente (stronk7)
abe9be7240 Merge branch '48189-29' of git://github.com/samhemelryk/moodle 2014-11-25 11:18:16 +01:00
Frederic Massart
d996c620a9 MDL-46416 group: Allow group pictures to be deleted 2014-11-25 11:58:13 +08:00
Frederic Massart
21449d01b7 MDL-46416 group: Use a revision number for group pictures 2014-11-25 11:58:13 +08:00
Frederic Massart
61380ed2a2 MDL-43127 tool_uploadcourse: Add support for more enrolment methods 2014-11-25 11:00:56 +08:00
Sam Hemelryk
22fc0d15dd Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle 2014-11-25 15:54:12 +13:00
David Monllao
ec802d8ef6 MDL-38128 mod_assign: Adding group selector to grading summary page
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
2014-11-25 10:44:36 +08:00
David Monllao
99e434f2fa MDL-31500 backup: Warn users about front page backups
They should know that they can only be restored on the front
page before selecting the destination course.
2014-11-25 10:30:25 +08:00
David Monllao
d62c556110 MDL-31500 backup: Remove frontpage restore UI restrictions 2014-11-25 09:37:53 +08:00
Sam Hemelryk
159928822c MDL-23839 navigation: fixed php5.5ism 2014-11-25 14:35:30 +13:00
Sam Hemelryk
328e4e4c77 Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle 2014-11-25 14:07:08 +13:00
Eloy Lafuente (stronk7)
e445e28d6c Merge branch '48334-29' of git://github.com/samhemelryk/moodle 2014-11-25 01:18:11 +01:00
Jetha Chan
71688853e0 MDL-23912 core_comment: update count after deletion 2014-11-25 12:29:07 +13:00
Eloy Lafuente (stronk7)
27bfd2c4d1 Merge branch '38343-29' of git://github.com/samhemelryk/moodle 2014-11-25 00:26:41 +01:00
Eloy Lafuente (stronk7)
f62b278a91 Merge branch '48304-29' of git://github.com/samhemelryk/moodle 2014-11-25 00:23:42 +01:00
Sam Hemelryk
4cbf997db0 Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle 2014-11-25 11:02:19 +13:00
Sam Hemelryk
406712e989 Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-25 10:52:42 +13:00
Sam Hemelryk
9e65f9160a Merge branch 'MDL-48259' of git://github.com/timhunt/moodle 2014-11-25 10:49:54 +13:00