86133 Commits

Author SHA1 Message Date
Simey Lameze
c602220798 MDL-59750 core_calendar: fix minithree logic on get_view 2017-09-20 13:25:19 +08:00
Simey Lameze
563ae695dc MDL-59750 calendar: fix logic on subscription template 2017-09-20 12:51:11 +08:00
Simey Lameze
d85651d82c MDL-59750 core_calendar: remove show_day method 2017-09-20 12:51:02 +08:00
Simey Lameze
63b13467a9 MDL-59750 calendar: organise exporters code 2017-09-20 12:50:52 +08:00
Simey Lameze
5a35675e53 MDL-59750 calendar: add edit and delete url to exporter 2017-09-20 12:50:43 +08:00
Simey Lameze
146d371344 MDL-59750 calendar: render day view using templates 2017-09-20 12:50:12 +08:00
Simey Lameze
ac671b3739 MDL-59750 core_calendar: rename template month_header to header 2017-09-20 12:48:26 +08:00
Simey Lameze
578eb78981 MDL-59750 core_calendar: add next and previous days handling methods 2017-09-20 12:47:38 +08:00
Simey Lameze
8afe9f8a14 MDL-59750 core_calendar: better handling of event subscription 2017-09-20 12:47:27 +08:00
Eloy Lafuente (stronk7)
e98f05340d Merge branch 'MDL-43176' of https://github.com/NeillM/moodle 2017-09-19 23:10:31 +02:00
Eloy Lafuente (stronk7)
77b767c362 Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle 2017-09-19 22:34:39 +02:00
Dan Poltawski
be5d95fc74 Merge branch 'MDL-59920-master' of git://github.com/andrewnicols/moodle 2017-09-19 18:14:18 +01:00
Jun Pataleta
7326663237 Merge branch 'MDL-53169-master' of https://github.com/sammarshallou/moodle 2017-09-19 22:26:30 +08:00
Dan Poltawski
6bfd4195be MDL-57886 plagarism: add note about behaviour change 2017-09-19 13:40:16 +01:00
Dan Poltawski
ecf8920afd Merge branch 'master_MDL-57886' of https://github.com/danmarsden/moodle 2017-09-19 13:40:12 +01:00
sam marshall
22ef155087 MDL-53169 Lib: enrol_get_my_courses can list available courses too 2017-09-19 12:19:49 +01:00
Jun Pataleta
66502b8180 Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle 2017-09-19 17:21:40 +08:00
Dan Poltawski
708100cbef Merge branch 'MDL-59277-master' of https://github.com/snake/moodle 2017-09-19 09:48:30 +01:00
Jun Pataleta
00b7632833 Merge branch 'MDL-59922-master-on-int' of git://github.com/ryanwyllie/moodle 2017-09-19 16:38:08 +08:00
Ryan Wyllie
c35613ff28 MDL-59922 mod_choice: allow editing of open and close events 2017-09-19 08:21:53 +00:00
Dan Poltawski
5b1d6143be Merge branch 'MDL-59507-master' of https://github.com/snake/moodle 2017-09-19 09:17:47 +01:00
Dan Poltawski
a1b8b9c9b5 Merge branch 'MDL-59960_mimetype' of https://github.com/mrmark/moodle 2017-09-19 09:10:24 +01:00
Ryan Wyllie
39fe5929c6 MDL-59922 calendar: allow editing of activity events 2017-09-19 06:48:57 +00:00
Dan Poltawski
f5cc5b321d Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle 2017-09-19 07:27:48 +01:00
Dan Poltawski
363d81514e Merge branch 'MDL-60045_master-v2' of git://github.com/markn86/moodle 2017-09-19 07:16:02 +01:00
Jun Pataleta
c8d20b2a73 Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle 2017-09-19 13:38:26 +08:00
Andrew Nicols
5ff6114623 MDL-60065 calendar: Deprecate calendar_get_mini and friends
This is no longer used and should be deprecated.
2017-09-19 13:21:58 +08:00
Mark Nelson
fe2142952f MDL-60045 core_user: allow roleid to be passed via URL 2017-09-19 11:40:10 +08:00
Eloy Lafuente (stronk7)
db7083c4c4 Merge branch 'MDL-60105_master' of git://github.com/dmonllao/moodle 2017-09-19 01:55:12 +02:00
Eloy Lafuente (stronk7)
3286e94362 Merge branch 'MDL-52131-master' of git://github.com/andrewnicols/moodle 2017-09-19 01:53:07 +02:00
Eloy Lafuente (stronk7)
66286d5768 Merge branch 'MDL-60094-master' of https://github.com/abias/moodle 2017-09-19 01:50:37 +02:00
Eloy Lafuente (stronk7)
dffca49945 Merge branch 'MDL-37810-master' of https://github.com/snake/moodle 2017-09-19 01:45:29 +02:00
Eloy Lafuente (stronk7)
00045100d0 Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle 2017-09-19 01:42:17 +02:00
Eloy Lafuente (stronk7)
0238520084 Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle 2017-09-19 01:36:56 +02:00
Eloy Lafuente (stronk7)
5c45e6038c Merge branch 'MDL-59245-master' of git://github.com/jleyva/moodle 2017-09-19 01:33:08 +02:00
Jun Pataleta
77b5d07e31 Merge branch 'MDL-59900_master' of git://github.com/markn86/moodle 2017-09-18 16:03:46 +08:00
Jun Pataleta
58cd2bfd82 Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle 2017-09-18 14:39:46 +08:00
Jun Pataleta
bf2742f2f2 Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle 2017-09-18 13:07:45 +08:00
Andrew Nicols
6038d62625 MDL-60065 calendar: Add threemonth view 2017-09-18 12:04:48 +08:00
Andrew Nicols
b014688581 MDL-60065 calendar: Specify optional replacement node 2017-09-18 12:04:48 +08:00
Andrew Nicols
fee025ecbb MDL-60065 calendar: Control navigation on mini 2017-09-18 12:04:48 +08:00
Andrew Nicols
b9ff690eb6 MDL-60065 calendar: Update side calendar when on CRUD events 2017-09-18 12:04:48 +08:00
Jun Pataleta
23277c9f8f Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle 2017-09-18 11:49:30 +08:00
Andrew Nicols
2dbfb484aa MDL-59920 calendar: Allow user to choose if deleting one or all events 2017-09-18 11:48:51 +08:00
Andrew Nicols
f58424c70c MDL-60125 calendar: Switch to navigation by YMD 2017-09-18 11:44:25 +08:00
Jake Dallimore
434d138c2a MDL-37810 roles: added manager case to test_get_user_roles_in_course()
Managers can assign managers, and should be able to see that role on
the course profile page, as a link to the participants page.
2017-09-18 10:16:08 +08:00
Jun Pataleta
afec1107d2 Merge branch 'MDL-59994-master-v2' of git://github.com/lameze/moodle 2017-09-18 09:10:35 +08:00
Jake Dallimore
5d0cc05b20 MDL-59277 navigation: add support for container type in get_css_type() 2017-09-18 09:03:51 +08:00
Jake Dallimore
b8c31dfe6d MDL-59507 forms: unit tests confirming that .xxx is an invalid extension
Modified:
- test_data_for_browser()
- test_unknow_file_types()
2017-09-18 09:03:00 +08:00
Jake Dallimore
405cbc09ba MDL-59507 forms: accepted file types won't allow the .xxx extension
- Modified get_filetypes_browser_data() to exclude this extension.
- Server side form validation blocks this extension too.
2017-09-18 09:03:00 +08:00