mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
85,210 Commits 36 Branches 519 Tags
Commit Graph

85210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
331785d0f7 Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-12 09:50:36 +01:00
David Mudrák
afa6deec48 MDL-56486 workshop: Fix accepted_types for submission attachments 
It was a copy&paste mistake that the accepted_types option for the
submission attachments used the value configured for overall feedback
attachments.

Credit goes to Marina Glancy for catching this during testing.
 2017-07-12 09:57:06 +02:00
Dan Poltawski
f409b3984b Merge branch 'MDL-59365-master-fix1' of http://github.com/damyon/moodle 2017-07-12 08:15:38 +01:00
David Monllao
347be35d75 Merge branch 'MDL-59383-fix-1' of https://github.com/lameze/moodle 2017-07-12 09:07:03 +02:00
Simey Lameze
19ab239f18 MDL-59383 core_calendar: change modal body rendering 2017-07-12 15:00:30 +08:00
Simey Lameze
f405284728 MDL-59383 core_calendar: proper handling of description on webservice 2017-07-12 15:00:29 +08:00
Simey Lameze
6133141798 MDL-59383 core_calendar: css fixes to summary modal body 2017-07-12 15:00:29 +08:00
Damyon Wiese
2cc2001bef MDL-59365 enrol: Teachers can see other users on the site 
In order to enrol new users into a course, you need to see users who are not in the current course.
 2017-07-12 14:47:11 +08:00
David Monllao
5e961676c3 Merge branch 'MDL-59431-master-fix2' of git://github.com/andrewnicols/moodle 2017-07-12 08:34:30 +02:00
Simey Lameze
f6f2e3fd4f MDL-59371 gradereport_overview: add missing course id to url 2017-07-12 14:09:22 +08:00
Andrew Nicols
bd5416aab5 Merge branch 'wip-MDL-57462-master-fix' of git://github.com/abgreeve/moodle 2017-07-12 10:49:59 +08:00
Damyon Wiese
bfd42c1a88 MDL-59368 groups: More phpunit coverage 
Cover $withmembers parameter to groups_get_all_groups with a unit test.
 2017-07-12 10:41:32 +08:00
Adrian Greeve
24a7acf354 MDL-57432 installation: Fix to the php version check. 2017-07-12 10:39:20 +08:00
Damyon Wiese
f3ecea3af4 MDL-59368 groups: Peer review fixes 
* Fix coalesce on postgres.
* The edit icon's alt shows the HTML entities causing
* enrol/tests/behat/add_to_group.feature Contains a '@doit' tag which I assume is there from testing.
* group/classes/output/user_groups_editable.php
** Missing MOODLE_INTERNAL check.
** Unused variables context_system and moodle_exception.
** The PHPDocs for the constructors are wrong.
** export_for_template() returns an array, not stdClass (according to parent docs).
** Change moodle_exception to coding_exception at the beginning.
* group/lib.php
** Missing docs for core_group_inplace_editable().
* user/classes/participants_table.php
** The docs for the class variables $groups, $course and $context need a '\' beforehand as they are in a namespace.
** I would prefer $this->context = $context; and $this->groups = ... to be done at the end of the constructor with the other class variable assignments.
** You could get rid of the class variable courseid if we are setting course and use $this->course->id instead.
** The function col_groups has @param \stdclass $row but it should be $data
* lib/amd/src/form-autocomplete.js and lib/amd/src/inplace_editable.js
** Some issues here CiBot has pointed out.
* lib/classes/output/inplace_editable.php
** @see should be on a new line.
 2017-07-12 10:09:09 +08:00
Damyon Wiese
f746a078cb MDL-59368 groups: Postgres fix 
Postgres is strict about mixing types.
 2017-07-12 10:07:58 +08:00
Damyon Wiese
4aad7c2be2 MDL-59368 groups: Show no groups instead of '' 
This is on the inplace editable for a users course groups.
 2017-07-12 10:07:58 +08:00
Damyon Wiese
76c493b3f2 MDL-59368 groups: Add behat for new group edit 2017-07-12 10:07:58 +08:00
Damyon Wiese
090d064dda MDL-59368 enrol: Ensure remove_group_member_allowed works 
Wierd rare callback that does not work in core. Still respect it in the UI.
 2017-07-12 10:07:58 +08:00
Damyon Wiese
13426bae93 MDL-59368 inplace_editable: Focus on auto-complete 
Also fix JS coding style and build the amd.
 2017-07-12 10:07:58 +08:00
Damyon Wiese
5a90a7cabe MDL-59368 groups: Add an explicit cancel button 
Autocomplete already uses Escape keyboard handler - so we can't use it to cancel an edit-inplace thing.
Make an obvious cancel button instead.
 2017-07-12 10:07:57 +08:00
