2197 Commits

Author SHA1 Message Date
Adrian Greeve
349b705d31 MDL-60515 groups: Display group information on the participants page. 2017-10-30 16:43:18 +08:00
John Okely
672f483670 MDL-42834 admin: Removal of httpswwwroot 2017-10-23 12:25:36 +08:00
John Okely
4b501ec96b MDL-42834 admin: Deprecate https_required and verify_https_required 2017-10-23 12:25:35 +08:00
David Monllao
43b8618b40 Merge branch 'MDL-60179_master' of git://github.com/markn86/moodle 2017-10-19 15:26:27 +02:00
Mark Nelson
af835c24b2 MDL-60179 core: make it clear what enrolment instance is being edited 2017-10-19 14:57:23 +08:00
David Monllao
b1a9a6a19a Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle 2017-10-17 09:45:44 +02:00
Eloy Lafuente (stronk7)
a9f816744b Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle 2017-10-17 00:37:47 +02:00
Eloy Lafuente (stronk7)
b86f988bcb Merge branch 'MDL-60171' of https://github.com/cbluesprl/moodle 2017-10-17 00:13:25 +02:00
Jun Pataleta
5be8c8daa6 Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle 2017-10-16 12:10:51 +08:00
Jun Pataleta
a3bfb41cdd MDL-59984 enrol: Apply more filters to multiple filters scenario 2017-10-16 09:47:39 +08:00
Marina Glancy
78da366b56 MDL-60281 general: various strict corrections for PHP7.2
- count() can only be called on arrays or Countable, it can not be called on null
- recordset is neither so iterator_count() should be used
- instanceof or get_class() can not be applied to non-objects
- class methods must have the same arguments as methods in parent class
2017-10-16 09:37:20 +08:00
Jun Pataleta
5a3f03b2a8 MDL-60029 profile: Replace table alias with non-reserve word
* The table alias 'uid' is a reserved word in oracle. Replaced it with
something a little more safe.
2017-10-13 10:38:00 +08:00
Jun Pataleta
dab702d394 Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle 2017-10-12 16:16:42 +08:00
Andrew Nicols
e61ad18e70 Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle 2017-10-12 11:28:04 +08:00
sam marshall
66e3702680 MDL-55356 core_search: Change existing search areas to new API
This change considers all existing search areas in Moodle and makes
necessary changes.

Custom change to course search, supported by helper in base.php:

* course/classes/search/mycourse.php

Custom change to message search:

* message/classes/search/message_received.php
* message/classes/search/message_sent.php

Custom change to user search:

* user/classes/search/user.php

Custom changes to module areas, supported by helper in base_mod.php:

* mod/book/classes/search/chapter.php
* mod/data/classes/search/entry.php
* mod/forum/classes/search/post.php
* mod/glossary/classes/search/entry.php
* mod/survey/classes/search/activity.php
* mod/wiki/classes/search/collaborative_page.php

(Note: the unit tests do not exhaustively check every context type
for these, given that's mainly handled by the helper function
which was already tested in the base_activity test.)

Handled by block base class (no change):

* blocks/html/classes/search/content.php

Handled by activity base class (no change):

* mod/assign/classes/search/activity.php
* mod/book/classes/search/activity.php
* mod/chat/classes/search/activity.php
* mod/choice/classes/search/activity.php
* mod/data/classes/search/activity.php
* mod/feedback/classes/search/activity.php
* mod/folder/classes/search/activity.php
* mod/forum/classes/search/activity.php
* mod/glossary/classes/search/activity.php
* mod/imscp/classes/search/activity.php
* mod/label/classes/search/activity.php
* mod/lesson/classes/search/activity.php
* mod/lti/classes/search/activity.php
* mod/page/classes/search/activity.php
* mod/quiz/classes/search/activity.php
* mod/resource/classes/search/activity.php
* mod/scorm/classes/search/activity.php
* mod/url/classes/search/activity.php
* mod/wiki/classes/search/activity.php
* mod/workshop/classes/search/activity.php
2017-10-11 17:17:09 +01:00
Eloy Lafuente (stronk7)
ae2f169a08 Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle 2017-10-10 19:10:52 +02:00
Mark Nelson
7b1adb4c7e MDL-45730 core_user: added additional event triggers 2017-10-10 13:05:48 +08:00
Damyon Wiese
1bf6dcc507 MDL-60046 participants: Update behat tests
The filter button was removed, so it needs to be removed from the tests.
2017-10-10 10:54:27 +08:00
Marina Glancy
b47fda7191 MDL-60029 core_user: new api functions rearranged 2017-10-10 10:34:55 +08:00
Guillaume Latour
febd7a62f7 MDL-60171 user/edit: more meaning for delete pic
AMOS BEGIN
    CPY [delete,core_moodle],[deletepicture,core_moodle]
