mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
76,177 Commits 36 Branches 519 Tags
Commit Graph

76177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Poltawski
8e9dc75e6c Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle 2015-12-03 11:11:06 +01:00
Oleg Sychev
87b2ed6c1f 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.
 2015-12-03 11:11:05 +01:00
David Monllao
0ee52b8214 Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
3c2f70aeb6 Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
c20577b9f2 Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle 2015-12-03 11:11:03 +01:00
David Monllao
00419a7a0b Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle 2015-12-03 11:11:02 +01:00
Tim Hunt
eb3884e48f 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.
 2015-12-01 13:48:08 +00:00
Eloy Lafuente (stronk7)
e070165f57 Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle 2015-12-01 00:50:10 +01:00
Eloy Lafuente (stronk7)
71a2aaabd4 Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle 2015-11-30 23:52:45 +01:00
Dan Poltawski
20232ed9a9 Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle 2015-11-30 15:42:58 +00:00
Dan Poltawski
92efb347b0 Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle 2015-11-30 15:29:29 +00:00
Dan Poltawski
ca593e5f69 Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle 2015-11-30 15:25:22 +00:00
Dan Poltawski
df64cfa624 Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle 2015-11-30 13:50:22 +00:00
Dan Poltawski
8fea53a0b1 Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle 2015-11-30 13:37:47 +00:00
Dan Poltawski
1db15fe9a7 Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle 2015-11-30 13:20:35 +00:00
Dan Poltawski
c2c97208f1 Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle 2015-11-30 12:23:09 +00:00
Dan Poltawski
88f50b3551 Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle 2015-11-30 11:27:52 +00:00
Dan Poltawski
8ffdb1309c Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle 2015-11-30 10:23:07 +00:00
David Monllao
58fe694167 Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle 
Conflicts:
	lang/en/deprecated.txt
	lang/en/grades.php
 2015-11-30 15:52:46 +08:00
David Monllao
c256bac879 Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle 2015-11-30 15:45:44 +08:00
Marina Glancy
49f3c89324 MDL-52332 calendar: load settings using API 2015-11-30 11:36:50 +08:00
Rajesh Taneja
096b98ba34 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
 2015-11-30 11:25:55 +08:00
Jun Pataleta
a33e5debe9 MDL-37308 files: Additional fixes for transparency 
Fixed transparency support when resizing and when not resizing.
 2015-11-29 20:28:19 -06:00
Jetha Chan
623c947f2b MDL-37308 files: support transparency when not resizing; new unit test 2015-11-29 20:28:19 -06:00
Adrian Greeve
e245843193 MDL-37308 files: convert_image() now supports transparency. 2015-11-29 20:28:18 -06:00
David Monllao
52d57db5c3 MDL-50661 theme_more: New small logo setting 
Adding required bits so theme_more can also set a small logo.
 2015-11-30 09:14:22 +08:00
David Monllao
c08b52aa74 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.
 2015-11-30 09:14:20 +08:00
jinhofer
c8b276a851 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.
 2015-11-27 11:15:22 -06:00
jinhofer
fbbb33a20e MDL-51706 mod/assign: Moved plagiarism links to top of online text 2015-11-27 11:13:56 -06:00
jinhofer
acf9e30086 MDL-51693 mod/assign: Added plagiarism links to full text 2015-11-27 11:13:47 -06:00
Tony Levi
79d4558a58 MDL-52283 core: password_hash() deprecation in PHP7 2015-11-27 09:12:20 +08:00
Michael Aherne
72797e6845 MDL-52013 assign: Allow subplugins to add calendar events 2015-11-26 14:28:53 +00:00
Dan Poltawski
3e0f5665cf MDL-35982 behat: delete blog entry coverage 2015-11-26 14:10:25 +00:00
Dan Poltawski
366f05f323 MDL-35982 blog: improve the delete entry confirmation string 
So that there is more context about what is being deleted.
 2015-11-26 14:10:25 +00:00
Dan Poltawski
bf12b089e6 MDL-35982 blog: reorder blog delete confirmation 
Improves accessibility to be ordered logically in page
 2015-11-26 14:10:25 +00:00
Dan Poltawski
afb7ec92ff 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..
 2015-11-26 14:10:25 +00:00
Dan Poltawski
8be9cffb8b MDL-52219 phpunit: updated for new defaults 
The externallib assertion was previously never being run and had a typo..
 2015-11-26 14:07:17 +00:00
Dan Poltawski
aa306e7bc8 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
 2015-11-26 14:07:17 +00:00
Dan Poltawski
e354bf1e67 MDL-52219 admin: Enable completion and restricted access by default 2015-11-26 14:07:17 +00:00
David Monllao
c18acb8997 weekly on-sync release 3.1dev 2015-11-26 11:02:40 +08:00
David Monllao
0e3851ddd7 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-26 11:02:38 +08:00
AMOS bot
2d9950cfd5 Automatically generated installer lang files 2015-11-26 00:04:22 +08:00
Dan Poltawski
4e1648cc34 Merge branch 'MDL-52291' of git://github.com/stronk7/moodle 2015-11-25 11:22:17 +00:00
Frederic Massart
42dcfffc4f MDL-52160 navigation: Mark category and module settings nodes as branch 2015-11-25 13:03:25 +08:00