Commit graph

85448 commits

Author SHA1 Message Date
AMOS bot
b6bf0e4210 Automatically generated installer lang files 2017-07-21 00:06:26 +08:00
Dan Poltawski
229ae617c5 weekly release 3.4dev 2017-07-20 13:20:46 +01:00
Dan Poltawski
b6da40deb4 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-07-20 13:20:43 +01:00
Dan Poltawski
b7e26ad2dc MDL-57945 npm: commit lockfile changes frm npm v5.3.0
Sadly npm keep altering the lockfile format see - MDL-59582
2017-07-20 11:15:37 +01:00
David Balch
8fb9a27170 MDL-30634 auth_ldap: Assign arbitrary system roles via LDAP sync.
Loosely based on a 2.7 branch by Mark Johnson.
2017-07-20 10:00:36 +01:00
Marco Ferrante
a86dbfbb3d MDL-59432 auth_db: add aliases to field mapping query
This patch fixes an issue with mapping different internal fields
to the same external field.
2017-07-20 14:57:39 +08:00
Andrew Nicols
43fd867cc3 Merge branch 'MDL-59527-master-fix1' of http://github.com/damyon/moodle 2017-07-20 10:42:31 +08:00
Andrew Nicols
103cd4d394 Merge branch 'wip-MDL-57649-master-fix2' of git://github.com/abgreeve/moodle 2017-07-20 10:22:25 +08:00
Adrian Greeve
7b78154e39 MDL-57649 mod_lesson: Improvement to upgrade query.
We only need one record for each filearea that we
are removing.
2017-07-20 09:57:25 +08:00
Damyon Wiese
ddc1482026 MDL-59527 autocomplete: Don't fetch ajax twice 2017-07-20 09:52:05 +08:00
Jun Pataleta
71e2a34192 MDL-59578 core: Remove unnecessary steps in alpha_chooser.feature
* The steps at the end of the Background scenario don't make sense and
  just adds to the execution time of the test.
2017-07-20 09:43:48 +08:00
AMOS bot
990a50a36c Automatically generated installer lang files 2017-07-20 00:06:11 +08:00
Juan Leyva
9f1ab2db6d MDL-59237 mod_workshop: New WS get_workshops_by_courses 2017-07-19 16:35:59 +01:00
Dan Poltawski
0a023e5fc7 MDL-57945 stylelint: use csstree to replace some rules
Ironically we have to reverse the change from e63d89a5 because
this linter is more clever..
2017-07-19 14:29:56 +01:00
Dan Poltawski
09074c91d0 MDL-57945 stylelint: Upgrade 7.12.0
This stylelint is consolodating and focusing the project
so there are some rule deprecations without real alternatives yet.
2017-07-19 13:45:47 +01:00
Dan Poltawski
dda72b9d56 Merge branch 'MDL-59515' of https://github.com/NeillM/moodle 2017-07-19 13:11:23 +01:00
Neill Magill
5b40aaa5e4 MDL-59515 messages: arguments behave differently with single promise
Seems that objects are not borked by when in the same way as arrays when
there is only a single promise.
2017-07-19 11:52:15 +01:00
Dan Poltawski
00589c1f5a Merge branch 'MDL-59515' of https://github.com/NeillM/moodle 2017-07-19 11:16:00 +01:00
Neill Magill
6e594ff687 MDL-59515 messages: arguments behave differently with single promise
When only a single promise is passed the returned array is flattened.
2017-07-19 10:10:25 +01:00
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