Commit graph

76479 commits

Author SHA1 Message Date
David Monllao
8573e526ff MDL-51698 user: Adapting behat test
Using the generic .breadcrumb-nav like in edit_tag.feature as the elements
on it are quite generic and there is no much chance of future conflicts.
2015-12-09 13:22:38 +08:00
Eloy Lafuente (stronk7)
7955476cab Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle 2015-12-09 01:09:08 +01:00
Eloy Lafuente (stronk7)
b5c73e6f42 MDL-51698 upgrade: bump version to newer than rewritten one
Some integration.git based sites can have 2015120801 version,
now rewritten. This commit ensures everybody goes forward to
2015120803.
2015-12-09 00:51:40 +01:00
Brendan Heywood
d7238be174 MDL-51698 navigationlib: Add crumb trail meta data 2015-12-09 00:50:16 +01:00
Adam Olley
6c9b6685de MDL-52334 enrol_database: Add missing filter to user_enrolment lookup
Without the user filter, the left join to the user enrolment table
results in a much larger set of data being returned than before
MDL-28420. Which makes login time for users in many busy courses much
worse than before (3x worse on average, observed upto 40x).
2015-12-09 09:25:09 +10:30
Dan Poltawski
c3c5e30930 Merge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle 2015-12-08 10:34:44 +00:00
Dan Poltawski
c8d8a09369 Merge branch 'MDL-51411' of https://github.com/andrewhancox/moodle 2015-12-08 09:05:45 +00:00
Dan Poltawski
c7bba4e5af Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle 2015-12-08 08:51:34 +00:00
Adrian Greeve
f0899a2560 MDL-51239 blog: Coding style fixes. 2015-12-08 13:28:17 +08:00
Marina Glancy
10eb44f7e6 MDL-52438 core: allow Moodle 3.0 to be used with PHP7 2015-12-08 12:54:32 +08:00
Marina Glancy
19ad1ce44c MDL-52361 core: patch Horde library for PHP7 compatibility 2015-12-08 12:47:15 +08:00
Marina Glancy
ace059fd4c MDL-52336 core: patch PHPExcel for PHP7 compatibility 2015-12-08 12:13:48 +08:00
Marina Glancy
73bb7c0990 MDL-52286 core: update ADODB library to 5.21 2015-12-08 11:52:40 +08:00
David Monllao
3f2c229b53 Merge branch 'MDL-50550-master' of git://github.com/dpalou/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-12-08 11:32:39 +08:00
Dan Poltawski
bbd3156049 Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle 2015-12-07 15:36:55 +00:00
Dan Poltawski
de6e67940f Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle 2015-12-07 15:04:40 +00:00
Juan Leyva
a6c11677a8 MDL-52429 mod_scorm: Fix SCORM completion checking in nested SCOs 2015-12-07 11:28:22 +01:00
Mark Nelson
c319e44954 MDL-52312 assignfeedback_editpdf: changes to files after FPDI update
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
3) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
2015-12-07 17:39:30 +08:00
Dan Poltawski
6c0bf99b5b Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle 2015-12-07 09:04:35 +00:00
David Monllao
0575c5ad8c Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle 2015-12-07 16:30:38 +08:00
Dan Poltawski
f20abd8759 Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle 2015-12-07 08:20:10 +00:00
Dan Poltawski
8f4662a807 MDL-52271 install: don't allow installer to be indexed
Following guidance from:
https://support.google.com/webmasters/answer/93710?hl=en
2015-12-07 15:42:11 +08:00
David Monllao
7e092a97d7 Merge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle 2015-12-07 15:01:42 +08:00
David Monllao
2ceaa5752f Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle 2015-12-07 14:41:20 +08:00
Frederic Massart
bf5bbe0127 MDL-50540 mod_glossary: Final clean up of new external function 2015-12-07 13:42:37 +08:00
Costantino Cito
8e09010f39 MDL-50540 glossary: Unit test for mod_glossary_get_glossaries_by_courses 2015-12-07 12:48:28 +08:00
Costantino Cito
23da998fad MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses 2015-12-07 12:48:27 +08:00
Mark Nelson
f970013b16 MDL-52312 assignfeedback_editpdf: updated the FPDI libary to 1.6.1 2015-12-07 10:57:51 +08:00
Russell Smith
b73aed311e MDL-52402 backup, quiz: Fix attempt token and add missing rule. 2015-12-05 10:08:07 +11:00
Russell Smith
eb8c0cb163 MDL-52402 backup: Improve debugging output on failed log restores 2015-12-05 10:08:06 +11:00
Dan Poltawski
4ee10fec43 MDL-51582 readme: update less building instructions
I forgot to update this after the changes in 65d070a
2015-12-04 16:40:21 +00:00
Eloy Lafuente (stronk7)
0bec64c913 Merge branch 'MDL-51582-master' of git://github.com/danpoltawski/moodle 2015-12-04 17:15:13 +01:00
AMOS bot
a43fdc463b Automatically generated installer lang files 2015-12-05 00:04:20 +08:00
Dan Poltawski
f8de8c7147 MDL-52250 npm: shrinkwrap to lock down dependencies
We've tried various approaches to lock down our dependencies and they
have been flawed because dependencies in our included packages may not
be locked down and previous attempts to do that have not been correct.

With npm shrinkwrap we lock down versions so that any npm install will
always install the exact same versions for all developers - see:
https://docs.npmjs.com/cli/shrinkwrap

(This is a lot like composer.lock for those more fluent with composer)
2015-12-04 15:10:59 +00:00
Dan Poltawski
302a3c5f7d 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.
2015-12-04 15:07:47 +00:00
Juan Leyva
04cd8ae3c0 MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion 2015-12-04 15:30:16 +01:00
Jun Pataleta
0af5593122 MDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc 2015-12-04 07:56:31 -06:00
Dani Palou
4a5acec2b7 MDL-50550 wiki: Added unit tests for mod_wiki_get_wikis_by_courses 2015-12-04 13:52:41 +01:00
Dani Palou
23cbaefb24 MDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses 2015-12-04 13:52:41 +01:00
Dan Poltawski
e90eb13a6b 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
2015-12-04 11:43:30 +00:00
Dan Poltawski
f992dcf6e8 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.
2015-12-04 11:43:10 +00:00
Dan Poltawski
65d070aec8 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)
2015-12-04 10:37:09 +00:00
Dan Poltawski
868e35a058 MDL-51582 css: built with new grunt task 2015-12-04 10:37:09 +00:00
Dan Poltawski
a4a52e565e 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).
2015-12-04 10:36:45 +00:00
Michael Aherne
27635149d5 MDL-52304 media: Allow full screen in Flash player 2015-12-04 10:06:14 +08:00
David Monllao
a75f1dbc4f MDL-50258 themes: Fix CSS source maps 2015-12-04 09:02:16 +08:00
Andrew Davis
0e32a56591 MDL-51239 core_blog: coding style fixes 2015-12-04 05:42:40 +08:00
Eloy Lafuente (stronk7)
ea5c18dfce weekly release 3.1dev 2015-12-03 19:40:42 +01:00
Eloy Lafuente (stronk7)
75cb235699 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-03 19:40:33 +01:00
Eloy Lafuente (stronk7)
8827b67aeb MDL-52141 backup: test restore_log_rule don't modify passed log anymore 2015-12-03 18:52:26 +01:00