Commit graph

66458 commits

Author SHA1 Message Date
Andrew Nicols
1e98b1641a MDL-42827 JavaScript: Use a more specific selector for activity links 2013-11-12 10:25:52 +08:00
Adrian Greeve
29fa62cfd9 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 10:17:59 +08:00
Mark Nelson
a2d3e3b6ca MDL-42276 core_group: added behat tests to automate group actions
1. Added new step definitions to check if an element exists or does not exist in another.
2. Added new step definitions to check if an element is readonly or is not readonly.
3. Automated testing for MDLQA-1812 and MDLQA-1813.

Added behat test for deleting groups/groupings with and without the
'moodle/course:changeidnumber' capability.

4. Automated MDLQA-2105.

Added behat test for creating groups/groupings without the
'moodle/course:changeidnumber' capability.

5. Automated MDLQA-2238 and MDLQA-2335.

Added behat test for updating groups/groupings with and without the
'moodle/course:changeidnumber' capability.
2013-11-11 18:06:50 -08:00
Damyon Wiese
fae2e1ffcc Merge branch '42806-26' of git://github.com/samhemelryk/moodle 2013-11-12 10:02:09 +08:00
AMOS bot
e2f0be0e6d Automatically generated installer lang files 2013-11-12 00:53:11 +00:00
Frederic Massart
eb59e0ed3b MDL-42824 backup: Typo in description of setting backup_general_questionbank 2013-11-12 08:51:44 +08:00
Marina Glancy
82b211b6d0 Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle 2013-11-12 11:23:51 +11:00
Eloy Lafuente (stronk7)
5d875d18e0 Merge branch 'MDL-40481' of git://github.com/timhunt/moodle 2013-11-12 00:38:35 +01:00
Petr Škoda
b2ea179338 MDL-42503 treat $CFG->filterall as a real cache flag - verify during cache resets 2013-11-11 21:49:15 +01:00
sam marshall
40e8f0260c MDL-42815 Backup/restore: Error saving files - log messages unhelpful
This commit contains three changes in the three files:
1. A bug in the backup process meant that anything logged after a
   certain point did not appear in the on-screen display of the
   backup log, because the logger was serialised and deserialised
   but display code referred to the old version. Changed so that
   code retrieves new object.
2. Add more information to backup log when there is a missing file.
3. Add more information to restore log when there is a missing file
   (and remove existing code duplication of the current message).

