mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 14:02:46 +02:00
Code Issues Projects Releases Wiki Activity
80,910 Commits 36 Branches 527 Tags
b705cefa18
Commit Graph

80910 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b705cefa18 Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle 2016-10-17 18:50:07 +02:00
Eloy Lafuente (stronk7)
aa46cb9503 Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle 2016-10-17 18:42:14 +02:00
Eloy Lafuente (stronk7)
cfe55553e0 Merge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle 2016-10-17 18:12:33 +02:00
Dan Poltawski
54c1da6690 Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle 2016-10-17 12:52:26 +01:00
Dan Poltawski
a4c7a0bd95 Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle 2016-10-17 12:06:42 +01:00
Dan Poltawski
2ee939fb19 Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle 2016-10-17 11:01:27 +01:00
Dan Poltawski
6578ffe4e0 Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle 2016-10-17 10:23:35 +01:00
Dan Poltawski
a227cf1278 Merge branch 'MDL-31465-master' of git://github.com/lameze/moodle 2016-10-17 10:00:08 +01:00
David Monllao
c8bd606475 Merge branch 'MDL-56423-master' of git://github.com/danpoltawski/moodle 2016-10-17 15:51:51 +08:00
David Monllao
99218e916b Merge branch 'MDL-56393-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:32:33 +08:00
David Monllao
0998896e9e Merge branch 'MDL-56411-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:29:13 +08:00
David Monllao
4456e7efa6 Merge branch 'MDL-56415-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:17:16 +08:00
David Monllao
542452a97e Merge branch 'MDL-56430-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:03:51 +08:00
David Monllao
94926e5d74 Merge branch 'MDL-55510-master' of git://github.com/danpoltawski/moodle 2016-10-17 14:25:00 +08:00
Andrew Nicols
608edec5ca MDL-56208 mod_forum: Move Display period below Group 2016-10-17 11:46:36 +08:00
Ryan Wyllie
fd8eab572d MDL-56415 message: style toggle contact button on user profile page 
Changed the styles in theme_bootstrapbase for the ajax toggle
button so that the loading icon is overlaid on the element
rather than replacing it to stop the interface jarring.

Also ported those same styles to theme_boost for consistency.
 2016-10-17 03:07:15 +00:00
Ryan Wyllie
54e22257c7 MDL-56338 message_popup: add behat tests for message popover 2016-10-17 01:07:59 +00:00
Ryan Wyllie
cdff0944b6 MDL-56430 message: fix php7 incompatibility in processor form 2016-10-17 00:27:56 +00:00
Jean-Philippe Gaudreau
6399ecd743 MDL-55630 mod_assign: Exclude users courses from user details 
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
 2016-10-14 09:28:18 -04:00
Dan Poltawski
0a51a20928 MDL-55510 upgrade: remove repository_alfresco config 
This was missing from MDL-49533 and caused a complaint about alfresco
on every upgrade.
 2016-10-14 09:41:31 +01:00
Ryan Wyllie
8387932ddd MDL-56393 themes: unread notification style in popover 2016-10-14 07:52:04 +00:00
Marc Català
260713fc8e MDL-56300 mod_assign: Filtering students throws a javascript error 2016-10-14 09:28:20 +02:00
Ryan Wyllie
703ab16475 MDL-56411 message: new message to user renders message area 
When messaging a user for the first time from the message button on
their profile page the message area should still be rendered.
 2016-10-14 07:13:58 +00:00
Simey Lameze
8490014955 MDL-31465 core_user: Suspended field must be boolean 2016-10-14 10:44:08 +08:00
Andrew Solomon
511db62153 MDL-31465 core_user: Incorporate user suspension into webservices 2016-10-14 10:13:49 +08:00
Ryan Wyllie
658dbdf7dd MDL-56337 message_popup: add behat tests for notification popover 2016-10-14 01:32:29 +00:00
Eloy Lafuente (stronk7)
6a69cda97d weekly release 3.2dev 2016-10-13 20:02:19 +02:00
Eloy Lafuente (stronk7)
43f5b288c2 NOBUG: Fixed SVG browser compatibility 2016-10-13 20:02:16 +02:00
Eloy Lafuente (stronk7)
b87a9ac7a1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-13 20:02:15 +02:00
Eloy Lafuente (stronk7)
1c56029fa4 Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle 2016-10-13 19:35:48 +02:00
David Monllao
dd8f30dd4f Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:35:48 +02:00
Rajesh Taneja
d4b28e0b16 MDL-56299 behat: Popover doesn't work with phantomjs 2016-10-13 19:35:47 +02:00
David Monllao
7edfe14159 Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:35:46 +02:00
Rajesh Taneja
a79c2aace8 MDL-56087 behat: Fixed no messages string 2016-10-13 19:35:46 +02:00
Rajesh Taneja
c5a566dc15 MDL-55522 behat: Commented failing transformations 
- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959
 2016-10-13 19:35:45 +02:00
Mark Nelson
c96717fcd9 MDL-54682 core_message: do not disable left panel when deleting messages 2016-10-13 19:32:12 +02:00
Dan Poltawski
49ba9f8fd0 Merge branch 'MDL-56384_master' of https://github.com/markn86/moodle 2016-10-13 19:32:11 +02:00
David Monllao
650beea243 Merge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle 2016-10-13 19:32:10 +02:00
Mark Nelson
448212ecf6 MDL-56384 message_popup: fixed oracle PHPUnit failures 2016-10-13 19:32:10 +02:00
Cameron Ball
3aa8696ce6 MDL-56095 output: Properly set prototype on custom event for IE 2016-10-13 19:32:09 +02:00
Rajesh Taneja
fbaf5d17d8 MDL-27072 behat: Removed wrong tag from feature 2016-10-13 19:32:08 +02:00
David Monllao
d5bd89308e Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle 2016-10-13 19:32:08 +02:00
David Monllao
1686d93a1c MDL-55393 message: Missing latest blocker issue code updates 2016-10-13 19:32:07 +02:00
Rajesh Taneja
25b225a995 MDL-27072 behat: Fixed table separators 2016-10-13 19:32:07 +02:00
Juan Leyva
e86f0cb4a1 MDL-55393 message: New WS get_user_notification_preferences 2016-10-13 19:32:06 +02:00
Eloy Lafuente (stronk7)
c405d31bef Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle 2016-10-13 19:32:05 +02:00
Juan Leyva
53522c6e38 MDL-55393 message: Add some external functions to mobile service 2016-10-13 19:32:05 +02:00
Eloy Lafuente (stronk7)
403b817857 Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:32:04 +02:00
Dan Poltawski
36650f11d3 MDL-56423 stylelint: ignore custom.css files 
The files have non-standard css syntax and with stylelint 7.4.1
it can no longer cope with it.
 2016-10-13 10:01:31 +01:00
Dan Poltawski
5c8445b5cd MDL-56423 stylelint: bump to v7.4.1 
Fixes a false positive with  declaration-block-no-ignored-properties and
display: inline.
 2016-10-13 10:01:30 +01:00