Commit graph

76479 commits

Author SHA1 Message Date
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
Marina Glancy
f7ff14a1be MDL-50710 block_glossary_random: more precise sorting 2015-11-30 09:16:28 +08: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
AMOS bot
22872a3475 Automatically generated installer lang files 2015-11-28 00:04:27 +08:00
Dan Poltawski
e746afacef MDL-51719 atto_rtl: RTL/LTR buttons now indicate state
Previously the RTL buttons did not indiciate wether RTL or LTR was
selected. Thanks to Andrew Nicols for guiding how to do this.
2015-11-27 14:03:53 +00:00
Dan Marsden
bba1a4a6e3 MDL-51916 mod_scorm: allow html5 scorm content fullscreen 2015-11-27 21:27:38 +13:00
John Okely
956caef6ad MDL-52260 user: Fix error when saving profile with locked field 2015-11-27 10:55:28 +08:00
Tony Levi
79d4558a58 MDL-52283 core: password_hash() deprecation in PHP7 2015-11-27 09:12:20 +08:00
Dan Poltawski
17fda969ff MDL-45364 ddimageortext: refine naming & docs of new methods 2015-11-26 19:48:44 +00:00
Andrew Nicols
2ccb8d006a MDL-45364 qtype_ddimageortext: Fix JS Lint issues 2015-11-26 19:09:29 +00:00
Andrew Nicols
b27d4eac7f MDL-45364 atto_rtl: Fix JS lint 2015-11-26 19:09:03 +00:00
Dan Poltawski
5aeba19926 MDL-48004 question: remove buggy arg of question_edit_setup
There are no uses of this in core and it does not make sense
2015-11-26 15:04:10 +00:00
Dan Poltawski
4dc29f5e8d 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.
2015-11-26 15:02:36 +00: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
f3f920d24f MDL-46350 blog: call parent validation
(Helps satify codechecker, thats all..)
2015-11-26 14:08:42 +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
Dan Poltawski
635501581c MDL-23128 tex: silence dvips output
This was causing spewwing of lots of messages to the error log..

Thanks to Fred Woolard for the suggestion
2015-11-25 17:07:06 +00:00
AMOS bot
2d9950cfd5 Automatically generated installer lang files 2015-11-26 00:04:22 +08:00
Dan Poltawski
a24abd55e0 MDL-49743 singleview: slightly clarify logic
Make it clearer what the 'unset' behaviour is because previously
we've set the default for 'empty' values twice.
2015-11-25 15:04:43 +00:00
Conn
453f69263f MDL-49743 singleview: Prevent errors when no itemid was selected
Signed-off-by: Conn <conn@cmrwarwicker.com>
2015-11-25 15:02:14 +00:00
Andrew Hancox
3390551872 MDL-51411 course: Fixed warning when deleting activity with js disabled 2015-11-25 14:42:40 +00: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
Tony Levi
72af939f6e MDL-51757 mod_scorm: Remove duplicate function param
convert invalid break calls to exceptions for PHP 7
2015-11-25 14:06:02 +13:00
Eloy Lafuente (stronk7)
e716c18fb9 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.
2015-11-25 00:19:30 +01:00
AMOS bot
88a6b9fde3 Automatically generated installer lang files 2015-11-25 00:04:12 +08:00
Juan Leyva
2d85210817 MDL-52289 message_airnotifier: Add debugging 2015-11-24 11:21:50 +01:00