84804 Commits

Author SHA1 Message Date
Danny Jung
36a7651de2 MDL-59073 Workshop: Prevent submission without content or file 2017-06-22 14:03:28 -07:00
Dan Poltawski
f4a2d69631 weekly release 3.4dev 2017-06-22 15:40:45 +01:00
Dan Poltawski
6894a98aa1 NOBUG: Fixed SVG browser compatibility 2017-06-22 15:40:44 +01:00
Juan Leyva
bef201c7e0 MDL-58712 core_user: Do not count the root directory 2017-06-22 16:09:58 +02:00
Jake Dallimore
828540b557 Merge branch 'wip-MDL-58919-master' of https://github.com/marinaglancy/moodle 2017-06-22 16:09:56 +02:00
Marina Glancy
412a56027b MDL-58919 mod_assign: fix check for existing setting 2017-06-22 16:09:55 +02:00
Eloy Lafuente (stronk7)
b78887cc4b Merge branch 'MDL-59170-master' of https://github.com/xow/moodle 2017-06-22 16:09:53 +02:00
John Okely
76b5fe8665 MDL-59170 fontawesome: Fix course total controls icon on grader report 2017-06-22 09:13:20 +08:00
Dan Poltawski
8c0b1ec32b Merge branch 'MDL-58919-master-fix1' of https://github.com/snake/moodle 2017-06-21 10:22:11 +01:00
Jake Dallimore
c6b32acdb1 MDL-58919 mod_assign: fix allowing accepted file types to be empty 2017-06-21 17:15:21 +08:00
Jake Dallimore
34e2b1f92d Merge branch 'MDL-56979-master-fix' of git://github.com/junpataleta/moodle 2017-06-21 14:21:56 +08:00
Jun Pataleta
a7184670fd MDL-56979 group: Template and styles fixes
* Remove custom styles for groups since we're using default Bootstrap
  styles now.
* Hidden input breaks grid layout. Moved it inside the groups column.
* Removed unnecessary 'groups' and 'members' classes. They are not being
  used in JS nor CSS.
2017-06-21 11:02:16 +08:00
Jun Pataleta
91fe23133c Merge branch 'MDL-58892-mahara-icon-update' of https://github.com/peikk0/moodle 2017-06-21 08:52:46 +08:00
Eloy Lafuente (stronk7)
46e9afecf3 Merge branch 'MDL-58985-master-bluebubbles' of git://github.com/mudrd8mz/moodle 2017-06-21 00:45:07 +02:00
Pierre Guinoiseau
58f2660009 MDL-58892 pix: update icon for Mahara 2017-06-21 10:14:08 +12:00
Eloy Lafuente (stronk7)
2eb67fdc88 Merge branch 'wip-MDL-59125-master' of git://github.com/marinaglancy/moodle 2017-06-20 21:45:38 +02:00
Eloy Lafuente (stronk7)
9ee6de4389 Merge branch 'wip-MDL-59263-master' of git://github.com/marinaglancy/moodle 2017-06-20 18:02:09 +02:00
Eloy Lafuente (stronk7)
42a78077c6 Merge branch 'MDL-59269-master-languninstall' of git://github.com/mudrd8mz/moodle 2017-06-20 17:56:44 +02:00
Eloy Lafuente (stronk7)
41781cf31d Merge branch 'MDL-59214-master' of git://github.com/jleyva/moodle 2017-06-20 17:46:55 +02:00
Dan Poltawski
22ef8f1f9b Merge branch 'MDL-58919-master' of git://github.com/Dave-B/moodle 2017-06-20 14:24:59 +01:00
Juan Leyva
bef5777fc4 MDL-59214 webservice: Return calendar type in get_site_info 2017-06-20 11:44:04 +01:00
Dan Poltawski
3fb9ca78c7 Merge branch 'MDL-58952' of https://github.com/scyrma/moodle 2017-06-20 11:31:30 +01:00
Dan Poltawski
4431f1e0e3 Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle 2017-06-20 09:51:50 +01:00
Dan Poltawski
2764bcf49b Merge branch 'MDL-58472-master' of git://github.com/damyon/moodle 2017-06-20 09:38:29 +01:00
Jun Pataleta
88720416ba Merge branch 'wip-MDL-58911-master' of git://github.com/marinaglancy/moodle 2017-06-20 16:33:15 +08:00
Jun Pataleta
d938d1b6e2 Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle 2017-06-20 16:27:48 +08:00
Marina Glancy
63e9e38202 MDL-58911 calendar: use the same callbacks in unittests and prod
Remove unittest-specific callbacks for checking access and displaying
the calendar events on the dashboard.

