mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 03:52:33 +01:00
Code Issues Projects Releases Wiki Activity
86,320 Commits 36 Branches 527 Tags
Commit Graph

86320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
a1b8b9c9b5 Merge branch 'MDL-59960_mimetype' of https://github.com/mrmark/moodle 2017-09-19 09:10:24 +01:00
Mark Nelson
866939c3cc MDL-60130 mod_*: removed unused 'tagtitle' string 2017-09-19 14:54:39 +08: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
Jake Dallimore
da655d9ee4 MDL-37810 roles: get_user_roles_in_course returns all relevant roles 
Fixed to return both those roles in the profileroles site policy and
any roles which the current user can assign in the respective context,
meaning a user can see a link to any role they can assign.
 2017-09-18 08:59:29 +08:00
Jake Dallimore
d07006f1fd MDL-37810 core_user: fix the user renderer's usage of get_profile_roles 2017-09-18 08:59:29 +08:00
Jake Dallimore
42a2c4794d MDL-37810 roles: unit tests for get_profile_roles() 2017-09-18 08:59:29 +08:00
Jake Dallimore
7b30582669 MDL-37810 roles: fix get_profile_roles() so it returns assignable roles 2017-09-18 08:59:29 +08:00
Simey Lameze
2fc95ecf80 MDL-59994 competency: improve user competency unit test 2017-09-18 08:32:12 +08:00
Simey Lameze
8c13028c9d MDL-59994 competency: dont list competencies from deleted users 2017-09-18 08:32:12 +08:00
Neill Magill
dbe7012475 MDL-43176 enrol_meta: enrol_meta_sync query is inefficient 
Before this change the nested select did a full table scan of
either the enrol or user_enrolments table. This meant that
on large sites the query could be very slow.

This change ensures that there are no full table scans which
makes the query much more efficient.

In my testing the all courses version of the query changed
from ~15 s to ~ 5 s; the singles course version changed
from ~15 s to > 0.1 s
 2017-09-15 14:12:32 +01:00
Juan Leyva
ca90ed2109 MDL-60141 auth_email: Fix sitepolicy field type in get_signup_settings 2017-09-15 11:50:07 +02:00
Juan Leyva
4fe55987e1 MDL-60005 tool_mobile: Return sitepolicy in tool_mobile_get_config WS 2017-09-15 11:17:12 +02:00
Dan Poltawski
91cbdda6af weekly release 3.4dev 2017-09-15 08:49:23 +01:00
Dan Poltawski
3ec75fb64d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-09-15 08:49:21 +01:00
Matt Petro
f5ea99bf6e MDL-60121 enrol: Fix enrol plugin backup 
Allow more than one enrol plugin to add backup structure.
 2017-09-14 10:39:09 -04:00
Alexander Bias
af25a2b739 MDL-60094 administration: Add CLI script to kill all sessions 2017-09-14 16:03:39 +02:00
Dan Poltawski
f125ce6522 Merge branch 'MDL-58835_master-fix2' of https://github.com/dmonllao/moodle 2017-09-14 12:25:47 +01:00
David Monllao
3f6933d896 MDL-58835 report_insights: Force window reload when no more predictions 2017-09-14 12:55:03 +02:00
Juan Leyva
6703e031f0 MDL-60132 tool_mobile: Handle correctly moodle_url instances 
In Moodle there are some functions that can be overridden by themes.
Some themes are returning incorrect value types in those functions
 2017-09-14 12:17:21 +02:00
Juan Segarra Montesinos
53fa2a5194 MDL-52131 qbehaviour: respect manualcomment format 
The format of a manual comment in a question is respected when
the preferred editor is "Plain text area".
 2017-09-14 13:30:35 +08:00
Ankit Agarwal
f3a3e23448 MDL-57115 blocks: Cleanup block_messages instances and other configs 2017-09-14 09:57:03 +05:30
Jun Pataleta
a2bcf808d9 Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle 2017-09-14 12:17:14 +08:00
Marina Glancy
f9af542769 MDL-59775 forms: css correction 2017-09-14 12:05:12 +08:00