Dan Poltawski
3a299d82e0
Merge branch 'MDL-45324' of git://github.com/jonof/moodle
2014-12-15 14:59:34 +00:00
Dan Poltawski
10f92c21ad
Merge branch 'MDL-47176_master' of https://github.com/crazyserver/moodle
2014-12-15 14:05:54 +00:00
Dan Poltawski
7d168691a8
Merge branch 'MDL-48169-master' of git://github.com/jethac/moodle
2014-12-15 12:32:13 +00:00
Dan Poltawski
78677d5ec7
Merge branch 'MDL-47475-master' of git://github.com/andrewnicols/moodle
2014-12-15 12:20:41 +00:00
Dan Poltawski
2d562cfc6d
Merge branch 'MDL-36673' of git://github.com/jmvedrine/moodle
2014-12-15 11:54:06 +00:00
David Monllao
edf938687f
Merge branch 'MDL-48235-assign-reopen-until-pass' of git://github.com/mpetrowi/moodle
2014-12-15 17:30:40 +08:00
David Monllao
486ebeb1a4
Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle
2014-12-15 13:44:01 +08:00
Andrew Nicols
9b65a08095
MDL-47475 mod_assign: Copy files to other group members for editpdf
2014-12-15 08:50:31 +08:00
Pau Ferrer Ocaña
2908af0903
MDL-47176 qtype_match: Avoid sql_compare to solve problems with Oracle
2014-12-12 14:30:58 +01:00
Dan Poltawski
8f06fffbe1
weekly release 2.9dev
2014-12-11 09:55:09 +00:00
Dan Poltawski
5c47c339e3
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-12-11 09:55:07 +00:00
Frederic Massart
faf87da886
MDL-48496 block_rss_client: Deleting unused string errorloadingfeed
2014-12-11 00:24:07 +01:00
Frederic Massart
b58d8d23f3
MDL-48496 block_rss_client: Do not display curl error messages
2014-12-11 00:24:07 +01:00
Eloy Lafuente (stronk7)
82e1d7f151
Revert "MDL-46814 calendar: Export calendar uses moodle forms"
...
This reverts commit a008de2a58cae82121bf88826bbeade33f550fa7.
2014-12-11 00:19:14 +01:00
Eloy Lafuente (stronk7)
41c3f865ee
Revert "MDL-46814 calendar export: Minor coding tweaks"
...
This reverts commit 0b956a64d85a0f9e7c43efa4cd7e51f28216ebf0.
2014-12-11 00:18:16 +01:00
AMOS bot
fab9018590
Automatically generated installer lang files
2014-12-11 00:03:59 +08:00
Jonathon Fowler
70cfc878b9
MDL-45324 assign: notify when workflow is Off, or if state is Released
...
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.
Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.
Credit to Steve Upton and David Balch for the basis of this patch.
2014-12-10 22:29:08 +10:00
Sam Hemelryk
16dfee4e5b
MDL-48430 customment: improved exception handling
2014-12-10 13:24:39 +01:00
Sam Hemelryk
f6c65c2575
Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle
2014-12-10 13:24:38 +01:00
Dan Poltawski
e600e6ae50
Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle
2014-12-09 22:29:37 +00:00
Dan Poltawski
971f1c28a8
Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle
2014-12-09 21:22:03 +00:00
Sam Hemelryk
6009ccb2f1
Merge branch 'm29_MDL-48389' of https://github.com/totara/moodle
2014-12-10 09:27:18 +13:00
Eloy Lafuente (stronk7)
f6d955fe6b
Merge branch 'MDL-31822_master' of https://github.com/dmonllao/moodle
2014-12-09 16:05:56 +01:00
Eloy Lafuente (stronk7)
0b956a64d8
MDL-46814 calendar export: Minor coding tweaks
2014-12-09 15:44:11 +01:00
Brian Barnes
a008de2a58
MDL-46814 calendar: Export calendar uses moodle forms
2014-12-09 15:44:10 +01:00
Dan Poltawski
23da79a464
MDL-45679 mod_lesson: do not overqualify styles
2014-12-09 12:34:54 +00:00
Dan Poltawski
9478d117fc
Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle
2014-12-09 12:05:29 +00:00
Dan Poltawski
51019f2a91
Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle
2014-12-09 10:53:41 +00:00
Dan Poltawski
c676a343a5
Merge branch 'MDL-41846-master' of git://github.com/xow/moodle
2014-12-09 10:25:15 +00:00
Sam Hemelryk
50c1f47ec4
Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle
2014-12-09 16:57:03 +13:00
Sam Hemelryk
1e12b5688c
Merge branch 'wip-MDL-46486-master' of git://github.com/marinaglancy/moodle
2014-12-09 16:20:40 +13:00
Sam Hemelryk
44a4b3d072
Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle
2014-12-09 16:13:40 +13:00
Sam Hemelryk
54907a6a9b
Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle
2014-12-09 15:58:46 +13:00
Sam Hemelryk
d5265ac28e
Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign
2014-12-09 15:38:40 +13:00
Brian Barnes
9eb24f0818
MDL-48389 forms: added page title to help text
2014-12-09 15:21:06 +13:00
Sam Hemelryk
255501c900
Merge branch 'mdl48517' of https://github.com/tlevi/moodle
2014-12-09 15:15:51 +13:00
Sam Hemelryk
13ff5c990c
Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle
2014-12-09 15:13:33 +13:00
David Balch
c9edde8b2d
MDL-31822 course: Cleanup per coding guidelines.
2014-12-09 10:05:49 +08:00
David Monllao
fecca79d5a
MDL-31822 course: Formatting the section name
2014-12-09 10:04:49 +08:00
Sam Hemelryk
3e5f4b2ca9
Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle
2014-12-09 13:43:30 +13:00
Sam Hemelryk
440d861ccb
Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle
2014-12-09 12:13:26 +13:00
Sam Hemelryk
7622b02f4c
Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle
2014-12-09 10:56:53 +13:00
Eloy Lafuente (stronk7)
6054036fbc
Merge branch 'MDL-48255-master' of git://github.com/lameze/moodle
2014-12-08 19:14:07 +01:00
Eloy Lafuente (stronk7)
c2f1feffd6
Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle
2014-12-08 18:48:53 +01:00
Dan Poltawski
065fa16e75
Merge branch 'MDL-48410' of git://github.com/timhunt/moodle
2014-12-08 15:19:11 +00:00
Dan Poltawski
512cc4162e
Merge branch 'MDL-48373' of git://github.com/timhunt/moodle
2014-12-08 15:15:35 +00:00
Dan Poltawski
d2c33655b6
Merge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle
2014-12-08 14:23:49 +00:00
Dan Poltawski
051d59e36e
Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle
2014-12-08 13:34:02 +00:00
Dan Poltawski
29a9a28e57
Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle
2014-12-08 13:22:16 +00:00
Dan Poltawski
9112aac132
MDL-48273 upgrade.txt version fix
2014-12-08 11:23:40 +00:00