mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
68,418 Commits 36 Branches 519 Tags
Commit Graph

68418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
0d1d542332 MDL-45635 javascript: Make core dialogue translatable 2014-05-23 16:01:48 +08:00
Eloy Lafuente (stronk7)
3e511ca50b weekly on-sync release 2.8dev 2014-05-22 17:03:23 +02:00
Eloy Lafuente (stronk7)
9ba9ea30a2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-22 17:03:19 +02:00
Marina Glancy
4b7af5040d Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle 2014-05-22 12:59:56 +08:00
Andrew Nicols
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
Andrew Nicols
ae14a50114 MDL-45536 atto_html: Update the textarea size when switching to HTML view 2014-05-22 11:20:35 +08:00
AMOS bot
bdc5ab9dc1 Automatically generated installer lang files 2014-05-22 01:07:56 +00:00
Sam Hemelryk
37d39fe348 MDL-44711 course: fixed navigation expansion in course tests 2014-05-21 20:58:16 +12:00
Marina Glancy
65ae0a1bde MDL-45469 profile: make sure profile fields can be initialised without arguments 2014-05-21 11:40:43 +08:00
Dan Poltawski
627a4619f5 Merge branch 'wip-MDL-45371-master' of git://github.com/marinaglancy/moodle 2014-05-21 10:03:05 +08:00
Marina Glancy
f06daff29d MDL-45320 behat: change to block selector 2014-05-20 20:43:37 +08:00
Marina Glancy
deeaed4332 MDL-45320 block_html: behat tests 2014-05-20 20:43:37 +08:00
Marina Glancy
3ee51425c7 MDL-45320 behat: Step definitions for blocks 2014-05-20 20:43:36 +08:00
David Monllao
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
David Monllao
02a61c6461 MDL-45294 behat: Supporting an aria-label as a block ref 2014-05-20 20:43:36 +08:00
Dan Poltawski
be38640dfa Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle 2014-05-20 20:32:14 +08:00
Sam Hemelryk
487e68b432 MDL-44711 block_navigation: fixed typo in behat tests 2014-05-20 23:39:29 +12:00
Damyon Wiese
84f08cfa9d MDL-45606 Unit test fix for MySQL and added a comment about the removed code. 2014-05-20 18:01:32 +08:00
Dan Poltawski
2eb4176242 Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle 2014-05-20 15:54:25 +08:00
Frederic Massart
a71ece3757 MDL-45563 message: Inverting IDs in description of event message_viewed 2014-05-20 15:51:07 +08:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Marina Glancy
78ee646dd9 Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:28:36 +08:00
Marina Glancy
143eef0e37 Merge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:25:10 +08:00
Marina Glancy
fdece45b06 Merge branch 'wip-MDL-45512-master' of git://github.com/abgreeve/moodle 2014-05-20 14:21:56 +08:00
Marina Glancy
4cc89d51eb Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle 2014-05-20 14:12:38 +08:00
Marina Glancy
4d46c88b9f Merge branch 'MDL-44333' of git://github.com/timhunt/moodle 2014-05-20 14:10:03 +08:00
Dan Poltawski
287a42e49a Merge branch 'MDL-45571_master' of https://github.com/markn86/moodle 2014-05-20 14:06:42 +08:00
Damyon Wiese
702c08cbee Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle 2014-05-20 13:31:06 +08:00
Damyon Wiese
5dc3d0ca2b Merge branch 'MDL-45323-master' of git://github.com/lameze/moodle 2014-05-20 13:27:48 +08:00
Dan Poltawski
959599a929 Merge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle 2014-05-20 13:23:35 +08:00
Frederic Massart
2236a5655b MDL-45566 message: Send blocking events when user is not in contact list 2014-05-20 13:17:58 +08:00
Damyon Wiese
c186e87ab7 Merge branch 'MDL-45476-master' of git://github.com/phalacee/moodle 2014-05-20 13:06:09 +08:00
Frederic Massart
93f05f049d MDL-45545 csslib: Chunking handles commas in media query definitions 2014-05-20 12:21:45 +08:00
Marina Glancy
497974f3e8 MDL-45469 Move profile tests to the location recognised by phpunit 2014-05-20 11:58:35 +08:00
Dan Poltawski
c51ad7cbe2 Merge branch 'wip-MDL-45466-master' of git://github.com/marinaglancy/moodle 2014-05-20 11:51:53 +08:00
Sam Hemelryk
46921d74a6 Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 15:42:32 +12:00
Dan Poltawski
c3c424a05c MDL-44027 groups: remove some junk html 2014-05-20 15:40:37 +12:00
Dan Poltawski
3bd9c97774 Merge branch 'MDL-45605-master' of git://github.com/damyon/moodle 2014-05-20 10:51:16 +08:00
Frederic Massart
885650c70c MDL-45546 mod_forum: Login the user before getting its context 2014-05-20 10:25:07 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Sam Hemelryk
37fddc545c Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle 2014-05-20 13:59:23 +12:00
Marina Glancy
f0085cd6ab Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle 2014-05-20 09:52:25 +08:00
Dan Poltawski
0c722830d9 Merge branch 'MDL-44449' of git://github.com/timhunt/moodle 2014-05-20 09:50:43 +08:00
Dan Poltawski
93b9ded2de Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle 2014-05-20 09:30:19 +08:00
Sam Hemelryk
7be0b69893 Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle 2014-05-20 13:09:34 +12:00
Damyon Wiese
cf229a526c Merge branch '44974-28' of git://github.com/samhemelryk/moodle 2014-05-20 08:49:56 +08:00
Sam Hemelryk
00a8c0d956 Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle 2014-05-20 12:07:12 +12:00
Sam Hemelryk
4dc5c77f33 Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:58:12 +12:00
Sam Hemelryk
a3abb19716 Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:55:35 +12:00
Sam Hemelryk
58a3ed7df3 Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle 2014-05-20 11:43:13 +12:00