159b4e5d8c
Moodle release 3.4rc1
2017-11-03 10:26:18 +01:00
aa95085969
Merge branch 'MDL-58047-master-fix1' of http://github.com/damyon/moodle
2017-11-03 16:09:29 +08:00
79ea89fea2
MDL-58047 assign: submission sorting
...
Only exclude new submission records from the sorting, draft and reopened submission are valid.
2017-11-03 15:55:10 +08:00
928bcb02d6
Merge branch 'MDL-60657-int-fix-1' of github.com:ryanwyllie/moodle
2017-11-03 16:51:24 +13:00
b9fd516407
MDL-60361 calendar: Support all event types for calendar subs
2017-11-03 11:27:40 +08:00
c2502375ff
MDL-60657 boost: fix styles when extending modal components
...
I've wrapped the custom modal styling in the .modal class. This prevents
those custom styles from being pulled in when the SCSS @extend
functionality is used to extend the modal components.
2017-11-03 03:18:02 +00:00
20a5056df6
MDL-60638 calendar: fix event subscription variable names
2017-11-03 10:03:17 +08:00
4071a2b6fe
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
2017-11-03 09:14:52 +08:00
6630b38c95
MDL-60587 calendar: Adjust use of time() in unit tests
2017-11-03 09:04:10 +08:00
b974b5d05d
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
2017-11-03 08:37:31 +08:00
1ab858314a
MDL-60587 block: Correct courseid/categoryid check
...
pagelib uses magic getters for both the course, and category.
It does not define the magic __isset function though.
2017-11-03 08:14:56 +08:00
6be1923d81
MDL-60611 phpunit: ignore risky (empty) unit tests
...
At some point we should review them, removing or moving stuff.
2017-11-02 23:45:35 +01:00
801a372dad
MDL-60611 phpunit: switch to namespaced phunit classes
2017-11-02 23:45:34 +01:00
1322351b92
MDL-60611 phpunit: Bump phpunit to 6.4 and travis to use PHP72
2017-11-02 23:45:21 +01:00
bb2071ca17
Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle
2017-11-02 16:57:03 +01:00
be713b7144
Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle
2017-11-02 16:54:34 +01:00
e20752c4f5
MDL-60587 calendar: Fix un-validated params
2017-11-02 21:49:28 +08:00
30ff29dc9f
MDL-60587 calendar: Improve link params for calendar buttons
2017-11-02 21:49:28 +08:00
6607c5ffb6
MDL-60587 calendar: Switch WS to use new helper
2017-11-02 21:49:28 +08:00
7f14def230
MDL-60587 calendar: Add missing categoryid in upcoming WS
2017-11-02 21:49:28 +08:00
39e364515f
MDL-60587 calendar: Switch to new helper in main view
2017-11-02 21:49:28 +08:00
557d8528eb
MDL-60587 block_calendar_upcoming: Setup calendar using new helper
2017-11-02 21:49:28 +08:00
0bd6039f40
MDL-60587 block_calendar_month: Setup calendar using new helper
2017-11-02 21:49:28 +08:00
57e8c9f748
MDL-60587 calendar: Correct category subscription in information
2017-11-02 21:49:28 +08:00
7b7bf31d4c
MDL-60587 calendar: Add helper to setup the calendar_information
2017-11-02 21:49:28 +08:00
59aff5f949
Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle
2017-11-02 13:24:58 +01:00
f816ea9a67
Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle
2017-11-02 12:45:22 +01:00
6e3314f044
Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle
2017-11-02 12:04:07 +01:00
2a542d0265
Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle
2017-11-02 11:59:30 +01:00
f18fb611c9
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
2017-11-02 15:46:42 +08:00
43caf0217f
MDL-60558 block_calendar_upcoming: Render the template when no events
2017-11-02 15:43:17 +08:00
7b03092121
Merge branch 'MDL-53501-master' of git://github.com/jleyva/moodle
2017-11-02 08:30:24 +01:00
5dbd051502
Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
2017-11-02 14:39:32 +08:00
c39a22f600
MDL-60659 mod_forum: Use PHP EOL for line breaks in expected values
2017-11-02 19:11:00 +13:00
f0f38bf1d3
MDL-60657 core: fix upgrade notice modal header padding
2017-11-02 06:07:00 +00:00
41080050b0
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
2017-11-02 13:03:35 +08:00
ae348e78a0
Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle
2017-11-02 12:21:39 +08:00
71fc06aae5
Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle
2017-11-02 12:10:04 +08:00
e3491a093a
MDL-60558 calendar: Upcoming block should use the right template
2017-11-02 11:55:49 +08:00
a0a78199b8
MDL-60558 calendar: Add event metadata to upcoming template
2017-11-02 11:55:49 +08:00
d523cbcb26
MDL-60558 calendar: Upcoming should support categories
2017-11-02 11:54:43 +08:00
5c9acb8164
MDL-60558 calendar: Adjust URL change
...
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.
This also changes to use pushState so as not to overwrite the current
location in history.
2017-11-02 11:54:13 +08:00
8242027da3
MDL-60558 calendar: Move edit event to CRUD
2017-11-02 11:53:52 +08:00
fd2f1ae146
MDL-60558 calendar: Remove old SELECTORS
2017-11-02 11:53:49 +08:00
c8419f87c0
MDL-60558 calendar: Harden event link detection
2017-11-02 11:53:26 +08:00
4837fea0aa
Merge branch 'MDL-60619-master' of https://github.com/snake/moodle
2017-11-02 11:51:35 +08:00
671440d708
Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle
2017-11-02 11:38:57 +08:00
6c3f463dbd
MDL-60558 calendar: Move the summary modal to view_manager
2017-11-02 10:56:00 +08:00
fca7e60c81
Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle
2017-11-02 10:45:07 +08:00
1e83eec993
Merge branch 'MDL-60555-master' of https://github.com/sammarshallou/moodle
2017-11-02 10:40:43 +08:00
David Monllao