Commit graph

67193 commits

Author SHA1 Message Date
Damyon Wiese
b1e4d8b119 Merge branch 'MDL-46035_survey_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-06-24 13:08:52 +08:00
Damyon Wiese
80fa42a001 Merge branch 'MDL-46076-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-06-24 11:31:54 +08:00
Damyon Wiese
63de1463f8 Merge branch 'MDL-44512-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-06-24 10:58:47 +08:00
Eloy Lafuente (stronk7)
1510a9d6a1 MDL-39883 events: fix tests to avoid warning
Only needed in 26 and older, we are handling those
changes automatically in 27 and up.
2014-06-24 02:06:08 +02:00
Eloy Lafuente (stronk7)
4fdbb24243 Merge branch 'MDL-45721_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-06-24 01:00:21 +02:00
Eloy Lafuente (stronk7)
32b48768d4 Merge branch 'MDL-39883-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-06-24 00:50:05 +02:00
Eloy Lafuente (stronk7)
a23eb149a8 Merge branch 'MDL-45764_generalTool_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE 2014-06-24 00:03:42 +02:00
Simey Lameze
f0a38fd4c0 MDL-40805 auth_cas : Trigger user_loggedout event before CAS logout. 2014-06-23 15:20:53 +08:00
Damyon Wiese
1b25b037dc Merge branch 'MDL-45580-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-06-23 15:20:40 +08:00
Frederic Massart
e7acf36d0d MDL-45580 assignfeedback_editpdf: Save readonly version in backup 2014-06-23 14:56:25 +08:00
Frederic Massart
75c74acfa1 MDL-45580 assignfeedback_editpdf: Delete draft content on new submission 2014-06-23 14:56:25 +08:00
Frederic Massart
2df40c4f90 MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF 2014-06-23 14:56:21 +08:00
Damyon Wiese
3f3ecc0311 Merge branch '37145-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-06-23 14:40:33 +08:00
Damyon Wiese
20ab72d496 Merge branch 'MDL-38693-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-06-23 13:54:59 +08:00
Damyon Wiese
f208379c9f MDL-41746 External api: Allow multiple calls to validate_context at different levels
(Only from webservices)
2014-06-23 13:39:53 +08:00
Damyon Wiese
d61f480fb6 Merge branch 'MDL-35453_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-06-23 12:30:18 +08:00
Mark Nielsen
45ddf2980a MDL-46013 theme: Uninstall theme unconditionally unsets configs 2014-06-23 11:35:07 +08:00
Sam Hemelryk
d57563edd6 MDL-37145 caching: noted recommendation for dedicated memcache servers
Several reports have been made about the unexpected purging of entire
memcached servers when MUC is configured to use Memcache and caches
get purged.
This is expected and occurs because the memcache extenions don't
provide isolated containers. Moodle data is stored along side any other
data in the cache and when caches get purged all data gets removed
whether it belongs to Moodle or not.

The docs cover this point and here I've added notes about this to both
config-dist.php and cache/README.md
2014-06-23 11:02:48 +12:00
AMOS bot
a095ad50c1 Automatically generated installer lang files 2014-06-21 00:43:44 +00:00
Tim Hunt
905050d73e MDL-35453 quiz reports: don't order by id.
We were using ORDER BY id even though there was a perfectly good
attempt column to order the attempts by one user at one quiz.

