Commit graph

85460 commits

Author SHA1 Message Date
Damyon Wiese
73d0d56284 MDL-59367 user: Tests and coding style
Add a unit test for user_roles_editable.
Coding style fixes.
Don't show duplicate roles.
2017-07-21 10:25:25 +08:00
Damyon Wiese
5d0b4765d8 MDL-59367 roles: Add roles to participants page. 2017-07-21 09:52:14 +08:00
Adrian Greeve
3a8c989137 MDL-59561 database: Update to creating new indexes in mysql.
When updating the mysql system to utf8mb4 not all tables are
converted to the row format of compressed or dynamic. If a new
index is created there is a possibility that the table could be
using compact or redundant and then an error will be shown saying
that the index size is too large. This fix handles this exception
and converts the table over to compressed.
2017-07-21 09:27:08 +08:00
Simey Lameze
52380c823c MDL-59538 core_calendar: add behat step back
Part of MDL-59333.
2017-07-21 09:01:57 +08:00
Simey Lameze
3d67e83f53 MDL-59538 core_calendar: add event source logic to calendar 2017-07-21 09:01:57 +08:00
Simey Lameze
5472bdd091 MDL-59538 core_calendar: add event source to summary template 2017-07-21 09:01:57 +08:00
Simey Lameze
57d5b1b7cf MDL-59538 core_calendar: handle event source on the webservice
Part of MDL-59333.
2017-07-21 09:01:57 +08:00
Jun Pataleta
f7cd3bc0e1 MDL-59436 user: Apply default sorting for participants table 2017-07-21 08:49:18 +08:00
Jun Pataleta
a9991533fa MDL-59436 user: Render city and country based on $CFG->showuseridentity
* I also fixed the redundant generation of query fields in
  user_get_participants_sql().
2017-07-21 08:46:23 +08:00
Jun Pataleta
7a22e49e05 MDL-59436 admin: Add city and country to $CFG->showuseridentity 2017-07-21 08:46:12 +08:00
Jun Pataleta
c5d59db9a6 MDL-59528 user: Render user picture link with user's fullname 2017-07-21 08:45:31 +08:00
Jun Pataleta
3b1eba069e MDL-59528 core: Add option to display fullname beside user picture 2017-07-21 08:45:31 +08:00
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