Dan Poltawski [Wed, 2 Dec 2015 14:18:43 +0000 (14:18 +0000)]
MDL-52250 npm: remove uglify-js dependency/bump grunt-contrib-uglify
A) Remove direct dependency on uglify-js:
This dependency was added in MDL-50277, but it isn't quite correct, the
way npm installs dependencies means that grunt-contrib-uglify *could* use
'our' version if its satisifed. But does not *always* and especially does
not if the grunt-contrib-uglify requirement is higher than ours.
Long story short, in many cases this means that this is used:
node_modules/grunt-contrib-uglify/node_modules/uglify-js
But this is not:
node_modules/uglify-js
In MDL-50277 we thought we were making the version sticky, but in
reality we were just fixing previous problems by updating
grunt-contrib-uglify to a version which fixed a bug:
https://github.com/gruntjs/grunt-contrib-uglify/issues/313
It seems the better solution will come with using npm shrinkwrap to lock
down depdencies.
B) Bump grunt-contrib-uglify to 0.11.0
This moves us to uglify-js ~2.6.0 - which doens't change any output
files.
Dan Poltawski [Fri, 27 Nov 2015 15:21:42 +0000 (15:21 +0000)]
MDL-52204 grunt: update to grunt-contrib-jshint v0.11.3
This version of grunt-contrib-jshint itself uses a better fixed
requirement on "~2.8.0" rather than "^2.8.0" which was giving variable
results with some people updating to 2.9-rc1.
See also https://github.com/gruntjs/grunt-contrib-jshint/pull/219
Dan Poltawski [Fri, 27 Nov 2015 15:13:56 +0000 (15:13 +0000)]
MDL-52204 js: fix 'used before defined' errors
Newer versions of jshint detect this coding error, we fix it
by simply reordering the definition of methods.
Dan Poltawski [Tue, 24 Nov 2015 18:13:02 +0000 (18:13 +0000)]
MDL-51582 grunt: task improvements
* Introduce the 'css' task - this will give us flexibility to do things
in future rather than relying on the inbuilt 'less' task (e.g. sourcemap
generating task which doesn't run by default)
* Introduce 'amd' task which runs only amd tasks
* Introduce 'js' task which runs all JS (amd/shifter) tasks
* Tweak the ordering so that slow shifter always runs last (useful for
people like me who forget to specif the task)
Dan Poltawski [Fri, 20 Nov 2015 10:38:48 +0000 (10:38 +0000)]
MDL-51582 css: built with new grunt task
Dan Poltawski [Fri, 20 Nov 2015 10:35:11 +0000 (10:35 +0000)]
MDL-51582 grunt: add less complilation support
Previously we were using recess to build bootstrap base as it was what
was used by the original project. But recess is no longer maintained.
Now we use grunt for building js, it makes sense to use it for less too.
(If you really don't want to use grunt, you almost certainly can just
use lessc -x as it uses the same less.js on backend).
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 18:40:42 +0000 (19:40 +0100)]
weekly release 3.1dev
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 18:40:33 +0000 (19:40 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 16:11:35 +0000 (17:11 +0100)]
MDL-52141 backup: test restore_log_rule don't modify passed log anymore
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 10:35:13 +0000 (11:35 +0100)]
NOBUG: Fixup commit to fix stuff wrongly changed on merge commits
On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.
In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
David Monllao [Thu, 3 Dec 2015 04:51:48 +0000 (12:51 +0800)]
Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 2 Dec 2015 10:31:10 +0000 (10:31 +0000)]
Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 2 Dec 2015 09:36:29 +0000 (09:36 +0000)]
Merge branch 'MDL-48451-behat-tests' of github.com:ryanwyllie/moodle
Ryan Wyllie [Wed, 2 Dec 2015 05:36:15 +0000 (05:36 +0000)]
MDL-48451 report_outline: additional behat coverage
David Monllao [Wed, 2 Dec 2015 07:54:25 +0000 (15:54 +0800)]
Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle
Conflicts:
lib/upgrade.txt
Andrew Nicols [Wed, 2 Dec 2015 03:48:05 +0000 (11:48 +0800)]
Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 2 Dec 2015 03:40:46 +0000 (11:40 +0800)]
Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle
David Monllao [Wed, 2 Dec 2015 03:13:25 +0000 (11:13 +0800)]
Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle
AMOS bot [Thu, 3 Dec 2015 16:04:11 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 2 Dec 2015 02:08:18 +0000 (03:08 +0100)]
Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle
David Monllao [Wed, 2 Dec 2015 02:01:44 +0000 (10:01 +0800)]
Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Wed, 2 Dec 2015 01:35:53 +0000 (02:35 +0100)]
Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 1 Dec 2015 20:25:05 +0000 (20:25 +0000)]
MDL-51664 externalib: clarify crucial comment
Dan Poltawski [Tue, 1 Dec 2015 20:14:59 +0000 (20:14 +0000)]
Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 1 Dec 2015 19:02:28 +0000 (19:02 +0000)]
MDL-52292 testing: block generator fix
Stop errors when no $options supplied
Dan Poltawski [Tue, 1 Dec 2015 16:56:51 +0000 (16:56 +0000)]
MDL-48451 report_outline: add basic coverage of distinct users
Dan Poltawski [Tue, 1 Dec 2015 16:24:00 +0000 (16:24 +0000)]
Merge branch 'MDL-48451' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 1 Dec 2015 16:09:04 +0000 (16:09 +0000)]
Merge branch 'MDL-52292' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 1 Dec 2015 14:05:13 +0000 (14:05 +0000)]
MDL-26935 behat: add coverage for role renaming in course
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 10:13:07 +0000 (11:13 +0100)]
Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle
Russell Smith [Mon, 16 Nov 2015 01:50:55 +0000 (12:50 +1100)]
MDL-52141 backup: Ensure we don't alter the log record when parsing it.
Dan Poltawski [Tue, 1 Dec 2015 11:41:39 +0000 (11:41 +0000)]
Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Tue, 1 Dec 2015 11:13:48 +0000 (11:13 +0000)]
Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle
Oleg Sychev [Tue, 20 Oct 2015 19:31:10 +0000 (22:31 +0300)]
MDL-51746 accesslib: Describe instanceid in context_something::instance
With no PHPDocs and $instanceid as name some module developers confuse
context_module::instance argument to be instanceid of the module while
it actually should be cmid.
David Monllao [Tue, 1 Dec 2015 10:29:27 +0000 (18:29 +0800)]
Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
Dan Poltawski [Tue, 1 Dec 2015 09:50:59 +0000 (09:50 +0000)]
Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 1 Dec 2015 09:47:36 +0000 (09:47 +0000)]
Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 1 Dec 2015 09:16:31 +0000 (17:16 +0800)]
Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
Frederic Massart [Thu, 8 Oct 2015 09:51:05 +0000 (17:51 +0800)]
MDL-51700 ajax: Clean the external function return values
Tim Hunt [Tue, 24 Nov 2015 15:58:54 +0000 (15:58 +0000)]
MDL-52292 block testing generators: improve the API
* Refactor the block generator base class, to remove the amount
of duplication required in base classes.
* Change the defaults that are filled in to be a little more natural.
* Make the Behat step 'Given the following "block" exist:' work.
Rajesh Taneja [Tue, 1 Dec 2015 07:45:05 +0000 (15:45 +0800)]
MDL-52357 behat: add 2 sec delay to ensure window is stable
Ankit Agarwal [Thu, 28 May 2015 07:30:29 +0000 (13:00 +0530)]
MDL-50269 deprecations: Properly deprecate notify()
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 23:50:10 +0000 (00:50 +0100)]
Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 22:52:45 +0000 (23:52 +0100)]
Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:42:58 +0000 (15:42 +0000)]
Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:29:29 +0000 (15:29 +0000)]
Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:25:22 +0000 (15:25 +0000)]
Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:50:22 +0000 (13:50 +0000)]
Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:37:47 +0000 (13:37 +0000)]
Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)]
Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Mon, 30 Nov 2015 12:23:09 +0000 (12:23 +0000)]
Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)]
Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)]
Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 30 Nov 2015 07:52:46 +0000 (15:52 +0800)]
Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle
Conflicts:
lang/en/deprecated.txt
lang/en/grades.php
David Monllao [Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)]
Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 27 Nov 2015 00:49:04 +0000 (08:49 +0800)]
MDL-52332 calendar: load settings using API
Rajesh Taneja [Tue, 24 Nov 2015 08:24:24 +0000 (16:24 +0800)]
MDL-52279 core_lib: Remove php4 style constructor
filterobject is called from core and as it's
using php4 style constructor, global USER is
not set properly because of deprecation warning
Jun Pataleta [Wed, 18 Nov 2015 03:52:07 +0000 (21:52 -0600)]
MDL-37308 files: Additional fixes for transparency
Fixed transparency support when resizing and when not resizing.
Jetha Chan [Tue, 9 Jun 2015 09:12:31 +0000 (17:12 +0800)]
MDL-37308 files: support transparency when not resizing; new unit test
Adrian Greeve [Tue, 9 Jun 2015 06:06:42 +0000 (14:06 +0800)]
MDL-37308 files: convert_image() now supports transparency.
Marina Glancy [Mon, 30 Nov 2015 01:15:40 +0000 (09:15 +0800)]
MDL-50710 block_glossary_random: more precise sorting
David Monllao [Wed, 11 Nov 2015 07:34:19 +0000 (15:34 +0800)]
MDL-50661 theme_more: New small logo setting
Adding required bits so theme_more can also set a small logo.
David Monllao [Wed, 11 Nov 2015 07:24:18 +0000 (15:24 +0800)]
MDL-50661 theme_clean: New small logo setting
Introduces new settings to set a small logo in the navbar next
to the site name on pages where the logo is not displayed.
jinhofer [Tue, 27 Oct 2015 15:05:20 +0000 (10:05 -0500)]
MDL-51900 grade/report/singleview: Added ctrl+arrow navigation
Also, added functionality for tab to traverse down the columns and
shift+tab to traverse up the columns.
jinhofer [Thu, 8 Oct 2015 13:12:03 +0000 (08:12 -0500)]
MDL-51706 mod/assign: Moved plagiarism links to top of online text
jinhofer [Wed, 7 Oct 2015 18:14:52 +0000 (13:14 -0500)]
MDL-51693 mod/assign: Added plagiarism links to full text
AMOS bot [Fri, 27 Nov 2015 16:04:27 +0000 (00:04 +0800)]
Automatically generated installer lang files
John Okely [Tue, 24 Nov 2015 04:25:21 +0000 (12:25 +0800)]
MDL-52260 user: Fix error when saving profile with locked field
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52283 core: password_hash() deprecation in PHP7
Dan Poltawski [Thu, 26 Nov 2015 17:01:37 +0000 (17:01 +0000)]
MDL-45364 ddimageortext: refine naming & docs of new methods
Andrew Nicols [Tue, 24 Nov 2015 12:14:32 +0000 (20:14 +0800)]
MDL-45364 qtype_ddimageortext: Fix JS Lint issues
Andrew Nicols [Tue, 24 Nov 2015 12:14:12 +0000 (20:14 +0800)]
MDL-45364 atto_rtl: Fix JS lint
Dan Poltawski [Thu, 26 Nov 2015 15:04:10 +0000 (15:04 +0000)]
MDL-48004 question: remove buggy arg of question_edit_setup
There are no uses of this in core and it does not make sense
Dan Poltawski [Thu, 26 Nov 2015 14:53:15 +0000 (14:53 +0000)]
MDL-48004 question: prevent notices on import screen
If query params were not passed the page would previously display debug
notices as setting the $requirecourseid param to question_edit_setup()
was buggy.
Michael Aherne [Mon, 2 Nov 2015 12:04:01 +0000 (12:04 +0000)]
MDL-52013 assign: Allow subplugins to add calendar events
Dan Poltawski [Fri, 30 Oct 2015 15:15:07 +0000 (15:15 +0000)]
MDL-35982 behat: delete blog entry coverage
Dan Poltawski [Fri, 30 Oct 2015 14:37:24 +0000 (14:37 +0000)]
MDL-35982 blog: improve the delete entry confirmation string
So that there is more context about what is being deleted.
Dan Poltawski [Fri, 30 Oct 2015 14:22:39 +0000 (14:22 +0000)]
MDL-35982 blog: reorder blog delete confirmation
Improves accessibility to be ordered logically in page
Dan Poltawski [Fri, 30 Oct 2015 14:14:24 +0000 (14:14 +0000)]
MDL-35982 blog: prevent index throwing errors with 0 courseid
Regression from MDL-49845 where Dave made the page not handle courseid = 0
and so now some urls will send you back to a db error..
Dan Poltawski [Fri, 30 Oct 2015 16:26:37 +0000 (16:26 +0000)]
MDL-46350 blog: call parent validation
(Helps satify codechecker, thats all..)
Dan Poltawski [Tue, 24 Nov 2015 14:41:22 +0000 (14:41 +0000)]
MDL-52219 phpunit: updated for new defaults
The externallib assertion was previously never being run and had a typo..
Dan Poltawski [Mon, 23 Nov 2015 11:11:27 +0000 (11:11 +0000)]
MDL-52219 behat: remove steps which turn on avaibility/completion
Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on
Dan Poltawski [Fri, 20 Nov 2015 18:41:44 +0000 (18:41 +0000)]
MDL-52219 admin: Enable completion and restricted access by default
David Monllao [Thu, 26 Nov 2015 03:02:40 +0000 (11:02 +0800)]
weekly on-sync release 3.1dev
David Monllao [Thu, 26 Nov 2015 03:02:38 +0000 (11:02 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
AMOS bot [Wed, 25 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Wed, 25 Nov 2015 11:22:17 +0000 (11:22 +0000)]
Merge branch 'MDL-52291' of git://github.com/stronk7/moodle
Frederic Massart [Wed, 25 Nov 2015 05:03:25 +0000 (13:03 +0800)]
MDL-52160 navigation: Mark category and module settings nodes as branch
Tony Levi [Wed, 14 Oct 2015 06:23:30 +0000 (14:23 +0800)]
MDL-51757 mod_scorm: Remove duplicate function param
convert invalid break calls to exceptions for PHP 7
Eloy Lafuente (stronk7) [Tue, 24 Nov 2015 23:19:30 +0000 (00:19 +0100)]
MDL-52291 questions: fix upgrade from 2.5 and earlier
Because of some changes performed to the multichoice qtype
for Moodle 2.6, older sites are not able to upgrade properly.
This commits does introduce DB introspection to decide which
table and column names must be used. Nasty but enough.
Note MDL-52298 has been created about to avoid/minimize the
chances of this happening again.
AMOS bot [Tue, 24 Nov 2015 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files
David Monllao [Tue, 24 Nov 2015 09:03:06 +0000 (17:03 +0800)]
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle
David Monllao [Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)]
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
Neill Magill [Wed, 11 Nov 2015 13:06:31 +0000 (13:06 +0000)]
MDL-44330 Assign: Assignment grading may not display expected student
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:
1) The user had the table ordered by a value that could be modified,
for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
between the user generating the table and clicking on a grade link.
If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.
This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
Rajesh Taneja [Tue, 24 Nov 2015 03:16:44 +0000 (11:16 +0800)]
MDL-50163 behat: wait to ensure elements are placed properly by js.
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)]
Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)]
Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
Jean-Philippe Gaudreau [Thu, 19 Nov 2015 20:54:04 +0000 (15:54 -0500)]
MDL-52237 navigationlib: Plugins can extend navigation user profile
AMOS bot [Mon, 23 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)]
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle