Dan Poltawski
0224022b08
Merge branch 'wip-MDL-57649-master-fix' of git://github.com/abgreeve/moodle
2017-07-19 09:33:07 +01:00
Adrian Greeve
23e2a9cb7c
MDL-57649 mod_lesson: Additional refinement to upgrade script.
2017-07-19 15:44:42 +08:00
Dan Poltawski
088494fd04
Merge branch 'MDL-59569-master' of git://github.com/andrewnicols/moodle
2017-07-19 08:43:56 +01:00
Andrew Nicols
9790a9b583
MDL-59572 dml: Call error_log for AJAX/WS calls
2017-07-19 12:49:15 +08:00
Andrew Nicols
86be85dde7
MDL-59569 travis: Remove haveged
2017-07-19 09:57:14 +08:00
Juan Leyva
41860b7e9e
MDL-59453 mod_lesson: Return lesson contents without html cleaning
...
This is consistent to what is done in the web interface.
2017-07-18 12:24:01 +01:00
David Monllao
95d8e61161
Merge branch 'MDL-59460_master' of git://github.com/dmonllao/moodle
2017-07-18 12:23:37 +02:00
David Monllao
3f6e42b611
MDL-59460 mod_forum: Ensure CFG->forum_subscription is set
2017-07-18 12:21:42 +02:00
Luca Bösch
58affdc80e
MDL-59460 mod_forum: default setting for Subscription mode.
...
Allow to set a Subscription mode default.
2017-07-18 12:21:37 +02:00
Dan Poltawski
d2f3823342
MDL-59255 grunt: build ignorefiles
2017-07-18 10:54:58 +01:00
Dan Poltawski
faa52511c3
Merge branch 'MDL-59255-master' of github.com:lucisgit/moodle
2017-07-18 10:54:05 +01:00
Ruslan Kabalin
362be64a2b
MDL-59255 core: Extend test_clean_param_url.
...
Add rtmp:// test and some more URL validity tests since we made changes in
validateUrlSyntax function.
2017-07-18 10:29:07 +01:00
Ruslan Kabalin
b03ffb099e
MDL-59255 core: Make core_media_manager support RTMP.
2017-07-18 10:29:07 +01:00
Ruslan Kabalin
646e8bf668
MDL-59255 core: Add rtmp:// support to validateUrlSyntax function.
2017-07-18 10:29:07 +01:00
David Monllao
f14987bc24
Merge branch 'wip-MDL-39471-master' of git://github.com/abgreeve/moodle
2017-07-18 10:48:37 +02:00
Dan Poltawski
df57a201c9
Merge branch 'm34_MDL-59109_Backup_Missing_AutoCommit' of https://github.com/scara/moodle
2017-07-18 09:47:56 +01:00
Dan Poltawski
7718d3fba4
Merge branch 'MDL-50925-master' of git://github.com/andrewnicols/moodle
2017-07-18 08:53:43 +01:00
Dan Poltawski
9adc505b9f
Merge branch 'MDL-59418-master' of https://github.com/Kathrin84/moodle
2017-07-18 08:52:10 +01:00
David Monllao
d96508b610
Merge branch 'MDL-59521-master' of git://github.com/lameze/moodle
2017-07-18 09:41:28 +02:00
David Monllao
d0f28cf058
Merge branch 'MDL-57991-master' of https://github.com/micaherne/moodle
2017-07-18 09:40:59 +02:00
David Monllao
c9f2924941
Merge branch 'wip-MDL-58362-master' of git://github.com/marinaglancy/moodle
2017-07-18 09:08:30 +02:00
David Monllao
a0f12fcafc
Merge branch 'master_MDL-58863' of https://github.com/danmarsden/moodle
2017-07-18 09:03:35 +02:00
David Monllao
ed539f8233
Merge branch 'MDL-59407-folder-remember-view-mode' of https://github.com/vvzh/moodle
2017-07-18 08:58:24 +02:00
Andrew Nicols
8d46ce8107
MDL-50925 auth: Remove old README
...
This is much better and more accurately documented in the Moodle Docs at
https://docs.moodle.org/dev/Authentication_plugins .
2017-07-18 14:49:09 +08:00
Andrew Nicols
abc25c01b8
MDL-50925 auth_imap: Remove from core and into plugins DB
2017-07-18 14:49:08 +08:00
Andrew Nicols
36eaa96332
MDL-50925 auth_pop3: Remove from core and into plugins DB
2017-07-18 14:48:51 +08:00
Andrew Nicols
f9d12a2d1e
MDL-50925 auth_pam: Remove from core and into plugins DB
2017-07-18 14:48:38 +08:00
Andrew Nicols
db6ba96510
MDL-50925 auth_nntp: Remove from core and into plugins DB
2017-07-18 14:48:23 +08:00
Andrew Nicols
032194970b
MDL-50925 auth_fc: Remove from core and into plugins DB
2017-07-18 14:47:56 +08:00
David Monllao
f510788b44
Merge branch 'MDL-59150-master-3' of git://github.com/ryanwyllie/moodle
2017-07-18 08:27:13 +02:00
Ryan Wyllie
0f268f5db9
MDL-59150 admin: build site theme after CLI install or upgrade
2017-07-18 06:13:07 +00:00
Marina Glancy
1ef14a5aec
MDL-38129 gradeexport: custom profile fields case problem
...
Do not use custom pfofile field name as a field alias in DB query, use field id instead.
DML lowercases all column aliases and fields with uppercase letters no longer match.
2017-07-18 11:03:22 +08:00
AMOS bot
64562f309a
Automatically generated installer lang files
2017-07-18 00:06:34 +08:00
Dan Poltawski
7af4771d63
Merge branch 'MDL-59323-master' of https://github.com/sammarshallou/moodle
2017-07-17 16:40:20 +02:00
David Monllao
2c3a34f0c6
MDL-59411 course: Fix unavailable typo
2017-07-17 16:40:00 +02:00
David Monllao
bf442807f5
Merge branch 'wip-MDL-59411-master' of git://github.com/marinaglancy/moodle
2017-07-17 15:48:12 +02:00
Dan Poltawski
efc1d2bb6b
Merge branch 'MDL-59475-master-cas' of git://github.com/lameze/moodle
2017-07-17 14:18:21 +01:00
David Monllao
7d04eaca5c
Merge branch 'MDL-59527-master' of git://github.com/damyon/moodle
2017-07-17 14:07:59 +02:00
Dan Poltawski
2ce7fad864
MDL-59548 behat: fix trailing whitespace
2017-07-17 11:30:28 +01:00
Dan Poltawski
c899bfb088
Merge branch 'MDL-59548-master' of git://github.com/damyon/moodle
2017-07-17 11:21:56 +01:00
Alexander Bias
85d87d11c0
MDL-58174 themes: Make build_action_menu_from_navigation() protected
2017-07-17 11:17:26 +02:00
David Monllao
57f869c184
Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle
2017-07-17 11:04:02 +02:00
Alexander Bias
46676b7633
MDL-59556 themes: Re-sort /theme/upgrade.txt
2017-07-17 10:51:54 +02:00
Alexander Bias
d7d2a72faf
MDL-59425 themes: Expose navigation node properties in boost flat nav
2017-07-17 10:46:45 +02:00
Dan Poltawski
1250166338
Merge branch 'MDL-59515' of https://github.com/NeillM/moodle
2017-07-17 09:42:27 +01:00
Dan Poltawski
540177523f
Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle
2017-07-17 09:16:29 +01:00
David Monllao
9e3b60c95d
Merge branch 'MDL-59539-master' of git://github.com/tobiasreischmann/moodle
2017-07-17 10:14:55 +02:00
David Monllao
2764cd594b
Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle
2017-07-17 10:09:35 +02:00
Dan Poltawski
16c903acc0
Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle
2017-07-17 09:01:05 +01:00
David Monllao
35d27924f9
Merge branch 'MDL-54607-master' of git://github.com/ankitagarwal/moodle
2017-07-17 09:31:53 +02:00
