72261 Commits

Author SHA1 Message Date
Dan Bennett
d908797918 MDL-49115 repository_s3: Fixed endpoint not saving 2015-02-17 15:43:13 +08:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
Andrew Nicols
719f7345ee Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle 2015-02-17 14:35:38 +08:00
Ankit Agarwal
bbcd308340 MDL-48559 behat: Moving cronclionly to the installer 2015-02-17 14:33:56 +08:00
David Monllao
c8171c1d72 Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle 2015-02-17 14:23:22 +08:00
Andrew Nicols
cbae4e39ea Merge branch 'wip-mdl-48670' of https://github.com/rajeshtaneja/moodle 2015-02-17 14:07:55 +08:00
David Monllao
0e9a99f449 Merge branch 'MDL-49169_master' of git://github.com/grabs/moodle 2015-02-17 14:01:00 +08:00
David Monllao
a50840db34 Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle 2015-02-17 13:23:30 +08:00
David Monllao
77b0238bdb Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle 2015-02-17 13:16:39 +08:00
David Monllao
bbc009f26c MDL-48543 filter_mathjaxloader: Fixing upgrade version 2015-02-17 11:00:52 +08:00
Damyon Wiese
b1a55c5ffb MDL-48543 Mathjax: Update default config for JAWS Math player
JAWS Maths player does not recognise the math content when manually specifying the config for MathJax.
If you use one of the default config files it works.
So - we switch our config to the Accessible.js config that it is based off anyway.
There are no features changes with this approach.

Conflicts:
	filter/mathjaxloader/version.php
2015-02-17 10:54:12 +08:00
David Monllao
be1bc2d4cb MDL-48760 filter_mathjaxloader: Removing post-2.9 release comment 2015-02-17 10:48:06 +08:00
David Monllao
57ff8d92f9 Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle 2015-02-17 09:17:10 +08:00
David Monllao
a27b8c9b3b Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle 2015-02-16 16:51:51 +08:00
David Monllao
73152e4dff Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle 2015-02-16 16:38:34 +08:00
Michael Hughes
3a1cc9475d MDL-48215 gradingform_guide: Name length validation
Validating both criterion name and guide name to be 255 chars.
2015-02-15 21:52:12 -08:00
David Monllao
470e087d80 Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle 2015-02-16 11:52:50 +08:00
Frederic Massart
308e481ce8 MDL-47529 lock: Fix typo on lock factory in config-dist 2015-02-16 10:53:45 +08:00
David Monllao
36977d39d0 Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle 2015-02-16 10:35:06 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Jean-Michel Vedrine
fc16a1acba MDL-48709 mod_lesson: subclusters are not working 2015-02-14 18:26:03 +01:00
Adrian Greeve
01dfdf7e41 MDL-48760 maths filters: Upgrade to mathjax 2.5 2015-02-13 14:26:11 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
2015-02-13 11:12:12 +05:30
David Monllao
667ef02858 MDL-18553 mod_lesson: Requiring just the grade constants 2015-02-13 10:40:47 +08:00
Jean-Michel Vedrine
49aaac3e6f MDL-18553 Lesson: No gradeinfo display if lesson grade is zero 2015-02-13 10:28:00 +08:00
Rajesh Taneja
02fafff411 MDL-48670 behat: Set timezone to Australia/perth
Behat tests might rely on time related tests
Ensure we have default timezone set to Australia/Perth
2015-02-13 08:11:53 +08:00
Andreas Grabs
3d944c8b20 MDL-49169 user - After MDL-48978-Fix description is not saved anymore 2015-02-12 12:26:36 +01:00
David Monllao
7357af2b0c weekly release 2.9dev 2015-02-12 15:30:03 +08:00
David Monllao
0471328c70 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-02-12 15:30:01 +08:00
Frederic Massart
3630ab92d9 MDL-47529 task: Remove usage of lock when editing a task 2015-02-12 11:16:20 +08:00
Frederic Massart
0af336ef93 MDL-47529 task: Do not use lock when updating task records 2015-02-12 11:16:20 +08:00
David Monllao
5bb0ee2a7a MDL-43535 webservices: Adding missing deprecated WS
- enrol_manual needs a version bump to execute
  external_update_descriptions()
- core_user_get_users_by_id() is now also marked
  as deprecated
2015-02-12 10:13:36 +08:00
Sara Cenni
54867385b2 MDL-40776 grade: fix query for report outcomes
Add a missing space to the query for report outcomes to avoid error with Oracle.
2015-02-11 14:14:02 +01:00
Ruslan Kabalin
d1bb9ea917 MDL-48841 admin: Fix scheduled task reset to defaults finctionality.
It is safe to make fields as non-required, because form validation will not
pass through any empty field anyway.
2015-02-11 11:19:27 +00:00
Rajesh Taneja
c44da97711 MDL-36296 block_navigation: navigate to course before following activity
Activity name is wrapped and chrome driver can't click on it
So navigate to course where it is visible in full
2015-02-11 09:32:28 +00:00
David Monllao
d3dac40019 MDL-48894 core_registration: Fixing version value 2015-02-11 16:18:06 +08:00
Andrew Davis
fe391a4e0c MDL-48894 core_registration: minor string tweak 2015-02-11 14:28:46 +08:00
David Monllao
d0676138b2 Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle 2015-02-11 09:11:06 +08:00
Marina Glancy
6a2c10a89d MDL-49003 login: prevent signup when user is logged in 2015-02-11 00:03:44 +01:00
gthomas2
78c36b065f MDL-46763 core: Change icon processing to retain source format 2015-02-10 23:55:57 +01:00
Andrew Davis
806c06fc7b MDL-48894 core_registration: make it more obvious if site is registered 2015-02-10 21:12:10 +01:00
AMOS bot
4834fcb875 Automatically generated installer lang files 2015-02-11 00:04:09 +08:00
Eloy Lafuente (stronk7)
3b77006451 Merge branch 'MDL-49036-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-02-10 13:29:10 +01:00
Eloy Lafuente (stronk7)
438193ef45 Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle 2015-02-10 13:14:59 +01:00
Eloy Lafuente (stronk7)
83ab09a001 Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle 2015-02-10 13:09:38 +01:00
David Monllao
c365148292 MDL-48679 gradebook: Fixing trailing whitespace 2015-02-10 17:48:57 +08:00
David Monllao
b300c1deba Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle 2015-02-10 17:45:22 +08:00
Simey Lameze
e82aa04399 MDL-48679 gradebook: fix grade publishing feature 2015-02-10 17:39:52 +08:00
Dan Poltawski
53018f5fc4 Merge branch 'm29_MDL-49052' of https://github.com/totara/moodle 2015-02-10 09:24:42 +00:00