mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 05:54:19 +02:00
Code Issues Projects Releases Wiki Activity
76,239 Commits 37 Branches 536 Tags
Commit Graph

76239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Eloy Lafuente (stronk7)
ef53650e8a 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.
 2015-12-03 18:52:25 +01:00
David Monllao
f2304bfb81 Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle 2015-12-03 18:52:24 +01:00
Dan Poltawski
53907dbee5 Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle 2015-12-03 18:52:21 +01:00
Dan Poltawski
ed0c32da08 Merge branch 'MDL-48451-behat-tests' of github.com:ryanwyllie/moodle 2015-12-03 18:51:47 +01:00
Ryan Wyllie
360c7917f6 MDL-48451 report_outline: additional behat coverage 2015-12-03 18:51:46 +01:00
David Monllao
200ab5266a Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/upgrade.txt
 2015-12-03 18:51:42 +01:00
Andrew Nicols
6e8e992d37 Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle 2015-12-03 18:50:03 +01:00
David Monllao
76bcec2cb1 Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle 2015-12-03 18:50:02 +01:00
David Monllao
935b954b5b Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle 2015-12-03 18:50:01 +01:00
AMOS bot
8e3c608698 Automatically generated installer lang files 2015-12-04 00:04:11 +08:00
Eloy Lafuente (stronk7)
b4153ff09d Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle 2015-12-03 11:16:34 +01:00
David Monllao
38e0faafc2 Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle 2015-12-03 11:16:33 +01:00
Eloy Lafuente (stronk7)
40cd9f9ac9 Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle 2015-12-03 11:16:33 +01:00
Dan Poltawski
b80ede13a6 MDL-51664 externalib: clarify crucial comment 2015-12-03 11:16:32 +01:00
Dan Poltawski
50901a53bc Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle 2015-12-03 11:16:30 +01:00
Dan Poltawski
551088fcd7 MDL-52292 testing: block generator fix 
Stop errors when no $options supplied
 2015-12-03 11:13:28 +01:00
Dan Poltawski
16c361d9d1 MDL-48451 report_outline: add basic coverage of distinct users 2015-12-03 11:13:27 +01:00
Dan Poltawski
b56a046175 Merge branch 'MDL-48451' of https://github.com/andrewhancox/moodle 2015-12-03 11:13:26 +01:00
Dan Poltawski
0ad66dda0e Merge branch 'MDL-52292' of git://github.com/timhunt/moodle 2015-12-03 11:13:26 +01:00
Dan Poltawski
fc3c595d51 MDL-26935 behat: add coverage for role renaming in course 2015-12-03 11:13:25 +01:00
Eloy Lafuente (stronk7)
7828bb972e Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle 2015-12-03 11:13:07 +01:00
Russell Smith
a8137ec25f MDL-52141 backup: Ensure we don't alter the log record when parsing it. 2015-12-03 11:11:07 +01:00
Dan Poltawski
b7f54e5c79 Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle 2015-12-03 11:11:06 +01:00