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,608 Commits 36 Branches 523 Tags
Commit Graph

81608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
96eba6b982 Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle 2016-11-10 11:06:11 +08:00
Andrew Nicols
b8af6c1ef0 Merge branch 'MDL-56585-master' of git://github.com/danpoltawski/moodle 2016-11-10 09:53:28 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Andrew Nicols
a6f85967e0 Merge branch 'MDL-56754-master' of git://github.com/jleyva/moodle 2016-11-10 08:29:04 +08:00
Dan Poltawski
2c212753fe MDL-56585 tool_lpimportcsv: adjust help popups 2016-11-09 16:11:41 +00:00
Dan Poltawski
224789b79c Merge branch 'MDL-56863-master' of git://github.com/jleyva/moodle 2016-11-09 14:38:26 +00:00
Juan Leyva
678555b499 MDL-56863 tool_mobile: Capture moodle_exception in get_autologin_key 2016-11-09 13:20:49 +00:00
Dan Poltawski
793fe29014 Merge branch 'MDL-48498-master-iv6-undefinedfix' of https://github.com/snake/moodle 2016-11-09 12:16:03 +00:00
Juan Leyva
82f5802a94 MDL-56754 course: Stealth sections should be handled 
Right now this WS is returning all the sections without advising if is
a stealth section or not, this have some implications (in the mobile
app right now the stealth sections are displayed)
 2016-11-09 09:38:46 +00:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00
Andrew Nicols
4cc6477198 Merge branch 'MDL-56790-master' of git://github.com/damyon/moodle 2016-11-09 15:40:16 +08:00
Damyon Wiese
b8396c335a MDL-56662 boost: Don't mess with display, set min-height 
Changing the display was messing with the layout of some things in the
file picker. Lets set the min-height instead which has less
side-effects.
 2016-11-09 15:14:24 +08:00
Andrew Nicols
55a3911408 Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle 2016-11-09 14:37:47 +08:00
David Monllao
4e2ae9caee Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle 2016-11-09 14:35:41 +08:00
David Monllao
33788800ec Merge branch 'MDL-56133' of https://github.com/NeillM/moodle 2016-11-09 14:23:50 +08:00
David Monllao
3f066469af Merge branch 'wip-mdl-56630-fix2' of git://github.com/rajeshtaneja/moodle 2016-11-09 14:14:51 +08:00
Andrew Nicols
f2dab83445 MDL-56596 tool_usertours: Update to tours v0.9.9 2016-11-09 14:10:31 +08:00
David Monllao
38b74ef717 Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle 2016-11-09 13:58:01 +08:00
Rajesh Taneja
d514d25e0a
MDL-56630 behat: Click on link in specificed block/region 2016-11-09 13:56:49 +08:00
Damyon Wiese
f87084f8f1 MDL-56662 theme_boost: Filepickers have 0 height 
We need to set a display value on the file picker body so the inline height is ignored.
 2016-11-09 13:55:45 +08:00
Rajesh Taneja
26ca972e9e
MDL-56840 behat: Wait till pdf conversion progress is finished 2016-11-09 13:39:00 +08:00
David Monllao
6e986b2919 Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle 2016-11-09 13:07:26 +08:00
David Monllao
0c499e0a5c Merge branch 'MDL-53481-master-uniqsqlparam' of git://github.com/mudrd8mz/moodle 2016-11-09 12:49:17 +08:00
David Monllao
7ecf7511f8 Merge branch 'MDL-56694-master' of git://github.com/lameze/moodle 2016-11-09 12:24:17 +08:00
Andrew Nicols
16f9660cfe Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle 2016-11-09 11:59:02 +08:00
Jake Dallimore
c02778ac30 MDL-48498 admin: fix get_setting return for mixedhostiplist setting 2016-11-09 11:32:58 +08:00
Damyon Wiese
50302c404a MDL-56790 boost: Styling fixes for mod_feedback 
Also fixed are problems with frozen select from elements showing raw
HTML. I checked the other form templates for similar problems and fixed
them all.
 2016-11-09 11:29:58 +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
David Mudrák
93f4f3494a MDL-53481 availability: Fix uniqueness of SQL named param placeholders 
Static variables do not behave the way you might expect when accessing
them through the classes inheritance. When accessing a method via self::
or static:: operators, even though the method is inherited, its variable
scope is not. So the method unique_sql_parameter() was using the scope
of the child class and each child class had its own sequence of usp1,
usp2, usp3, ... placeholders. This led to "Incorrect number of query
parameters" error when multiuple condition classes were contributing to
a single SQL query.

All credit should go to Adam Olley who debugged and described the
essence of the problem in the tracker.
 2016-11-08 13:36:07 +01:00
Neill Magill
6a6f2e1ca6 MDL-56133 tool_langimport: Changes should be visible after import 
Before this change if a language pack was updated by the
\tool_langimport\task\update_langpacks_task scheduled task, changes
would not be available to users until an admin manually cleared the
strings cache.

This change causes the cache to purged when a language pack it update,
this will cause it to rebuild so users will start seeing updates
automatically.
 2016-11-08 10:56:56 +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
Michael Aherne
db8514bcff MDL-56755 assign: Improve documentation of assign::get_grade_item() 2016-11-08 08:58:31 +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
Simey Lameze
d138d6e2ac MDL-56694 theme_boost: center login button in filepicker 2016-11-08 15:01:03 +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