76405 Commits

Author SHA1 Message Date
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
David Monllao
c506af7786 Merge branch 'MDL-44330' of git://github.com/NeillM/moodle 2015-11-24 17:03:06 +08:00
David Monllao
2bc40fc889 Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle 2015-11-24 16:53:18 +08:00
Neill Magill
3fca693751 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.
2015-11-24 08:42:00 +00:00
Rajesh Taneja
a3f22d315f MDL-50163 behat: wait to ensure elements are placed properly by js. 2015-11-24 11:16:44 +08:00
Eloy Lafuente (stronk7)
6842738157 Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle 2015-11-23 19:29:35 +01:00
Eloy Lafuente (stronk7)
11780411c6 Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle 2015-11-23 19:26:57 +01:00
Jean-Philippe Gaudreau
20dde5e674 MDL-52237 navigationlib: Plugins can extend navigation user profile 2015-11-23 11:04:44 -05:00
AMOS bot
45e4f75acd Automatically generated installer lang files 2015-11-24 00:04:21 +08:00
Dan Poltawski
14248189b7 Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle 2015-11-23 11:33:55 +00:00
Dan Poltawski
6bef09a490 Merge branch 'MDL-52166' of https://github.com/timhunt/moodle 2015-11-23 09:43:31 +00:00
David Monllao
57d4e11334 Merge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle 2015-11-23 17:00:24 +08:00
David Mudrák
ade03c067a MDL-52214 core: Fix case sensitivity in user agent comparison
The previous 2.9 implementation of is_web_crawler() used stripos() in
certain cases. The unit tests re-added in the previous commit revealed
that certain crawlers (such as BaiDuSpider) were not correctly detected
in the new refactored implementation.

It seems lesser evil and safe enough to use /i in the regex search even
though it is not 100% same logic as before - as stripos() was used in
some cases only, not always.
2015-11-23 09:44:43 +01:00
David Mudrák
182d9990f1 MDL-52214 core: Fix the is_web_crawler() regression
In MDL-50891, the is_web_crawler() was refactored into a core_useragent
method and the function itself was deprecated. However, there were no
unit tests kept to check the backwards compatible behaviour. It turned
out that the deprecated function leads to PHP fatal error due to a typo.

This patch fixes the typo and brings back the previous unit tests. To be
able to explicitly check the raised debugging message, the test case
now must be subclass of advanced_testcase.

Additionally fixes missing info about the function being deprecated.
2015-11-23 09:44:13 +01:00
David Monllao
965595d405 Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle 2015-11-23 16:40:26 +08:00
David Monllao
dca7e05dbf Merge branch 'MDL-52086' of git://github.com/bostelm/moodle 2015-11-23 16:10:25 +08:00
David Monllao
72dd7162e1 Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle 2015-11-23 15:42:27 +08:00
David Monllao
5269e6002d Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle 2015-11-23 14:07:21 +08:00
David Monllao
6f77b910ee Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:56:06 +08:00
David Monllao
6a82d5d04e Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:32:35 +08:00
Dan Poltawski
b58d059525 MDL-37834 assign: avoid newlines in status column of csv
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
2015-11-20 18:36:30 +00:00
AMOS bot
67f357121a Automatically generated installer lang files 2015-11-21 00:04:07 +08:00
David Monllao
2af06c4cba MDL-52095 themes: Padding to the left on RTL langs 2015-11-20 10:03:38 +08:00
AMOS bot
6026e76349 Automatically generated installer lang files 2015-11-20 00:04:07 +08:00
Dan Poltawski
2b11b94c0c weekly on-sync release 3.1dev 2015-11-19 09:21:07 +00:00