Jun Pataleta
7a2300fd82
Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle
2017-11-08 14:43:15 +13:00
David Mudrák
ea90412944
MDL-60717 lang: Reflect the string change in behat scenario file
2017-11-07 21:49:18 +01:00
Helen Foster
8d64443452
MDL-60717 lang: Merge English strings from the en_fix language pack
...
Significant string changes:
- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
checking'
2017-11-07 21:30:14 +01:00
David Monllao
d6d2cec4a0
Merge branch 'MDL-59758_notes-fix' of git://github.com/dmonllao/moodle
2017-11-07 14:01:35 +01: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
Jake Dallimore
5243e93661
Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
2017-11-07 16:03:43 +08:00
Jake Dallimore
b135c42a17
Merge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle
2017-11-07 15:44:12 +08:00
Ryan Wyllie
ec8f488f30
MDL-60700 clean: add course link to activity event summary modal
2017-11-07 07:36:49 +00:00
David Monllao
aa30dc8860
MDL-59256 analytics: Respect activities specific access conditions
2017-11-07 08:14:53 +01:00
David Monllao
76f98c3bd5
MDL-59256 analytics: Move get_activities method to CoI scope
...
CoI = community of inquiry model
2017-11-07 08:14:49 +01:00
Jake Dallimore
7783fd0ec1
Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle
2017-11-07 15:01:31 +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
Jake Dallimore
eaa43a132c
Merge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle
2017-11-07 14:23:50 +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
Ryan Wyllie
f0fc8a194a
MDL-60700 calendar: remove bottom margin for description in summary
2017-11-07 06:03:01 +00:00
Andrew Nicols
03561ea899
Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle
2017-11-07 13:49:47 +08:00
Ryan Wyllie
6688ae2ba2
MDL-60062 calendar: prevent drag and drop of override events
2017-11-07 05:47:18 +00: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
1ccc9f1953
Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle
2017-11-07 11:59:49 +08:00
Damyon Wiese
efe2681894
MDL-57772 chat: BEEP is back baby!
2017-11-07 11:25:02 +08:00
Mark Nelson
e3a6d44845
MDL-60590 core_enrol: fixed failing Behat scenarios
2017-11-07 11:24:34 +08:00
Damyon Wiese
8aa01fcf61
Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle
2017-11-07 11:05:43 +08:00
Jake Dallimore
8072eb1384
Merge branch 'MDL-60705-master' of https://github.com/sammarshallou/moodle
2017-11-07 10:50:53 +08:00
Damyon Wiese
b9ae53f86b
MDL-59758 js: auto_rows module easier to use
...
Allow passing the direct text area, or a container.
Trigger change events on the text area, not the container.
Properly handle starting with rows > 1
2017-11-07 10:36:13 +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
Ryan Wyllie
8926030555
MDL-60700 calendar: normalise event type in summmary modal render
2017-11-07 02:08:00 +00:00
Jun Pataleta
13b19e40cb
Merge branch 'wip-MDL-60391-master' of git://github.com/marinaglancy/moodle
2017-11-07 14:30:58 +13:00
Ryan Wyllie
478b1d194f
MDL-60062 calendar: remove validate_event_timestart callback
2017-11-07 01:25:33 +00:00
Ryan Wyllie
9aac9f7074
MDL-60062 quiz: add support for drag drop of calendar events
2017-11-07 01:25:32 +00:00
Jun Pataleta
3a0951f027
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
2017-11-07 13:37:52 +13:00
Andrew Nicols
7d416f9c2c
MDL-60361 calendar: Update behat test lang
2017-11-07 08:36:29 +08:00
Jun Pataleta
589b602be3
Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle
2017-11-07 11:31:45 +13:00
Jun Pataleta
8001199766
MDL-60611 calendar: Remove usage of deprecated setExpectedException()
2017-11-07 11:21:29 +13:00
Jun Pataleta
a56833d49d
Merge branch 'MDL-60611' of git://github.com/stronk7/moodle
2017-11-07 10:14:24 +13:00
David Monllao
be88f0993d
Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle
2017-11-06 21:45:14 +01:00
sam marshall
11e60032be
MDL-60671 core_search: Cron output should use mtrace
...
The mtrace function is preferable for plain text logging/progress
output because it can be redirected if necessary. By convention it
is normally used in cron and can be used in CLI tasks if required.
This change makes the text_progress_trace class use mtrace instead
of echo and then flush. (Default behaviour of mtrace is to do
exactly that, but it can be redirected too.)
Before this change, if anybody is relying on mtrace behaviour to
redirect logs of cron output, this will fail for some parts of the
search cron output (and some other places like auth plugins).
2017-11-06 11:55:29 +00:00
sam marshall
401710883b
MDL-60705 core_search: Unit tests get time wrong by factor 1 million
2017-11-06 11:50:43 +00:00
Damyon Wiese
40f05d2312
Merge branch 'MDL-60590_master' of git://github.com/markn86/moodle
2017-11-06 14:18:40 +08:00
Andrew Nicols
3602df58b2
Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle
2017-11-06 13:27:11 +08:00
Andrew Nicols
f3743b3041
Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle
2017-11-06 12:43:24 +08:00
Mark Nelson
e2d635bbaf
MDL-60590 core_user: added Behat test for cohort list presence
2017-11-06 12:39:31 +08:00
Mark Nelson
a764855641
MDL-60590 core_cohort: removed unused variables from search_cohorts()
2017-11-06 12:39:31 +08:00
Mark Nelson
9b0f29239b
MDL-60590 enrol_manual: button title depends on cohort list existence
...
Also added a SELECTORS object to tidy the code by keeping the
selectors in a central location.
2017-11-06 12:35:05 +08:00
Mark Nelson
8ce86ebba3
MDL-60590 enrol_manual: check cohorts exist before displaying select
2017-11-06 12:35:05 +08:00
Damyon Wiese
30890c2971
MDL-60626 calendar: Fix for overrides
...
Override events do not have the courseid so we need to get it from the module instance.
2017-11-06 12:21:27 +08:00
Mark Nelson
1bd70073c5
MDL-60590 enrol_manual: only show cohorts with necessary capabilities
2017-11-06 11:22:45 +08:00
Damyon Wiese
9e0884d410
MDL-60626 calendar: Unit tests for capabilities
...
Check various calendar external functions for capabilities.
2017-11-06 11:11:28 +08:00
Damyon Wiese
af25b8fc7f
MDL-60626 calendar: Check capabilities for api
...
All external functions must check all capabilities before returning data.
The calendar API itself does not check capabilities (I wish it did), so we must be
careful exposing these functions to webservices.
2017-11-06 11:11:28 +08:00