Damyon Wiese
f7dc9871e7
MDL-33600 Assign: Allow teachers to skip notifying students about grade update.
2014-01-08 10:34:57 +08:00
Eloy Lafuente (stronk7)
ab7f498343
Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
2014-01-08 02:15:03 +01:00
Eloy Lafuente (stronk7)
e6a6eb7838
Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle
2014-01-08 02:09:55 +01:00
Eloy Lafuente (stronk7)
69ebcb4222
Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle
2014-01-08 02:02:29 +01:00
Eloy Lafuente (stronk7)
a1017ec837
Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle
2014-01-08 01:59:21 +01:00
Eloy Lafuente (stronk7)
0601a82aff
Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle
2014-01-08 01:32:28 +01:00
Dan Poltawski
267d4927b4
Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
2014-01-08 08:21:06 +08:00
Eloy Lafuente (stronk7)
45f6a8340b
Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle
2014-01-08 00:45:51 +01:00
Eloy Lafuente (stronk7)
b8a8f3dd01
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
2014-01-08 00:39:15 +01:00
Eloy Lafuente (stronk7)
430740f65a
Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle
2014-01-08 00:23:40 +01:00
Eloy Lafuente (stronk7)
78b31176cb
Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle
2014-01-08 00:13:28 +01:00
Eloy Lafuente (stronk7)
382addccef
Merge branch '23837-27' of git://github.com/samhemelryk/moodle
2014-01-07 23:42:55 +01:00
Eloy Lafuente (stronk7)
7ad46ac29d
Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle
2014-01-07 23:40:51 +01:00
Eloy Lafuente (stronk7)
b3b1b18a4f
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
2014-01-07 23:32:38 +01:00
Dan Poltawski
7d374cdf4a
Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle
2014-01-07 17:28:15 +08:00
Dan Poltawski
ac60c5b60e
Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle
2014-01-07 17:23:07 +08:00
Dan Poltawski
571944c2a1
Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle
2014-01-07 17:20:44 +08:00
Damyon Wiese
8af52d3188
Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle
2014-01-07 16:57:49 +08:00
Damyon Wiese
715d0505c4
Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle
2014-01-07 16:16:48 +08:00
Damyon Wiese
fcd640a51a
Merge branch 'MDL-43271-master' of git://github.com/andrewnicols/moodle
2014-01-07 16:15:16 +08:00
Damyon Wiese
9673c119f2
MDL-36334 JS: Only print deprecation notices for developers
2014-01-07 16:11:27 +08:00
Damyon Wiese
a66aea5c67
Merge branch 'MDL-36334-master' of https://github.com/andrewnicols/moodle
2014-01-07 16:10:05 +08:00
Dan Poltawski
25294dd466
MDL-43481 lib: minor cleanups to commands
...
And remove unused strings - thanks to Simon Coggins!
2014-01-07 15:48:06 +08:00
Dan Poltawski
6d0796942b
Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle
2014-01-07 15:46:59 +08:00
Damyon Wiese
abc217b2bf
Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle
2014-01-07 14:10:40 +08:00
Dan Poltawski
899ca7632f
Merge branch 'MDL-43489-master' of git://github.com/andrewnicols/moodle
2014-01-07 13:48:49 +08:00
Damyon Wiese
454fab1ac7
Merge branch 'w01_MDL-43585_m27_userlib' of https://github.com/skodak/moodle
2014-01-07 13:30:24 +08:00
Andrew Nicols
6fc9488862
MDL-36334 JS: Deprecate YUI galleryversion in enrol
2014-01-07 16:12:55 +11:00
Damyon Wiese
778c03ccb1
Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle
2014-01-07 12:53:07 +08:00
Dan Poltawski
4e5fb5bec1
Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle
2014-01-07 12:42:33 +08:00
Damyon Wiese
e011f229a8
Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
2014-01-07 12:29:45 +08:00
Damyon Wiese
3a145daba4
Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
2014-01-07 12:26:01 +08:00
Damyon Wiese
de47c9c81b
Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle
2014-01-07 12:22:49 +08:00
Petr Škoda
64ad5208a9
MDL-43585 remove incorrect user/lib.php include
2014-01-07 12:16:02 +08:00
David Monllao
96ed7ca4dd
MDL-43423 behat: Running hooks before and after each step of a chained step
2014-01-07 12:12:30 +08:00
Sam Hemelryk
c68fbad68a
MDL-43526 category: added restore course link to admin structure
2014-01-07 12:08:34 +08:00
Sam Hemelryk
39bd07f732
MDL-43526 course: links to restore from management and admin structure.
2014-01-07 12:08:34 +08:00
Dan Poltawski
812cc702ad
Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
2014-01-07 11:51:15 +08:00
Sam Hemelryk
ccc22a096a
MDL-43349 cache: is_ready now checks are_requirements_met by default
...
(Fixes the fixed forwarded static call bug reverted in a5581c7)
2014-01-07 11:47:18 +08:00
Dan Poltawski
7afca0ff5a
Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle
2014-01-07 11:08:23 +08:00
Rajesh Taneja
3231c8cbf6
MDL-42643 course: Member in same group should only loginas
...
If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user
2014-01-07 11:05:20 +08:00
Dan Poltawski
a6b4b3350f
Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
2014-01-07 10:59:40 +08:00
Dan Poltawski
93759b73a5
Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/version.php
2014-01-07 10:55:20 +08:00
Dan Poltawski
ce3dbebc91
Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle
2014-01-07 10:43:39 +08:00
Dan Poltawski
62bfe6202e
Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle
2014-01-07 10:34:40 +08:00
Damyon Wiese
daaa692b05
Merge branch 'MDL-43448' of git://github.com/timhunt/moodle
2014-01-07 09:22:27 +08:00
Frederic Massart
f588ea5008
MDL-42995 mod_assign: Extended tests for update_calendar method
2014-01-06 10:20:23 +01:00
David Monllao
4b6b1e3a00
MDL-43330 behat: behat-extension version changed
2014-01-06 17:11:39 +08:00
Frederic Massart
0cfc7d13ef
MDL-42995 mod_assign: Remove files from calendar event description
2014-01-06 09:29:26 +01:00
Frederic Massart
2a5794e099
MDL-42995 mod_assign: Use new global function to strip content
2014-01-06 09:29:25 +01:00