Damyon Wiese
2fa35b8d16 MDL-59368 groups: Inplace editing for users groups 2017-07-12 10:07:57 +08:00
Andrew Nicols
0d8ad3b500 MDL-59431 requirejs: Prioritise errors 2017-07-12 10:05:59 +08:00
Andrew Nicols
d45a6d4fe3 MDL-59431 requirejs: Correct failed JS check 2017-07-12 09:45:45 +08:00
David Monllao
afabbd110e Merge branch 'MDL-59039-master' of https://github.com/sammarshallou/moodle 2017-07-11 21:49:03 +02:00
sam marshall
67d6479581 MDL-59039 Global search: Allow partial indexing (in scheduled task) 2017-07-11 16:41:33 +01:00
Dan Poltawski
b4a5f2b63e Merge branch 'MDL-59019-master' of git://github.com/jleyva/moodle 2017-07-11 14:06:11 +01:00
Damyon Wiese
d77c73a359 MDL-59365 enrol: Use standard modal 
Replace the custom footer with a standard modal.
 2017-07-11 13:48:27 +01:00
Damyon Wiese
394e73ff12 MDL-59365 behat: Autocomplete fixes 
The suggestion list stays open for multi-selects now. We need to close it
explicitly.
 2017-07-11 13:48:27 +01:00
Damyon Wiese
2e1615f2c0 MDL-59365 eslint: Noop changes for eslint 2017-07-11 13:48:26 +01:00
Damyon Wiese
a78ed71c11 MDL-59365 enrol: enrol button participants page 2017-07-11 13:48:25 +01:00
Damyon Wiese
aa8909f479 MDL-59365 enrol: Make select users first 
This is the most important element in the form - make it first.
 2017-07-11 13:47:52 +01:00
Damyon Wiese
0fa35b1abc MDL-59365 enrol: Switch the user selector 
The user selector was calling the wrong API to get the potential list of users to enrol.

Now it works.
 2017-07-11 13:47:46 +01:00
Damyon Wiese
786e014c5c MDL-59365 autocomplete: Keep the suggestions open 
If the list allows multiple selections, don't auto-close the suggestions list
every time something is chosen.
 2017-07-11 13:47:28 +01:00
Damyon Wiese
a60e8ba51e MDL-59365 enrol_manual: Rewrite the yui enrolment popup in amd 
The add/roles thing was only converted to bootstrap 2/4 markup and the yui left in place.

The modal for adding users to a course was unsavable so I rewrote it with an mform in a popup, still calling
the same (barely) modified ajax script.

The webservice for searching cohorts was taken from admin/tool/lp and moved into /cohort. I added a generic "cohort"
mform element at the same time.

The webservice for searching for users was taken from the original ajax script.
 2017-07-11 13:47:26 +01:00
Eloy Lafuente (stronk7)
bdf31b0919 MDL-56629 dataformat_html: Adding UTF-8 charset 
Also adding the HEAD tag which was missing.

(credit goes to Frédéric Massart - FMCorz, thanks!)
 2017-07-11 13:43:17 +01:00
Eloy Lafuente (stronk7)
64ea4b5edd Merge branch 'MDL-54965-master' of git://github.com/tobiasreischmann/moodle 2017-07-11 13:43:16 +01:00
David Monllao
e78d7cc0b1 Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle 2017-07-11 12:36:58 +02:00
Dan Poltawski
e5ca70ba1d MDL-59287 upgrade.txt: avoid misleading versions 2017-07-11 11:30:43 +01:00
Dan Poltawski
58a9d391a6 Merge branch 'wip-MDL-59287-master-v3' of git://github.com/abgreeve/moodle 2017-07-11 11:29:53 +01:00
David Monllao
f938456835 Merge branch 'MDL-59431' of git://github.com/timhunt/moodle 2017-07-11 12:05:30 +02:00
David Monllao
93f2056000 Merge branch 'wip-MDL-59441-master' of git://github.com/marinaglancy/moodle 2017-07-11 11:41:03 +02:00
Dan Poltawski
58fcd0a0ed Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-11 10:18:48 +01:00
Dan Poltawski
229c5ec14f Merge branch 'MDL-59443-master-filetypesvalidation' of git://github.com/mudrd8mz/moodle 2017-07-11 10:16:40 +01:00
Eloy Lafuente (stronk7)
f84bdb4347 Merge branch 'MDL-57432-master' of git://github.com/danpoltawski/moodle 2017-07-11 10:44:06 +02:00
David Monllao
e578ab114c Merge branch 'MDL-59383-master' of git://github.com/lameze/moodle 2017-07-11 10:05:03 +02:00
Simey Lameze
0d38888e2a MDL-59383 core_calendar: make event summary display on modal 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
5813d1b9f9 MDL-59383 core_calendar: add get_calendar_event_by_id webservice 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
fee9f355bf MDL-59383 core_calendar: add lang strings for event types 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
68c3e21a89 MDL-59383 core_calendar: create summary modal templates 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
dfdde9ad35 MDL-59383 core_calendar: create summary modal AMD module 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00