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

18474 Commits

Author SHA1 Message Date
David Monllao
1e56070d34 Merge branch 'wip-mdl-55981' of https://github.com/rajeshtaneja/moodle 2016-10-25 13:29:03 +08:00
Rajesh Taneja
cdb4975a44
MDL-55981 behat: Fixed groups seen by user 2016-10-25 13:19:32 +08:00
Dan Poltawski
76a6dc685d Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle 2016-10-25 06:08:48 +01:00
Dan Poltawski
b5c5d741c4 Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle 2016-10-24 15:50:55 +01:00
Pau Ferrer Ocaña
8845688ce4 MDL-56534 assign: Add grading status on get_submissions WS 2016-10-24 13:24:18 +02:00
David Monllao
3ea1fa18cc Merge branch 'mdl56466-master' of https://github.com/tlock/moodle 2016-10-24 15:23:51 +08:00
David Monllao
c10cd185a9 Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle 2016-10-24 13:20:42 +08:00
Pau Ferrer Ocaña
896b6e3cb0 MDL-56538 assign: Fix new grading interface UI popouts 2016-10-21 12:29:20 +02:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes 
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
 2016-10-21 16:06:54 +08:00
Andrew Nicols
4ceed4dfa6 MDL-55981 core: Remove site:accessallgroups from teacher 2016-10-21 08:55:58 +08:00
Eloy Lafuente (stronk7)
ffe9505d2b Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle 2016-10-18 20:02:22 +02:00
Eloy Lafuente (stronk7)
e74c54ec4d Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:11:51 +02:00
Eloy Lafuente (stronk7)
05e588a056 Merge branch 'MDL-56293-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:08:08 +02:00
Eloy Lafuente (stronk7)
881e611c33 Merge branch 'MDL-53752-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:06:26 +02:00
Eloy Lafuente (stronk7)
0e51800e5f Merge branch 'MDL-55858-master' of git://github.com/andrewnicols/moodle 2016-10-18 17:00:21 +02:00
Dan Poltawski
55c7a86632 Merge branch 'wip-MDL-55833-master' of git://github.com/marinaglancy/moodle 2016-10-18 15:26:31 +01:00
Dan Poltawski
cfa69ad260 Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle 2016-10-18 13:44:33 +01:00
Dan Poltawski
d98ab2a585 Merge branch 'MDL-56062-master' of https://github.com/lucisgit/moodle 2016-10-18 12:06:27 +01:00
Eloy Lafuente (stronk7)
5dea1f12fc Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle 2016-10-18 09:37:47 +02:00
Tim Lock
65b4dce6f8 MDL-56466 assign: fix database error with team submissions 
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:

ERROR: Incorrect number of query parameters. Expected 32, got 31.
 2016-10-18 12:11:45 +10:30
Eloy Lafuente (stronk7)
a14edb9fbb Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle 2016-10-18 00:07:17 +02:00
Eloy Lafuente (stronk7)
682074fe5b MDL-56100 mod_folder: add missing $OUTPUT for recent activity report. 2016-10-17 23:06:54 +02:00
Eloy Lafuente (stronk7)
2aa983c006 Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle 2016-10-17 22:58:11 +02:00
Stephen Bourget
1b467cb8cf MDL-56022 Assign: Make folders structure in the downloaded zip optional 
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
 2016-10-17 16:19:28 -04:00
Eloy Lafuente (stronk7)
b705cefa18 Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle 2016-10-17 18:50:07 +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
6578ffe4e0 Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle 2016-10-17 10:23:35 +01:00
Michael Aherne
0c5994269f MDL-56131 choice: Set maximum lifetime for lock 2016-10-17 13:50:42 +08:00
Andrew Nicols
608edec5ca MDL-56208 mod_forum: Move Display period below Group 2016-10-17 11:46:36 +08: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
Charles Fulton
1de06aa19b MDL-56100 mod_folder: add support for recent activity 2016-10-14 08:57:56 -04:00
Marc Català
260713fc8e MDL-56300 mod_assign: Filtering students throws a javascript error 2016-10-14 09:28:20 +02:00
Andrew Nicols
4f1f2a3468 MDL-53752 mod_book: Clarify book title 2016-10-14 12:48:10 +08:00
Andrew Nicols
2fff69ec72 MDL-55858 mod_forum: Remove subscription links when not relevant 
When a forum is force-subscribed or subscription is disabled, do not
include the subscription link in forum posts.
 2016-10-14 12:14:58 +08:00
Andrew Nicols
985ec99359 MDL-56295 mod_book: Refactor of chapter delete page 2016-10-14 12:14:07 +08:00
Andrew Nicols
6942122290 MDL-56295 mod_book: JS Confirmation of chapter removal 2016-10-14 11:29:16 +08:00
Rajesh Taneja
fbaf5d17d8 MDL-27072 behat: Removed wrong tag from feature 2016-10-13 19:32:08 +02:00
Rajesh Taneja
25b225a995 MDL-27072 behat: Fixed table separators 2016-10-13 19:32:07 +02:00
Marina Glancy
fa8e0af1f0 MDL-55833 mod_feedback: display in outline and complete reports 2016-10-13 13:49:16 +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
17ab49e9b1 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-12 14:53:01 +01:00
Tony Butler
88d309d947 MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page 2016-10-12 14:17:48 +01:00
Rajesh Taneja
cd5e416560
MDL-27072 behat: Removed wrong tag from feature 2016-10-12 12:57:22 +08:00
Rajesh Taneja
c76e57aace
MDL-27072 behat: Fixed table separators 2016-10-12 11:05:07 +08:00
David Mudrák
931bba6054 MDL-54945 workshop: Introduce workshop::check_group_membership() method 
This is just a refactored code block present at two different places. We
will need the same logic in the portfolio caller class soit made sense
to implement it as a new method, rather than make another copy&paste.

As a side effect, the logic is now properly unit tested.
 2016-10-11 20:23:55 +02:00
Dan Poltawski
287a906645 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-11 17:35:07 +01:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Loc Nguyen
5fd75ed889 MDL-54945 workshop: Workshop portfolio API integration 
Users can export their own submission
Users can export feedback/assessment received from other users
 2016-10-11 12:51:15 +02:00