Damyon Wiese
ef29782f31
Merge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle
2017-11-06 10:45:34 +08:00
Damyon Wiese
1ada616c56
Merge branch 'MDL-60596_master' of git://github.com/dmonllao/moodle
2017-11-06 10:19:10 +08:00
Damyon Wiese
8443b88995
Merge branch 'MDL-60437-multilang-html-block-titles' of https://github.com/lucaboesch/moodle
2017-11-06 10:09:08 +08:00
Jake Dallimore
eb354bdefa
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
2017-11-06 09:29:46 +08:00
Jun Pataleta
4cd3927c4f
MDL-59858 amd: Focus on the element that actually triggers the modal
2017-11-06 13:18:03 +13:00
Jun Pataleta
6a973d261a
Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle
2017-11-06 10:18:46 +13: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
AMOS bot
496b39974f
Automatically generated installer lang files
2017-11-05 00:05:09 +00:00
Luca Bösch
6586118e0f
MDL-60437 blocks: HTML block title multilang
2017-11-03 16:35:59 +01:00
David Monllao
4a145a8ae5
MDL-60598 analytics: Info message for predictions based on data
2017-11-03 12:45:40 +01:00
David Monllao
da8a0c97f0
MDL-60596 analytics: Check cm completion if available
...
Previous code was restricted to course modules origin.
2017-11-03 12:44:21 +01:00
David Monllao
20b2565c38
MDL-60667 mlbackend_python: Bump to non-linear neural net version
2017-11-03 12:43:52 +01:00
David Monllao
36e84e96fc
MDL-59256 analytics: Move get_activities test scope
2017-11-03 12:42:20 +01:00
David Monllao
159b4e5d8c
Moodle release 3.4rc1
2017-11-03 10:26:18 +01:00
Jake Dallimore
aa95085969
Merge branch 'MDL-58047-master-fix1' of http://github.com/damyon/moodle
2017-11-03 16:09:29 +08:00
Damyon Wiese
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
Jun Pataleta
928bcb02d6
Merge branch 'MDL-60657-int-fix-1' of github.com:ryanwyllie/moodle
2017-11-03 16:51:24 +13:00
Andrew Nicols
b9fd516407
MDL-60361 calendar: Support all event types for calendar subs
2017-11-03 11:27:40 +08:00
Ryan Wyllie
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
Simey Lameze
20a5056df6
MDL-60638 calendar: fix event subscription variable names
2017-11-03 10:03:17 +08:00
Jake Dallimore
4071a2b6fe
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
2017-11-03 09:14:52 +08:00
Andrew Nicols
6630b38c95
MDL-60587 calendar: Adjust use of time() in unit tests
2017-11-03 09:04:10 +08:00
Jake Dallimore
b974b5d05d
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
2017-11-03 08:37:31 +08:00
Andrew Nicols
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
Eloy Lafuente (stronk7)
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
Eloy Lafuente (stronk7)
801a372dad
MDL-60611 phpunit: switch to namespaced phunit classes
2017-11-02 23:45:34 +01:00
Eloy Lafuente (stronk7)
1322351b92
MDL-60611 phpunit: Bump phpunit to 6.4 and travis to use PHP72
2017-11-02 23:45:21 +01:00
David Monllao
bb2071ca17
Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle
2017-11-02 16:57:03 +01:00
David Monllao
be713b7144
Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle
2017-11-02 16:54:34 +01:00
Andrew Nicols
e20752c4f5
MDL-60587 calendar: Fix un-validated params
2017-11-02 21:49:28 +08:00
Andrew Nicols
30ff29dc9f
MDL-60587 calendar: Improve link params for calendar buttons
2017-11-02 21:49:28 +08:00
Andrew Nicols
6607c5ffb6
MDL-60587 calendar: Switch WS to use new helper
2017-11-02 21:49:28 +08:00
Andrew Nicols
7f14def230
MDL-60587 calendar: Add missing categoryid in upcoming WS
2017-11-02 21:49:28 +08:00
Andrew Nicols
39e364515f
MDL-60587 calendar: Switch to new helper in main view
2017-11-02 21:49:28 +08:00
Andrew Nicols
557d8528eb
MDL-60587 block_calendar_upcoming: Setup calendar using new helper
2017-11-02 21:49:28 +08:00
Andrew Nicols
0bd6039f40
MDL-60587 block_calendar_month: Setup calendar using new helper
2017-11-02 21:49:28 +08:00
Andrew Nicols
57e8c9f748
MDL-60587 calendar: Correct category subscription in information
2017-11-02 21:49:28 +08:00
Andrew Nicols
7b7bf31d4c
MDL-60587 calendar: Add helper to setup the calendar_information
2017-11-02 21:49:28 +08:00
David Monllao
59aff5f949
Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle
2017-11-02 13:24:58 +01:00
Eloy Lafuente (stronk7)
f816ea9a67
Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle
2017-11-02 12:45:22 +01:00
David Monllao
6e3314f044
Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle
2017-11-02 12:04:07 +01:00
David Monllao
2a542d0265
Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle
2017-11-02 11:59:30 +01:00
Damyon Wiese
f18fb611c9
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
2017-11-02 15:46:42 +08:00
Andrew Nicols
43caf0217f
MDL-60558 block_calendar_upcoming: Render the template when no events
2017-11-02 15:43:17 +08:00
David Monllao
7b03092121
Merge branch 'MDL-53501-master' of git://github.com/jleyva/moodle
2017-11-02 08:30:24 +01:00
Damyon Wiese
5dbd051502
Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
2017-11-02 14:39:32 +08:00
Jun Pataleta
c39a22f600
MDL-60659 mod_forum: Use PHP EOL for line breaks in expected values
2017-11-02 19:11:00 +13:00
Ryan Wyllie
f0f38bf1d3
MDL-60657 core: fix upgrade notice modal header padding
2017-11-02 06:07:00 +00:00
Damyon Wiese
41080050b0
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
2017-11-02 13:03:35 +08:00
Damyon Wiese
ae348e78a0
Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle
2017-11-02 12:21:39 +08:00