This will allow plugin developers unittest the full behavior
of how their plugins add events to the dashboard.

Reset all static caches between unittests.
2017-06-20 16:13:35 +08:00
Dan Poltawski
0ba61c3bf8 Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle 2017-06-20 09:10:25 +01:00
Jake Dallimore
6f2950cf59 Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle 2017-06-20 15:18:16 +08:00
Jun Pataleta
b70b7df6d3 Merge branch 'MDL-58766-clean-tree-item-indent' of https://github.com/lucaboesch/moodle 2017-06-20 15:09:41 +08:00
Jun Pataleta
65f1cac814 Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle 2017-06-20 09:58:37 +08:00
Simey Lameze
07782e10f1 MDL-59270 block_myoverview: tab setting logic to main template on clean 2017-06-20 08:45:18 +08:00
Jake Dallimore
78013a17c7 Merge branch 'MDL-58808-master' of git://github.com/damyon/moodle 2017-06-20 08:22:16 +08:00
Juan Leyva
0f398b500d MDL-59160 core_group: Return if the user can access all groups in WS
The core_group_get_activity_allowed_groups WS should be returning not
only the groups but also if the user is allowed to access all the
activity groups.
2017-06-19 15:53:38 +01:00
Dan Poltawski
dd6848c1b0 Merge branch 'MDL-59048' of https://github.com/timhunt/moodle 2017-06-19 15:43:28 +01:00
Dan Poltawski
214962f964 Merge branch 'MDL-26976-master' of git://github.com/jleyva/moodle 2017-06-19 14:55:55 +01:00
Dan Poltawski
6252f44d84 Merge branch 'MDL-58712-master' of git://github.com/jleyva/moodle 2017-06-19 14:20:06 +01:00
Dan Poltawski
6659c5ffba Merge branch 'MDL-59173-master' of git://github.com/tobiasreischmann/moodle 2017-06-19 12:27:43 +01:00
Dan Poltawski
4469ae96b6 Merge branch 'wip-MDL-51917-master' of git://github.com/marinaglancy/moodle 2017-06-19 12:21:45 +01:00
Juan Leyva
b5ef326c03 MDL-26976 files: Display space usage message in private files 2017-06-19 11:01:48 +01:00
Dan Poltawski
0a4d8ea1a5 Merge branch 'MDL-56979-master-2' of git://github.com/junpataleta/moodle 2017-06-19 10:46:09 +01:00
Dan Poltawski
275b5fa8ce Merge branch 'MDL-46418-master-hiddenrepos' of git://github.com/mudrd8mz/moodle 2017-06-19 10:33:37 +01:00
Jun Pataleta
8cc4e1c0cd Merge branch 'MDL-44961-master' of git://github.com/ankitagarwal/moodle 2017-06-19 16:24:51 +08:00
Damyon Wiese
57ea73d02c MDL-58808 fontawesome: nav and settings blocks 2017-06-19 15:51:15 +08:00
Jun Pataleta
d745f174a2 Merge branch 'MDL-58310-master' of https://github.com/xow/moodle 2017-06-19 13:25:10 +08:00
John Okely
671be2bedb MDL-58310 ajax: suppress errors upon page unload 2017-06-19 11:31:24 +08:00
John Okely
46f68f026e MDL-58310 message: No longer need to supress errors from messaging 2017-06-19 09:34:34 +08:00
Jake Dallimore
66b8ad8642 Merge branch 'MDL-59230-master' of git://github.com/lameze/moodle 2017-06-19 09:12:30 +08:00
Vladimir Zhirov
ff2dab4566 MDL-59005 resource: fixed zip extraction for filenames in CP-1251/CP-866 2017-06-19 08:50:23 +08:00
Luca Bösch
fc684bce4b MDL-58766 css: clean theme block alignment 2017-06-16 16:12:00 +02:00