96b86e038e
MDL-46001 atto_clear: modfied behat test to work on xvfb
2014-06-16 11:09:43 +08:00
70b58992b8
Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle
2014-06-16 10:07:00 +08:00
bb8d6e1a81
MDL-43274 Course: Remove ability to delete logs on a course during reset
2014-06-16 09:10:05 +08:00
fbb0c914b0
MDL-43835 phpunit: Create unique starting id's for sequences.
...
When all starting autoincrement ids are the same, it's difficult to detect coding and testing
errors that use the incorrect id in test calls. The classic case is cmid vs instance id.
To reduce the chance of the coding error we start sequences at different values where possible.
OUBlog installation is the case that highlighted this as it inserts a sitewide course module
at install time and cmid <> instance id in most cases.
2014-06-14 00:29:26 +10:00
3b0347712a
MDL-45445 events: added '(optional)' to event params where applicable
2014-06-12 20:46:58 -07:00
c446f41a85
MDL-45445 events: documented the additional validation
2014-06-12 20:46:58 -07:00
d0c65a411f
MDL-45445 events: added missing 'other' validation
2014-06-12 20:46:58 -07:00
943c61051f
MDL-45445 events: added missing 'relateduserid' validation
2014-06-12 20:46:58 -07:00
b448a5ac67
MDL-45445 events: trivial changes
2014-06-12 20:46:58 -07:00
0ff4ebb4a3
MDL-31861 add web service function save_definitions
2014-06-13 15:36:25 +12:00
99f041ebfa
MDL-45884 navigation: changed to positive setting phrasing
2014-06-13 10:16:25 +12:00
aab6438ca1
MDL-45884 navigation: tidied up code and added behat tests
2014-06-13 10:16:25 +12:00
4d378e9f70
MDL-45884 navigation: setting that allows sites to collapse My Courses by default
2014-06-13 10:16:25 +12:00
0272001830
Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle
2014-06-12 11:38:10 +02:00
d27c8d924a
MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto
2014-06-12 11:14:21 +08:00
4051685ba0
MDL-45395 lib: Removal of excel 5 spreadsheet creation files.
...
The excel 5 writer files were using OLE licensing which is GPL incompatible.
These classes are not used in core.
2014-06-12 10:41:42 +08:00
49d82f905e
MDL-44871 behat: Hack to make equation editor visible
2014-06-11 17:20:18 +08:00
162e050c66
MDL-44871 Atto behat: Use one less page load to get to profile edit page
2014-06-11 16:29:38 +08:00
e3adee555b
MDL-44871 Atto: Move custom select text step to atto specific step definition.
2014-06-11 15:29:20 +08:00
7d8f825bbf
MDL-44871 Atto behat tests: Modified the tests to work around focus bugs with workspaces
...
The main changes here are that the "select the text in" step was modified to select only the
first text node in the editor field, and to focus on it's parent instead of the entire editable div.
Some tests had to be modified to match the new behaviour, and another "real" bug was found in the table plugin.
2014-06-11 14:34:48 +08:00
ea8541d0f9
Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle
2014-06-11 01:32:24 +02:00
b5725a9727
MDL-45418 Files: Adding upgrade steps for publisher docs
...
Conflicts:
lib/db/upgrade.php
version.php
2014-06-10 19:18:35 +02:00
855d8a2c49
MDL-45418 Files: Adding publisher docs to Filetypes
2014-06-10 19:09:27 +02:00
4422b08068
Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle
2014-06-10 15:42:42 +08:00
410bb9a92c
Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle
2014-06-10 15:41:53 +08:00
5d44ea3333
Merge branch '45524-28' of git://github.com/samhemelryk/moodle
2014-06-10 15:30:16 +08:00
457a9fa6c5
MDL-44871 Behat: Add tests for Atto functionalities (some of them)
2014-06-10 14:42:00 +08:00
0b74d45c70
Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle
2014-06-10 14:19:45 +08:00
db282ba4fe
MDL-45245 html_writer::select_time does not respect 5th parameter "attributes"
2014-06-10 14:19:04 +08:00
d6bc210687
MDL-45846 Libraries custom user agent device detection unit test added
2014-06-09 13:56:42 +01:00
d663c5abc5
Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle
2014-06-09 13:25:01 +02:00
3f445e4e23
Merge branch 'MDL-45634-master' of git://github.com/FMCorz/moodle
2014-06-09 17:23:42 +08:00
2eb60257a7
MDL-44929 Javascript: Import YUI 3.17.2
2014-06-09 16:25:17 +08:00
dc561732b5
MDL-45813 Fix variable name in scheduled task
2014-06-09 09:46:13 +02:00
ddfbdf0924
MDL-45769 Behat: Fixed behat, was failing because of xpath chaining
2014-06-09 09:56:39 +08:00
cbd063f4c3
MDL-44711 navigation: improved expandable course calculation
2014-06-09 09:34:05 +12:00
8436e8590f
MDL-29708 Fixed file_exception() arguments in rename().
2014-06-07 09:53:11 +02:00
ad3ade7681
MDL-29708 Fixed extra slashes in $string['storedfilenotcreated'].
2014-06-07 09:53:09 +02:00
ccbb60d188
MDL-45846 Libraries Reinstate custom user agent device detection
2014-06-06 09:10:32 +01:00
c1d0d73718
MDL-20154 questions: question_delete_question should not check perms
...
By Moodle convention, library functions should not implement permission
checks, they are to be handled by the invoking code.
2014-06-05 09:56:35 -04:00
ddf831be20
Merge branch 'MDL-45568_master' of git://github.com/markn86/moodle
2014-06-04 10:20:53 +08:00
0313897108
Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/phpunit/bootstrap.php
2014-06-04 10:07:03 +08:00
336f1567bb
MDL-45568 events: fixed the description for the 'course_module_completion_updated' event
2014-06-03 17:25:53 -07:00
0591c2056d
Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-06-04 09:51:37 +12:00
1051166f78
Merge branch '45333-28' of git://github.com/samhemelryk/moodle
2014-06-03 15:25:59 +01:00
09da421d92
Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle
2014-06-03 12:20:41 +01:00
1bce3a70d9
MDL-44839 admin: Moved all system executable paths to config
...
AMOS BEGIN
MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
2014-06-03 17:33:49 +08:00
96c9b2feb3
Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle
2014-06-03 15:00:27 +08:00
0fe6999ace
Merge branch 'MDL-45658_master' of https://github.com/markn86/moodle
2014-06-03 14:52:33 +08:00
097f7eca38
MDL-45634 editor_atto: Adding type button to toolbar buttons
...
This prevents the browser to assume that those buttons are submit
buttons. In which case the submit action was stolen and the form
could not be submitted pressing the 'enter' key.
2014-06-03 12:09:17 +08:00
Rajesh Taneja