AMOS END
2017-10-09 15:10:06 +02:00
John Ehringer
6d242b28e6 MDL-45730 core: Adding events to user profile field and categories CRUD. 2017-10-09 18:58:36 +08:00
Mike Churchward
860f59b13c MDL-60029 core_user: Added new api function to reduce db calls. 2017-10-09 14:10:38 +08:00
Eloy Lafuente (stronk7)
34ecee16bb Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:48:28 +02:00
Eloy Lafuente (stronk7)
fe61786879 Merge branch 'MDL-60198-master' of git://github.com/jleyva/moodle 2017-10-03 20:15:42 +02:00
Andrew Nicols
2a77813b51 MDL-59882 behat: Update known uses of dialogue CSS 2017-10-02 12:44:37 +08:00
Damyon Wiese
e39df1faeb MDL-60046 user: Apply user filters immediately. 2017-09-22 14:53:27 +08:00
Juan Leyva
e71687baf9 MDL-60198 webservice: Add missing MOODLE_INTERNAL checks 2017-09-21 13:01:28 +02:00
Mark Nelson
fe2142952f MDL-60045 core_user: allow roleid to be passed via URL 2017-09-19 11:40:10 +08:00
Jake Dallimore
d07006f1fd MDL-37810 core_user: fix the user renderer's usage of get_profile_roles 2017-09-18 08:59:29 +08:00
David Monllao
651f1a1703 Merge branch 'MDL-59831_master' of git://github.com/markn86/moodle 2017-09-12 08:07:52 +02:00
Dan Poltawski
743c937dae Merge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattporritt/moodle 2017-09-11 14:01:40 +01:00
Mark Nelson
32e5109d7f MDL-59831 core_user: only set default group when necessary 2017-09-11 12:47:25 +08:00
Mark Nelson
580a5588f1 MDL-59831 core_user: show all groups in select when in visible groups 2017-09-11 12:47:25 +08:00
Mark Nelson
93b47710ac MDL-59977 core: do not directly check 'viewparticipant' capability 2017-09-11 12:44:27 +08:00
Jake Dallimore
4266786b48 MDL-58953 user: additional test case for user_can_view_profile() 2017-09-07 10:53:34 +02:00
Jake Dallimore
eb01e70b91 MDL-58953 user: fix course checking logic in user_can_view_profile()
Make sure to check that $user in enrolled in $course before checking
whether the current user has capabilities in that course, and make sure
that we don't check user context caps when handling a specific course.
2017-09-07 10:53:33 +02:00
Jun Pataleta
7800e6881c MDL-59759 core_user: Use SAVE_CANCEL modal for unenrol dialog 2017-09-04 10:44:51 +08:00
Matt Porritt
4e921569d0 MDL-59459 Golbal Search: Increase file indexing coverage
Increase the scope of the files that are detected and
indexed by Moodle's Global Search. This includes intro
and content areas of search areas. The use case here is
in a description for an activity there is a file added
that contains more information about the activity.
It would an advantage to be able to search this content
as well. It would also allow search engine plugins to be
able to index non text files such as images.
2017-09-02 10:28:17 +10:00
Damyon Wiese
d29be32000 MDL-59801 users: Behat fixes
Firstly - the list of roles to filter needs to be a combination of the assignable roles and the existing roles in the course.
Secondly - the auto-complete behat step needs to search for entire strings, not substrings.
2017-08-31 12:32:03 +08:00
Eloy Lafuente (stronk7)
7d08eccf43 Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle 2017-08-30 01:21:22 +02:00
Eloy Lafuente (stronk7)
08986e0c42 Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle 2017-08-30 00:36:07 +02:00
Dan Poltawski
4e597bf219 Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle 2017-08-29 10:24:50 +01:00
Mark Nelson
1329ffd7b7 MDL-59830 core_user: do not show roles that can not be deleted 2017-08-29 17:12:26 +08:00
Mark Nelson
5700ad902a MDL-59801 core_user: add missing class variable declaration
Also minor fix to PHPDocs.
2017-08-29 16:28:56 +08:00
Jun Pataleta
b26ce53776 Merge branch 'MDL-59823-master' of git://github.com/damyon/moodle 2017-08-29 15:49:24 +08:00
Jun Pataleta
b83a329ad6 Merge branch 'MDL-59822-master' of git://github.com/damyon/moodle 2017-08-29 15:25:33 +08:00
Damyon Wiese
b0b6ff3c18 MDL-59827 users: Typo in force_open()
force_open() not forceopen()
2017-08-29 15:06:43 +08:00
Andrew Nicols
27e827e181 Merge branch 'MDL-59821-master' of git://github.com/damyon/moodle 2017-08-29 14:54:33 +08:00
Andrew Nicols
3eb0d7db6d Merge branch 'MDL-59827-master' of git://github.com/damyon/moodle 2017-08-29 13:21:22 +08:00
Andrew Nicols
85419c5b2e Merge branch 'MDL-59828-master' of git://github.com/damyon/moodle 2017-08-29 11:56:28 +08:00