mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
81,048 Commits 36 Branches 527 Tags
Commit Graph

81048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Poltawski
53843cc18d MDL-56423 boostrap: fix eranously removed css 2016-10-13 10:01:30 +01:00
Marina Glancy
fa8e0af1f0 MDL-55833 mod_feedback: display in outline and complete reports 2016-10-13 13:49:16 +08:00
David Monllao
beb505fab1 Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle 2016-10-13 10:51:12 +08:00
Rajesh Taneja
2761e0d604
MDL-56299 behat: Popover doesn't work with phantomjs 2016-10-13 10:47:32 +08:00
David Monllao
f5e8a744bf Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle 2016-10-13 10:18:20 +08:00
Rajesh Taneja
deb71a0032
MDL-56087 behat: Fixed no messages string 2016-10-13 09:57:53 +08:00
Rajesh Taneja
664a2a2900
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 09:41:15 +08:00
Marina Glancy
62a3c42947 MDL-56110 forms: debug message for php 7.1 compat 
Follow up for MDL-55123
 2016-10-13 09:18:34 +08:00
David Mudrák
0cc5c64608 MDL-54945 workshop: Improve the portfolio API implementation 
* Use a single capability 'mod/workshop:exportsubmissions' to control
  who is able to export a submission and all associated visible
  peer-assessments.
* The export capability is by default granted to teachers and managers
  as well.
* Simplify the integration of the export button into the submission
  page. There is now a single place where the export button appears - at
  the buttom of the submission page.
* Clean up the new strings introduced for this feature.
* Rewrite the portfolio caller class so that it better mimics the
  behaviour of the submission.php page. It must not be possible to get
  access to contents otherwise not available via the UI.
* Fix phpunit tests.
* Improve behat tests so that they can run in headless browser
  (performance).

During the development, some problems were detected in the underlying
portfolio API, especially with LEAP2A format and files collisions
handling. These may be eventually fixed in the future, should there be a
demand for it.
 2016-10-12 18:35:02 +02:00
Tony Butler
23f2f64452 MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display 2016-10-12 17:33:23 +01:00
Dan Poltawski
f6b8aec404 Merge branch 'MDL-54682_master-fix-alt' of https://github.com/markn86/moodle 2016-10-12 15:21:02 +01:00
Dan Poltawski
17ab49e9b1 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-12 14:53:01 +01:00
Mark Nelson
2127ca2cde MDL-54682 core_message: do not disable left panel when deleting messages 2016-10-12 21:45:33 +08:00
Tony Butler
88d309d947 MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page 2016-10-12 14:17:48 +01:00
Dan Poltawski
d68472984a Merge branch 'MDL-56384_master' of https://github.com/markn86/moodle 2016-10-12 09:26:26 +01:00
David Monllao
6beb7a780c Merge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle 2016-10-12 15:17:37 +08:00
Mark Nelson
d29be93807 MDL-56384 message_popup: fixed oracle PHPUnit failures 2016-10-12 15:14:30 +08:00
Ryan Wyllie
2e39117f75 MDL-43230 badges: fix award_badge behat test 2016-10-12 05:11:13 +00:00
Cameron Ball
00d3a8c5f4
MDL-56095 output: Properly set prototype on custom event for IE 2016-10-12 13:10:30 +08:00
Ryan Wyllie
addb9430f9 MDL-43230 badges: move badge revoke event into api 2016-10-12 05:10:17 +00:00
Matt Davidson
b7374faca6 MDL-43230 badges: manually revoke awarded badges 
A user can be manually awarded a badge, but if given by mistake an
awarded badge cannot be removed.
 2016-10-12 05:06:38 +00:00
Rajesh Taneja
cd5e416560
MDL-27072 behat: Removed wrong tag from feature 2016-10-12 12:57:22 +08:00
David Monllao
0115782157 Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle 2016-10-12 11:29:59 +08:00
Rajesh Taneja
c76e57aace
MDL-27072 behat: Fixed table separators 2016-10-12 11:05:07 +08:00
David Monllao
bc8a896208 MDL-55393 message: Missing latest blocker issue code updates 2016-10-12 10:45:34 +08:00
Juan Leyva
67d76e2fe2 MDL-55393 message: New WS get_user_notification_preferences 2016-10-12 09:43:16 +08:00
Juan Leyva
311f5e4025 MDL-55393 message: Add some external functions to mobile service 2016-10-12 09:41:59 +08:00
David Monllao
b805d3f8ef MDL-56057 search: Fix incorrectly reported no enabled search areas 
Also improved performance caching enabled search areas and
all search areas at the same time.
 2016-10-12 08:30:23 +08:00