58e70de193
Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle
2014-06-03 08:57:31 +12:00
1ea5f1e2d3
MDL-45630 events: removed unnecessary 'the' from event descriptions
2014-05-31 15:27:11 -07:00
90395bbfa1
MDL-45333 output: navbar is now wrapped in a <nav> tag
2014-05-30 08:41:29 +12:00
79a8ea653c
MDL-45513 cache: added support to unit tests for alt cache stores
2014-05-30 08:41:07 +12:00
3f86b023ef
MDL-45654 Cron: Fix for unit test that was causing integer overflow in 32 bit php
2014-05-29 12:10:19 +08:00
20f29d2c89
MDL-45654 cron: fixed dataprovider timestamp issue
2014-05-29 11:53:36 +12:00
69ab6b4713
Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle
2014-05-29 08:12:32 +12:00
f94891cc00
MDL-45503 upgrade: add v2.7.0 sep lines
2014-05-28 01:13:42 +02:00
a64528d88c
Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle
2014-05-27 07:49:58 +01:00
6ca4f19a9f
Merge branch 'MDL-45682-master' of git://github.com/andrewnicols/moodle
2014-05-26 11:23:59 +01:00
6b8e46ad04
MDL-45565 core_message: Reset internal users in phpunit
2014-05-26 15:42:12 +08:00
b0ad512f95
MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php.
2014-05-26 12:51:40 +08:00
362659725b
MDL-45682 editor_atto: Ensure that the current editor is active when saving selections
2014-05-26 12:02:02 +08:00
0251be5bcc
Merge branch 'MDL-44014-master' of git://github.com/andrewnicols/moodle
2014-05-26 11:58:43 +08:00
963402c2ba
MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree
2014-05-26 10:40:10 +08:00
1912b5aa92
Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle
2014-05-26 13:23:02 +12:00
3b31276bc8
Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle
2014-05-26 10:36:11 +12:00
bde2e4c599
Merge branch 'MDL-45607_master' of https://github.com/markn86/moodle
2014-05-26 09:53:41 +12:00
953eb35c84
Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle
2014-05-26 08:58:03 +12:00
0d1d542332
MDL-45635 javascript: Make core dialogue translatable
2014-05-23 16:01:48 +08:00
041d22ea09
MDL-44014 Navigation: Set the correct context when retrieved via AJAX
2014-05-22 15:04:33 +08:00
4b7af5040d
Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle
2014-05-22 12:59:56 +08:00
2c549f7802
MDL-45239 editor_atto: On Android do not restore focus in the callbackWrapper
...
It seems that Android automatically focuses the cursor in the last position
when the content editable region is programatically re-focused.
Whilst this does not cause an issue on it's own, when combined with the
behaviour of the dictionary auto-completion to restore focus on the start
of the word when a word has not yet been finished, this was causing us to
change focus when pressing buttons.
2014-05-22 12:19:43 +08:00
ae14a50114
MDL-45536 atto_html: Update the textarea size when switching to HTML view
2014-05-22 11:20:35 +08:00
81512b9856
MDL-45658 events: included enrolment method in the user_enrolment_deleted/updated event descriptions
2014-05-21 20:00:48 -07:00
75b70ab6cd
MDL-45654 cron: fix non-empty directories deletion
...
Remove errors when attempting to delete non-empty directories when
child directories do not get removed since the mtime was updated when
files were removed from the child directory.
2014-05-21 17:15:30 +01:00
37d39fe348
MDL-44711 course: fixed navigation expansion in course tests
2014-05-21 20:58:16 +12:00
f06daff29d
MDL-45320 behat: change to block selector
2014-05-20 20:43:37 +08:00
28c86221ac
MDL-45294 behat: Updating block references to aria label value
...
Also improving moodle selectors xpath expressions
readability.
2014-05-20 20:43:36 +08:00
02a61c6461
MDL-45294 behat: Supporting an aria-label as a block ref
2014-05-20 20:43:36 +08:00
be38640dfa
Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle
2014-05-20 20:32:14 +08:00
487e68b432
MDL-44711 block_navigation: fixed typo in behat tests
2014-05-20 23:39:29 +12:00
84f08cfa9d
MDL-45606 Unit test fix for MySQL and added a comment about the removed code.
2014-05-20 18:01:32 +08:00
2eb4176242
Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle
2014-05-20 15:54:25 +08:00
a71ece3757
MDL-45563 message: Inverting IDs in description of event message_viewed
2014-05-20 15:51:07 +08:00
4e8a350c35
Merge branch 'MDL-45618' of git://github.com/timhunt/moodle
2014-05-20 14:59:48 +08:00
4cc89d51eb
Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle
2014-05-20 14:12:38 +08:00
287a42e49a
Merge branch 'MDL-45571_master' of https://github.com/markn86/moodle
2014-05-20 14:06:42 +08:00
959599a929
Merge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle
2014-05-20 13:23:35 +08:00
93f05f049d
MDL-45545 csslib: Chunking handles commas in media query definitions
2014-05-20 12:21:45 +08:00
3bd9c97774
Merge branch 'MDL-45605-master' of git://github.com/damyon/moodle
2014-05-20 10:51:16 +08:00
06a689b761
Merge branch '44711-28' of git://github.com/samhemelryk/moodle
2014-05-20 10:15:11 +08:00
7be0b69893
Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle
2014-05-20 13:09:34 +12:00
a3abb19716
Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle
2014-05-20 11:55:35 +12:00
e722133aee
MDL-45474 atto_undo: Remove notice when undo stack is empty
2014-05-20 10:47:32 +12:00
5bcfd504df
MDL-45618 Fix @since PHPdoc tags.
2014-05-19 17:03:04 +01:00
495243f35c
Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle
2014-05-19 21:20:10 +08:00
e9e12c97fe
Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle
2014-05-19 20:52:19 +08:00
e1a83b8327
Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle
2014-05-19 20:18:59 +08:00
2b3a371239
Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle
2014-05-19 20:04:50 +08:00
Sam Hemelryk