The 'missing file' situation is one that generally shouldn't occur in
normal usage, but when it does happen, it is useful to have full
information about the file.
2013-11-11 17:15:32 +00:00
Marina Glancy
c4ce365aa1 Merge branch '42805-26' of git://github.com/samhemelryk/moodle 2013-11-11 21:48:39 +11:00
Marina Glancy
3ea8c639c1 NOBUG: convert tabs to whitespaces 2013-11-11 21:34:48 +11:00
Andrew Nicols
3c2d450259 MDL-42774 JavaScript: Ensure that shifter cleans build directories before running 2013-11-11 18:29:35 +08:00
Marina Glancy
459dd27d3e Merge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle 2013-11-11 21:10:47 +11:00
Andrew Nicols
4c0664b950 MDL-42783 Course: Improve accessiblity of various course actions 2013-11-11 21:03:41 +11:00
Marina Glancy
40dd8899ab Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle 2013-11-11 20:55:19 +11:00
Damyon Wiese
2d764047ca Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle 2013-11-11 17:25:30 +08:00
Rajesh Taneja
be98b1863a MDL-42754 Messages: Fixed typo 2013-11-11 17:20:26 +08:00
Sam Hemelryk
9bbcadb228 MDL-42806 block_mentees: can only be docked if it has a valid title set. 2013-11-11 17:18:23 +08:00
Damyon Wiese
16fafb9aed Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle 2013-11-11 17:16:51 +08:00
Sam Hemelryk
cd96b7d3e4 MDL-41392 course: management checkbox accessibility improvement 2013-11-11 17:10:14 +08:00
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Sam Hemelryk
9b22eeff5d MDL-42806 dock: check title exists before using it 2013-11-11 16:51:06 +08:00
Sam Hemelryk
4b6d9ea248 MDL-42805 dock: fixed {} appearing in undock icon title 2013-11-11 16:26:12 +08:00
Jerome Mouneyrac
316283c72b MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install 2013-11-11 16:01:32 +08:00
Aparup Banerjee
9184a2f7e0 MDL-42711 theme port from LM: fixed up choice results table overflowing to the right. (MDLSITE-2497) 2013-11-11 16:00:30 +08:00
Aparup Banerjee
fa5a136591 MDL-42711 theme port from LM - this makes the li's link inherit similar size from higher up in cascade. 2013-11-11 15:58:19 +08:00
Andrew Nicols
04653aa010 MDL-42809 ActionMenu: Increase specifity of hide on select selector 2013-11-11 15:33:30 +08:00
Frederic Massart
7c9753a713 MDL-42808 library: Google API was resetting the timezone 2013-11-11 15:25:00 +08:00
Sam Hemelryk
68bcc3faaf Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle 2013-11-11 14:10:21 +08:00
Ankit Agarwal
ddea17fc22 MDL-42803 behat: Fix random behat errors in CI 2013-11-11 14:03:26 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Damyon Wiese
138e71a42e MDL-42699 Bootstrap tinymce css. Whitespace fix. 2013-11-11 12:40:21 +08:00
Jason Fowler
8bb68e0d23 MDL-42699 TinyMCE: adding padding to editor content in clean 2013-11-11 12:18:14 +08:00
Marina Glancy
b180048946 Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-11-11 15:02:48 +11:00
Marina Glancy
f1be232f68 Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle 2013-11-11 15:02:01 +11:00
Jerome Mouneyrac
7444cf322e MDL-42081 EditPDF: Add default stamp images 2013-11-11 11:39:27 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
2013-11-11 11:01:14 +08:00
Adrian Greeve
f490f988b7 MDL-40612 libraries: Unit test expansion for get_all_user_name_fields()
and the inclusion of tests for set_user_name_object()
2013-11-11 10:52:24 +08:00
Damyon Wiese
bbdb369868 Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle 2013-11-11 10:41:40 +08:00
Renaat Debleu
6382c482c8 MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
2013-11-11 10:24:09 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Damyon Wiese
f845946821 MDL-36224 LTI: Whitespace fix 2013-11-11 10:04:10 +08:00
Damyon Wiese
75a4dd38ad Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle 2013-11-11 09:57:36 +08:00
Tim Hunt
3fc9410f84 MDL-42790 essay attempt on last: fix plain reponse mode
Plain responses, without files, were getting messed up by the
fix for MDL-39980. Something that looked like an HTML comment was being
appended.

This fix works by avoiding appending anything if there are no files. The
new unit test (which was failing before I fixed the code) confirms that
this works. The other tests should be enough to verify that there are no
regressions.
2013-11-08 15:13:04 +00:00
Andreas Grabs
6d645211be MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes 2013-11-08 10:42:49 +01:00
Aparup Banerjee
cbb6e0d029 MDLSITE-2493 glossary filter alert dialog button string now translatable
Conflicts:
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js
	filter/glossary/yui/src/autolinker/js/autolinker.js -- M.core.alert api was changed.
2013-11-08 16:33:10 +08:00
Damyon Wiese
e3552170da Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle 2013-11-08 16:15:17 +08:00
David Mudrák
069c29b987 MDLSITE-2455 Do not throw coding exception when the activity is not found
Under certain conditions, coding exception is thrown when fetching items from
the navigation bar. The patch prevents them. See more details in the tracker.
2013-11-08 16:08:39 +08:00
Dan Poltawski
46af039925 Merge branch 'MDL-42743' of git://github.com/timhunt/moodle 2013-11-08 16:08:20 +08:00