mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
79,306 Commits 36 Branches 519 Tags
Commit Graph

6162 Commits

Author SHA1 Message Date
Dan Poltawski
c3a95c2840 MDL-53222 admin: rejig listing of search areas 2016-07-11 11:38:41 +02:00
Eloy Lafuente (stronk7)
006e2b787a Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle 2016-07-06 00:03:39 +02:00
Andrew Nicols
69efe54640 Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle 2016-07-05 15:07:21 +08:00
Jake Dallimore
ea106d2a1d MDL-53431 tool_monitor: Access control for tool monitor subscriptions 2016-07-05 10:36:27 +08:00
Andrew Nicols
642a1d5480 Merge branch 'MDL-53019' of git://github.com/stronk7/moodle 2016-07-05 08:15:02 +08:00
Eloy Lafuente (stronk7)
ae96cf6246 MDL-53019 php: bump all harcoded versions to new 5.6.5 requirement 
Moodle 3.2 and up will require PHP >= 5.6.5. Hopefully some day we'll
have this centralized with MDL-39007, just it's not done yet.

Thanks to Stephen Bourget for raising this!
 2016-07-05 01:50:43 +02:00
Dan Poltawski
6e57e78652 Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle 2016-07-04 13:28:48 +01:00
Dan Poltawski
0cf471fbdd Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle 2016-07-04 12:45:55 +01:00
Mark Johnson
4d9036d6eb MDL-55041 roles: Fix JSON parsing in permission manager 2016-07-01 14:54:01 +01:00
Eloy Lafuente (stronk7)
59f22d4b19 MDL-53019 environment: 3.2 requirements added 
Changes:
 - PHP 5.6.5 required
 2016-07-01 13:44:36 +02:00
Marina Glancy
799e001c15 MDL-55032 tool_lp: check access when showing link to competencies 
Also if course competencies page is accessed without capabilities do
redirect before starting output.
 2016-07-01 13:42:27 +08:00
Andrew Nicols
e683c0837c Merge branch 'MDL-54964-master' of git://github.com/jleyva/moodle 2016-06-29 15:05:15 +08:00
Andrew Nicols
f9cabe8f99 Merge branch 'wip-mdl-54974' of https://github.com/rajeshtaneja/moodle 2016-06-29 15:05:13 +08:00
Eloy Lafuente (stronk7)
d4ca1215bb Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle 2016-06-27 20:38:18 +02:00
Juan Leyva
64d2ac2145 MDL-54964 tool_mobile: Fix tests to make it work with non-core plugins 2016-06-27 09:45:23 +01:00
Rajesh Taneja
e5f2478b9f MDL-54974 behat: Handle interupts on PHP7 
As https://bugs.php.net/bug.php?id=71448 is
not going to get fixed, we need to declare tick
 2016-06-27 14:30:58 +08:00
Andrew Nicols
04b189a875 Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle 2016-06-27 12:53:35 +08:00
Eloy Lafuente (stronk7)
e822312af3 Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle 2016-06-21 20:00:36 +02:00
Andrew Nicols
ad6b958997 Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle 2016-06-21 11:26:42 +08:00
Andrew Nicols
8a46580603 Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle 2016-06-21 10:30:22 +08:00
Jun Pataleta
a2d5c332a2 MDL-54924 tool_lp: Make the url property optional 2016-06-20 14:57:10 +08:00
Dan Poltawski
7f70d548fe MDL-54939 amd: build modified files 2016-06-17 09:03:18 +01:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues 
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
 2016-06-17 09:03:18 +01:00
Dan Poltawski
64527edca2 MDL-54652 tool_lp: remove invalid css on comeptency menu bar 2016-06-16 20:49:04 +01:00
Dan Poltawski
c74b305dfa MDL-54652 tool_health: make css more specific to avoid '!important' 
This admin tool is unsupported anyway..
 2016-06-16 20:49:04 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Juan Leyva
0002056f7a MDL-54857 tool_mobile: New WS get_site_public_settings 2016-06-16 11:26:35 +01:00
Andrew Nicols
a029e5212d Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle 2016-06-16 09:04:15 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Andrew Nicols
bb15b62ce8 Merge branch 'MDL-52127-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:05 +01:00
Andrew Nicols
860f76e11e Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle 2016-06-16 09:04:04 +01:00
Dan Poltawski
d13f2a6934 Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle 2016-06-16 09:04:03 +01:00
Nicholas Hoobin
1512f61710 MDL-53788 multilangupgrade: fix aggressive course cache rebuilding 2016-06-15 10:49:28 +10:00
Joby Harding
def383943b MDL-51505 tool_templatelibrary: Prevent jumping when selecting template 2016-06-13 09:30:37 +01:00
Andrew Nicols
377b29d826 Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle 2016-06-13 09:17:53 +08:00
Dan Poltawski
3adb62b727 MDL-52127 js: check amd files with eslint grunt task 
I have spent quite a lot of time working through the current list of
eslint options and configuring them for Moodle style and I think this is
a very good basis to start us at (as well as taking some of out jshint
options out with https://www.npmjs.com/package/polyjuice ). Thanks to
Andrew Nicols, Mark Johnson and Frédéric Massart for some refinements.

With this configuration the grunt build will fail if errors are present
in the js (though you can of course tell jshint to ignore some errors,
as I have done in admin/tool/lp/amd/src/competency_rule_points.js and
defining the Y global in lib/amd/src/yui.js ).

The grunt task will not report warnings by default, but a new
--show-lint-warnings flag will help achieve that. Editor
integrations/stanadalone eslint tool will surely be a better way of
getting eslint errors rather than using the grunt task.
 2016-06-11 10:14:35 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
Russell Smith
0b768e744f MDL-53495 database xmldb: Use real length restriction. 2016-06-08 11:06:16 +10:00
David Monllao
694d8c4a9e Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle 2016-05-31 12:31:36 +08:00
Barbara Ramiro
000d660fda MDL-51683 design: New icon for competencies 2016-05-31 10:48:18 +08:00
David Monllao
4f24176f17 Merge branch 'MDL-54010-master' of git://github.com/cameron1729/moodle 2016-05-30 16:04:04 +08:00
Mark Nelson
e0d60498d8 MDL-54763 tool_lp: fixed typo in HTML tag 2016-05-30 13:31:31 +08:00
Frederic Massart
6e91817178 MDL-54721 report_competency: Do not ignore the first user selection 2016-05-26 17:54:52 +08:00
Cameron Ball
bb30944f49 MDL-54010 roles: Specify encoding for escaped export data 2016-05-26 10:31:28 +08:00
Nigel Cunningham
d50a9a9d30 MDL-54010 roles: Fix missing HTMLspecialchars in role export code. 
Role name and description fields are currently not escaped when
exporting a role. This results in an unusable file when characters
such as ampersands are used in a name or description. Fix this by
using htmlspecialchars on both fields.

Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net>
 2016-05-26 10:31:28 +08:00
Frederic Massart
7c9968bd9f MDL-24064 admin: Remove unused code to bulk enrol users 2016-05-24 18:48:06 +08:00
David Monllao
21eef94436 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle 2016-05-23 14:52:54 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Ryan Wyllie
3fdc542fe4 MDL-54642 tool_lp: Fix learning plan button layout in FF 
The learning plan buttons are floating left but the table below it wasn't
clearning floating elements so it was appearing on the same line.
 2016-05-20 02:35:11 +00:00
Eloy Lafuente (stronk7)
536c4e920a Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle 2016-05-19 13:50:47 +02:00