Also, Oracle was complaining:
Debug info: ORA-01799: a column may not be outer-joined to a subquery
2014-06-20 16:54:20 +01:00
sam marshall
d20d8938a7 MDL-46079 Restore: Can run out of memory in get_records call 2014-06-20 14:12:58 +01:00
sam marshall
e1d76a33e3 MDL-46076 Lib: Allow javascript-static.js to somewhat work in IE7 [2.6] 2014-06-20 14:10:57 +01:00
Frederic Massart
8fc9105a7a MDL-40228 backup: Settings were ignored during automated backups 2014-06-20 15:38:09 +08:00
Daniel Thies
07a50c2f29 MDL-45044 filter_tex: properly escape excutable pathnames for Windows 2014-06-19 22:08:21 -05:00
Andrew Davis
f87c073039 MDL-46035 mod_survey: a string change to make an error message always correct 2014-06-20 08:58:45 +08:00
Jetha Chan
28b751b244 MDL-44512 themes: fix for custom menu submenu arrows on RTL languages 2014-06-19 15:18:18 +08:00
Damyon Wiese
9663e6f8a5 weekly release 2.6.3+ 2014-06-19 14:13:11 +08:00
Damyon Wiese
13f327b533 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-06-19 14:13:08 +08:00
AMOS bot
e7b7b7fd8e Automatically generated installer lang files 2014-06-19 00:42:58 +00:00
Ankit Agarwal
90db0fb726 MDL-39883 events: Trigger a module created event when duplicating a module 2014-06-18 16:02:43 +08:00
Ankit Agarwal
fd554631f8 MDL-39883 events: Create a new api create_from_cm for module create event 2014-06-18 16:02:42 +08:00
Damyon Wiese
8bf65f15dd MDL-45933 Assign: Prevent fatal error when there are no users in the grading table 2014-06-18 15:17:38 +08:00
Mark Nelson
ca0678bd96 MDL-45652 core_backup: display warning on restore destination form when necessary data is missing 2014-06-17 21:56:26 -07:00
Mark Nelson
9f6a3aee95 MDL-45721 core_backup: only trigger the course_restored event when restoring a course 2014-06-17 19:38:36 -07:00
AMOS bot
08c9c27c01 Automatically generated installer lang files 2014-06-18 00:42:34 +00:00
Andrew Nicols
9b6218949a MDL-41258 Forum: Add additional unit tests for forum digest settings 2014-06-17 16:17:35 +08:00
Damyon Wiese
05dd6551bd MDL-45582 Editpdf: Prevent debugging when there is no pdf 2014-06-17 10:21:42 +08:00
Damyon Wiese
5f8a991828 Merge branch 'm26_MDL-45582' of git://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-06-17 10:21:34 +08:00
Eloy Lafuente (stronk7)
d7b83310a7 Merge branch 'MDL-45970_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-06-17 01:15:54 +02:00
Eloy Lafuente (stronk7)
a25529102c Merge branch 'MDL-45611-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-06-17 01:12:34 +02:00
Eloy Lafuente (stronk7)
883656ceb8 Merge branch 'wip-mdl-45719-m26' of https://github.com/deraadt/moodle into MOODLE_26_STABLE 2014-06-17 01:04:08 +02:00
Eloy Lafuente (stronk7)
c005cb8947 Merge branch 'MDL-45870-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-06-17 00:51:46 +02:00
Marina Glancy
827fbc4515 Merge branch 'MDL-45901_Quiz_MOODLE-26-STABLE' of git://github.com/nadavkav/moodle into MOODLE_26_STABLE 2014-06-16 17:27:54 +08:00
Jonathon Fowler
f8840f947c MDL-42531 assign: refactor batch operations to use forms properly
Avoids a lot of ugly optional_param() use. Also fixes the
non-functional cancel buttons.

Conflicts:
	mod/assign/locallib.php
	mod/assign/tests/base_test.php
	mod/assign/tests/events_test.php
2014-06-16 17:00:04 +08:00
Gregory Faller
41b20b6e18 MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature 2014-06-16 18:07:56 +09:30
Marina Glancy
0e96add931 Merge branch 'MDL-35648-v26' of git://github.com/danielneis/moodle into MOODLE_26_STABLE 2014-06-16 14:24:22 +08:00
Marina Glancy
196c818a91 Merge branch 'MDL-45935-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-16 14:23:01 +08:00
John Okely
8791ab3304 MDL-10115 User profile: Use moodle_url and html_writer::link for course links on user profiles 2014-06-16 14:22:28 +08:00
AMOS bot
fc06491c75 Automatically generated installer lang files 2014-06-15 00:42:51 +00:00
Nadav Kavalerchik
b70337b38c MDL-45901 - Quiz - Random question category question are not visible,in RTL mode 2014-06-14 00:47:10 +03:00