mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
87,042 Commits 36 Branches 527 Tags
Commit Graph

2225 Commits

Author SHA1 Message Date
Sara Arjona
4bcb0a9a1d MDL-60550 user: Add more restrictions in keyword searches 
Original patch provided by Tim Schroeder.
 2017-11-09 16:29:29 +08:00
Damyon Wiese
56f05f23c6 MDL-60579 user: Don't lose text filters 
When replacing a group filter with a different group filter - don't forget all the current text filters that have
been applied.
 2017-11-09 11:06:30 +08:00
Damyon Wiese
bb869f05e8 MDL-60579 user: Move defines into library 
Entry page user/index.php was defining constants that were used by the renderer.
This means the renderer was tied to user/index.php.
 2017-11-09 11:06:30 +08:00
Andrew Nicols
7cf4331a6f MDL-60579 user: Correct PARAM type for filters 
Damyon pointed out during the integration of this fixset, that the
PARAM type is incorrect.
 2017-11-09 10:07:13 +08:00
Andrew Nicols
762f8dc1db MDL-60579 user: Add missing case breaks 2017-11-09 09:07:34 +08:00
Andrew Nicols
a997dc9da5 MDL-60579 user: Correct search for strings 2017-11-09 09:07:21 +08:00
Andrew Nicols
446b21b512 MDL-60579 user: Check filter strings have correct part count 2017-11-09 09:07:02 +08:00
Andrew Nicols
3968d2ca7e MDL-60579 user: Prevent behat from interacting til setup complete 2017-11-09 09:05:22 +08:00
David Monllao
ed0e2cea00 Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle 2017-11-08 17:48:07 +01:00
David Monllao
4e73acf3cf Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle 2017-11-08 12:16:20 +01:00
Damyon Wiese
a471bc4971 MDL-60732 core_user: Show group filters 
Always show the group filters, even if the course is in NO_GROUPS mode.
 2017-11-08 16:45:42 +08:00
David Monllao
57c9b7fc37 MDL-59758 user: Notes publish state adapted to ws 2017-11-07 13:53:21 +01:00
David Monllao
cae37299f3 Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle 2017-11-07 12:37:30 +01:00
Mihail Geshoski
c835126185 MDL-60579 enrolments: Applied filters lost on certain actions 
AMOS BEGIN
    CPY [invalidrequest,enrol_lti],[invalidrequest,enrol]
AMOS END
 2017-11-07 16:17:00 +08:00
Damyon Wiese
a6943ebb59 MDL-59758 core_user: Pluralise bulk actions 
Don't say 1 people.
 2017-11-07 14:39:04 +08:00
Damyon Wiese
81aa5e196f MDL-59758 core_user: Clean up user renderer 
These functions are not used anywhere by anything.
 2017-11-07 14:18:54 +08:00
Damyon Wiese
b5b81de3d6 MDL-59758 core_user: Replace old bulk actions 
The participants page has some clunky multi page forms for bulk actions. Replaces it with an ajax alternative.
 2017-11-07 14:18:49 +08:00
Jake Dallimore
b44bc9bf6c Merge branch 'MDL-60686-master' of git://github.com/damyon/moodle 2017-11-07 13:39:33 +08:00
Damyon Wiese
5616a31987 MDL-60686 core_users: Reorder filters by utility 
Order the list of filters on the participant page from most useful to least useful.
 2017-11-07 10:12:45 +08:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Mark Nelson
e2d635bbaf MDL-60590 core_user: added Behat test for cohort list presence 2017-11-06 12:39:31 +08:00
Eloy Lafuente (stronk7)
796e48a58b MDL-60611 phpunit: remove deprecated stuff and other minor fixes 
Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons
 2017-11-05 01:45:04 +01:00
David Monllao
be713b7144 Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle 2017-11-02 16:54:34 +01:00
Damyon Wiese
ae348e78a0 Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle 2017-11-02 12:21:39 +08:00
Andrew Nicols
58280ae0b8 Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle 2017-11-02 08:47:17 +08:00
Mark Nelson
9a428ae012 MDL-59982 core_user: allow user to use filters from same category 2017-11-01 12:55:17 +08:00
Mark Nelson
9f33d5ac6e MDL-60472 core_user: filter by group id when specified in URL 2017-10-31 12:05:13 +08:00
Juan Leyva
8c4d7cee79 MDL-51945 core_user: Prevent duplicated emails in update_users WS 2017-10-30 17:42:03 +01:00
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