Damyon Wiese
95664d548f
Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle
2014-06-24 11:44:42 +08:00
Damyon Wiese
5d71e8b51a
Merge branch 'wip-MDL-36003-master' of git://github.com/abgreeve/moodle
2014-06-24 11:23:21 +08:00
Damyon Wiese
f8793245e8
Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle
2014-06-24 10:08:28 +08:00
Eloy Lafuente (stronk7)
b362c8f90d
Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle
2014-06-24 00:46:36 +02:00
Damyon Wiese
7fb32aaafc
MDL-41746 External api: Allow multiple calls to validate_context at different levels
...
(Only from webservices)
2014-06-23 13:38:53 +08:00
Damyon Wiese
a51201a433
Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle
2014-06-23 12:20:04 +08:00
Adrian Greeve
06dc1e7f56
MDL-36003 events: Added events for viewing grade reports.
2014-06-23 11:59:35 +08:00
Marina Glancy
c436a90dfb
Merge branch 'MDL-46013_uninstall_theme' of git://github.com/moodlerooms/moodle
2014-06-23 11:34:27 +08:00
Marina Glancy
47b933df3d
Merge branch 'MDL-44124-master' of git://github.com/ankitagarwal/moodle
2014-06-23 11:33:50 +08:00
Frederic Massart
680482d14a
MDL-44773 atto_accessibilitychecker: Improved image test coverage
2014-06-19 13:38:12 +08:00
Frederic Massart
325f668670
MDL-46046 atto_accessibilityhelper: Remove dead code from the plugin
2014-06-18 16:52:06 +08:00
Frederic Massart
61ebeec143
MDL-44773 atto_accessibilitychecker: Set focus on clicked warnings
2014-06-18 16:44:24 +08:00
Ankit Agarwal
e20d306969
MDL-39883 events: Create a new api create_from_cm for module create event
2014-06-18 15:39:02 +08:00
Ankit Agarwal
29a05a56af
MDL-44124 libraries: Allow rrules with only one part during rrule validation checks
2014-06-18 14:12:25 +08:00
Russell Smith
d2c58b95bb
MDL-43835 phpunit: Correct unit tests.
...
When different ID's are set for each sequence a number
of unit test failures appear. They have been corrected
to allow unit tests to pass with the new generator in place.
2014-06-17 19:08:01 +10:00
Eloy Lafuente (stronk7)
f393b3ecb1
Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle
2014-06-17 11:04:11 +02:00
Marina Glancy
65f4667348
Merge branch 'wip_MDL-45941_m28_message' of git://github.com/skodak/moodle
2014-06-17 13:08:14 +08:00
Petr Skoda
349f98ad3e
MDL-45941 implement support for message sending from DB transactions and fix other problems
...
This patch includes following fixes:
- messages may be now sent when database transactions active
- consistent return status on failure from message_send(), false is
returned only when message not created in message(_read)? table,
processor failure results in debugging message only and messages
are not marked as read
- message_sent is triggered always with id from message table
- logic for marking messages as viewed was standardised
- message_viewed event is triggered consistently
- improved performance when fetching user preferences
- full unit tests coverage for send_message() function
- fixed multiple other smaller issues discovered by unit tests
2014-06-17 16:09:43 +12:00
Mark Nielsen
f149e58990
MDL-46013 theme: Uninstall theme unconditionally unsets configs
2014-06-16 15:10:30 -07:00
Eloy Lafuente (stronk7)
d519545a54
Merge branch '45884-28' of https://github.com/samhemelryk/moodle
2014-06-17 00:09:50 +02:00
Marina Glancy
14422ae946
Merge branch 'MDL-43274-master' of git://github.com/xow/moodle
2014-06-16 17:23:53 +08:00
John Okely
fbd449509e
MDL-43274 Course: Remove message about course logs from upgrade.txt
2014-06-16 16:25:27 +08:00
Damyon Wiese
070d5b17e1
MDL-31409 Grading form webservice: Whitespace fixes
2014-06-16 16:14:43 +08:00
Damyon Wiese
be08fd134e
Merge branch 'MDL-31861' of https://github.com/Lightwork-Marking/moodle
2014-06-16 16:13:38 +08:00
Damyon Wiese
bf4c212284
Merge branch 'wip-mdl-46001' of https://github.com/rajeshtaneja/moodle
2014-06-16 11:24:29 +08:00
Rajesh Taneja
96b86e038e
MDL-46001 atto_clear: modfied behat test to work on xvfb
2014-06-16 11:09:43 +08:00
Damyon Wiese
70b58992b8
Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle
2014-06-16 10:07:00 +08:00
John Okely
bb8d6e1a81
MDL-43274 Course: Remove ability to delete logs on a course during reset
2014-06-16 09:10:05 +08:00
Russell Smith
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
Paul Charsley
0ff4ebb4a3
MDL-31861 add web service function save_definitions
2014-06-13 15:36:25 +12:00
Sam Hemelryk
99f041ebfa
MDL-45884 navigation: changed to positive setting phrasing
2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1
MDL-45884 navigation: tidied up code and added behat tests
2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70
MDL-45884 navigation: setting that allows sites to collapse My Courses by default
2014-06-13 10:16:25 +12:00
Eloy Lafuente (stronk7)
0272001830
Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle
2014-06-12 11:38:10 +02:00
Damyon Wiese
d27c8d924a
MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto
2014-06-12 11:14:21 +08:00
Adrian Greeve
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
Rajesh Taneja
49d82f905e
MDL-44871 behat: Hack to make equation editor visible
2014-06-11 17:20:18 +08:00
Damyon Wiese
162e050c66
MDL-44871 Atto behat: Use one less page load to get to profile edit page
2014-06-11 16:29:38 +08:00
Damyon Wiese
e3adee555b
MDL-44871 Atto: Move custom select text step to atto specific step definition.
2014-06-11 15:29:20 +08:00
Damyon Wiese
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
Eloy Lafuente (stronk7)
ea8541d0f9
Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle
2014-06-11 01:32:24 +02:00
Jason Fowler
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
James McLean
855d8a2c49
MDL-45418 Files: Adding publisher docs to Filetypes
2014-06-10 19:09:27 +02:00
Marina Glancy
4422b08068
Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle
2014-06-10 15:42:42 +08:00
Marina Glancy
410bb9a92c
Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle
2014-06-10 15:41:53 +08:00
Damyon Wiese
5d44ea3333
Merge branch '45524-28' of git://github.com/samhemelryk/moodle
2014-06-10 15:30:16 +08:00
Damyon Wiese
457a9fa6c5
MDL-44871 Behat: Add tests for Atto functionalities (some of them)
2014-06-10 14:42:00 +08:00
Marina Glancy
0b74d45c70
Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle
2014-06-10 14:19:45 +08:00
Daniel Neis Araujo
db282ba4fe
MDL-45245 html_writer::select_time does not respect 5th parameter "attributes"
2014-06-10 14:19:04 +08:00
Jenny Gray
d6bc210687
MDL-45846 Libraries custom user agent device detection unit test added
2014-06-09 13:56:42 +01:00