mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-21 09:52:54 +01:00
Code Issues Projects Releases Wiki Activity
81,575 Commits 36 Branches 523 Tags
Commit Graph

81575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
16f9660cfe Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle 2016-11-09 11:59:02 +08:00
Andrew Nicols
cfa4b26231 Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle 2016-11-09 11:27:57 +08:00
Simey Lameze
cff1f90adf MDL-56792 core_charts: clean html content from title and labels 
This commit add cleanData() and call it from all places that has labels or title
to guarantee that html content will not be printed on the chart.
 2016-11-09 10:41:12 +08:00
Andrew Nicols
43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +08:00
Eloy Lafuente (stronk7)
6c5ee657a7 Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle 2016-11-09 02:11:55 +01:00
David Monllao
0cbfb7ff2a Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle 2016-11-09 08:36:36 +08:00
Dan Poltawski
231e2ec99a Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle 2016-11-08 17:56:12 +00:00
Dan Poltawski
e20c8ddc80 Merge branch 'MDL-48498-master-iv6' of https://github.com/snake/moodle 2016-11-08 17:51:17 +00:00
Dan Poltawski
674c4f6891 Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle 2016-11-08 13:43:54 +00:00
Dan Poltawski
258d07d37e Moodle release 3.2beta 
Make Moodle Great Again ;-)
v3.2.0-beta 		2016-11-08 10:25:31 +00:00
Dan Poltawski
fc760dd19e NOBUG: Fixed SVG browser compatibility 2016-11-08 10:19:16 +00:00
Dan Poltawski
060171774b Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-11-08 10:19:15 +00:00
Rajesh Taneja
e4c98de168
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 18:06:09 +08:00
Juan Leyva
9d92a3a6ba MDL-56607 settings: Remove Mobile settings from WS overview 2016-11-08 09:52:16 +00:00
Ankit Agarwal
20ab51fdbc MDL-56409 messages: Save one db query per page load 2016-11-08 12:50:30 +05:30
Jake Dallimore
605bab84ce MDL-48498 core_files: Add security helper to curl class 
Allow injection of security_helper objects into curl, but default
to a core helper tied to http security settings values.
 2016-11-08 15:11:15 +08:00
Jake Dallimore
f6d9efefaa MDL-48498 core_files: curl_security_helper_base and implementation 
Base class and core implementation providing a means to check URLs
against the curl security admin settings entries.
 2016-11-08 15:11:15 +08:00
Jake Dallimore
067268942c MDL-48498 admin: new setting types for curl host/port restrictions 
Two new classes in lib/adminlib. One providing validation for a
newline-delimited textarea supporting domain names, domain wildcards,
IPv4/IPv6 addresses and IPv4/IPv6 ranges. The second providing
validation for a newline-delimited textarea of port numbers.
 2016-11-08 15:10:35 +08:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Andrew Nicols
3739b8b886 Merge branch 'wip-mdl-55215' of https://github.com/rajeshtaneja/moodle 2016-11-08 14:31:33 +08:00
Damyon Wiese
9280f62e38 MDL-56196 mod_lti: Fix popups and secret form in boost 2016-11-08 14:27:26 +08:00
Rajesh Taneja
eaefd5bc57
MDL-55215 behat: autocomplete field requires javascript 2016-11-08 14:21:52 +08:00
Frédéric Massart
3d979f9676 MDL-56196 mod_lti: Adapt templates for both Boost and Clean 2016-11-08 14:11:14 +08:00
Jake Dallimore
89e20c74d5 MDL-54751 core_course: Fixed event type checks in adhoc deletion tests 2016-11-08 13:53:00 +08:00
Andrew Nicols
592c691c8f MDL-56555 tool_usertours: Update tool sharing link 2016-11-08 13:51:11 +08:00
Andrew Nicols
3e85e02a98 Merge branch 'MDL-55992-master' of git://github.com/jleyva/moodle 2016-11-08 13:41:22 +08:00
Andrew Nicols
11361f35be MDL-56737 externallib: Fetch token after inserting 2016-11-08 12:45:57 +08:00
David Monllao
dc3852ae1e Merge branch 'MDL-56601-master-3' of git://github.com/cameron1729/moodle 2016-11-08 12:25:31 +08:00
Cameron Ball
c86500a4b7
MDL-56601 core_user: Disable profile picture field if user is not setup 
Sometimes it is possible that a user is presented with the profile
edit form, but is in a state where they are not considered fully
set up (one example is when a site is installed using the CLI script)

