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
Andrew Nicols
6220813776
MDL-48309 mod_forum: Handle discussion subscriptions correctly
2014-11-25 09:23:51 +08:00
Andrew Nicols
5eddcfee34
MDL-48309 mod_forum: Add discussion subscription to the navigation
2014-11-25 09:16:08 +08:00
Sam Hemelryk
328e4e4c77
Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle
2014-11-25 14:07:08 +13:00
Brian Barnes
e45d9cd9bc
MDL-48359 webservices: Removed table from documentation page
2014-11-25 13:24:04 +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
Sam Hemelryk
9e921abaff
Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle
2014-11-25 09:42:46 +13:00
Sam Hemelryk
35ccccf368
Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle
2014-11-25 09:39:33 +13:00
Sam Hemelryk
c7c397ca39
MDL-20365 auth_db: post integration tweaks
...
* Fixes SQL indentation.
* Amended the new auth_dbsaltedcrypt string.
2014-11-25 09:05:24 +13:00
Sam Hemelryk
9e9af6736a
Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle
2014-11-25 08:19:04 +13:00
Dan Poltawski
1464bfe4be
Merge branch '47832-29-removed' of git://github.com/samhemelryk/moodle
2014-11-24 17:29:33 +00:00
Dan Poltawski
1f182f95e7
Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle
2014-11-24 17:26:30 +00:00
Dan Poltawski
1d9eb92ff3
Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle
2014-11-24 17:11:14 +00:00
Dan Poltawski
8030d84bbc
Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle
2014-11-24 17:02:09 +00:00
Dan Poltawski
1d79061651
Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
2014-11-24 16:29:25 +00:00
AMOS bot
58a582be9b
Automatically generated installer lang files
2014-11-25 00:04:03 +08:00
Dan Poltawski
dca771127a
Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle
2014-11-24 15:37:56 +00:00
Dan Poltawski
e378e6b397
Merge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle
2014-11-24 12:03:14 +00:00
Dan Poltawski
927da85285
Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle
2014-11-24 11:56:56 +00:00
Dan Poltawski
e1a826e205
Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle
2014-11-24 11:53:53 +00:00
Dan Poltawski
3111b66fbd
Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle
2014-11-24 11:07:20 +00:00
Dan Poltawski
bcc4dc3eab
Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle
...
Conflicts:
backup/util/ui/renderer.php
2014-11-24 10:55:27 +00:00
David Mudrák
32c670c8c2
MDL-48210 updates checker: Improve cron notifications processing
...
These are cosmetic improvements spotted while working on the issue.
1. Do not waste time if there are no changes to notify about.
2. Fix the legacy plugin manager's get_plugins() call.
2014-11-24 11:44:13 +01:00
David Mudrák
c9f1b3a0c3
MDL-48210 plugin_manager: Invalidate caches after fetching updates info
2014-11-24 11:44:02 +01:00
Amanda Doughty
cc6dee5856
MDL-35696 enrol_meta: Fixed course sort order
2014-11-24 10:19:17 +00:00
Ankit Agarwal
80a1dfe561
MDL-42717 backups: set correct backup status and add logs
...
Set a correct backup status of ERROR when we fail to copy a file to an external directory given the backup configs demand it.
Also a lot of logs are added around this area to let admins easily find the problem if backup fails because of directory permissions.
2014-11-24 10:18:56 +05:30
Sam Hemelryk
d148da7e56
Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle
2014-11-24 15:57:59 +13:00
Sam Hemelryk
b52e55bb47
Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle
2014-11-24 15:53:56 +13:00
David Monllao
34f18420ac
MDL-22309 report_singleview: Fixing wrong uses of get_role_users()
2014-11-24 10:53:53 +08:00