In these cases the filepicker gets upset when the user tries
to upload a profile picture.

This patch simply disables that field in these cases and replaces it
with an error message explaining what's wrong.
 2016-11-08 12:13:51 +08:00
David Monllao
1fd6b25579 MDL-56561 bootstrapbase: Remove empty line 2016-11-08 11:39:28 +08:00
David Monllao
23e6d7f36c Merge branch 'MDL-56561-master' of git://github.com/damyon/moodle 2016-11-08 11:38:49 +08:00
David Monllao
d5e22210b6 Merge branch 'MDL-29795-master-fix-backup-restore' of git://github.com/ilya-catalyst/moodle 2016-11-08 11:12:17 +08:00
Damyon Wiese
aad8c7167f MDL-56561 admin: Style admin page listing entire admin tree 
It was an unstyled list of links. This changes it to tabs with sub-headings.
 2016-11-08 11:04:10 +08:00
Andrew Nicols
9c5a55b52a Merge branch 'wip-MDL-56120-master-v2' of git://github.com/abgreeve/moodle 2016-11-08 10:31:12 +08:00
David Monllao
929190533f Merge branch 'MDL-56818-master' of git://github.com/lameze/moodle 2016-11-08 10:27:36 +08:00
Simey Lameze
0b20349f32 MDL-56818 messages: remove duplicated messaging enabled check 2016-11-08 10:26:39 +08:00
Ilya Tregubov
f67f5f0245 MDL-29795 assign: add missing sortorder column for overrides when backing up a course 2016-11-08 13:23:22 +11:00
Andrew Nicols
f4e203209d Merge branch 'MDL-54751_master-fix-cron-user' of git://github.com/dmonllao/moodle 2016-11-08 10:01:04 +08:00
David Monllao
d0cccb4fdb Merge branch 'MDL-53718' of git://github.com/aolley/moodle 2016-11-08 09:59:31 +08:00
David Monllao
44eb1490c4 MDL-54751 course: Set adhoc task user 
We should complete the deletion process using the same
user that started it.

Added a new param to loginas() to prevent the event to be generated as
there is no need to generate an new event for that as the user didn't
explicitly loginas again.
 2016-11-08 09:45:07 +08:00
Eloy Lafuente (stronk7)
42fe364f41 Merge branch 'MDL-56765-master' of git://github.com/jleyva/moodle 2016-11-08 01:27:39 +01:00
Eloy Lafuente (stronk7)
a584a403cd Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle 2016-11-07 16:19:06 +01:00
Dan Poltawski
77b0bafa6d Merge branch 'MDL-56696-master' of git://github.com/lameze/moodle 2016-11-07 11:33:55 +00:00
Juan Leyva
0c6c86643e MDL-56607 settings: Move mobile settings to top-level 
AMOS BEGIN
 MOV [mobilecssurl,core_admin],[mobilecssurl,tool_mobile]
 MOV [configmobilecssurl,core_admin],[configmobilecssurl,tool_mobile]
AMOS END

From Plugins / Web Services / Mobile to Appearance / Mobile
 2016-11-07 09:53:29 +00:00
Dan Poltawski
13ab169cb7 Merge branch 'wip-MDL-56788-master' of git://github.com/abgreeve/moodle 2016-11-07 09:01:24 +00:00
Adrian Greeve
cbbca0d00f MDL-56120 Calendar: Unit tests for getting events. 
Added a unit test for checking that calendar_get_events
will only return events for activated activities.
 2016-11-07 16:48:16 +08:00
Adrian Greeve
7a33494d71 MDL-56120 calendar: Fix disabled modules showing events. 
calendar_get_events now checks for disabled activities
and only shows events for active modules.
 2016-11-07 16:47:14 +08:00
Dan Poltawski
912d854dc8 Merge branch 'MDL-56684-master-fix1' of http://github.com/damyon/moodle 2016-11-07 08:19:16 +00:00
Damyon Wiese
c81a34774e MDL-56684 boost: Fix for competency behat tests with boost theme 2016-11-07 16:02:44 +08:00