Marina Glancy
2f7949cd57
Merge branch 'MDL-44755-master' of git://github.com/FMCorz/moodle
2014-04-01 13:32:03 +08:00
Marina Glancy
902eec06e9
Merge branch 'MDL-44811' of git://github.com/timhunt/moodle
2014-04-01 13:24:09 +08:00
Marina Glancy
814f40ba31
Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle
2014-04-01 11:19:26 +08:00
Marina Glancy
d767af7c2d
Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle
2014-04-01 11:08:40 +08:00
Andrew Nicols
c390774ade
MDL-44752 atto: Correct spelling of color => colour in plugin languages
2014-04-01 11:08:18 +08:00
Marina Glancy
e57f83a5c0
Merge branch 'MDL-44701' of git://github.com/aolley/moodle
2014-04-01 11:06:23 +08:00
Marina Glancy
502abeebb6
Merge branch 'MDL-44670-master' of git://github.com/FMCorz/moodle
2014-04-01 11:05:31 +08:00
Marina Glancy
31374d59d0
Merge branch 'MDL-44590-master' of git://github.com/danpoltawski/moodle
2014-04-01 11:04:52 +08:00
Andrew Davis
5491fd7f07
MDL-44763 editor_atto: removed unnecessary "preview" label
2014-04-01 10:57:16 +08:00
Marina Glancy
5259d51317
Merge branch 'MDL-44837-master' of git://github.com/sammarshallou/moodle
2014-04-01 10:39:24 +08:00
Marina Glancy
1bc60971b1
Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle
2014-04-01 10:37:22 +08:00
Marina Glancy
771b121287
Merge branch 'wip-MDL-44850_master' of git://github.com/gjb2048/moodle
2014-04-01 10:36:00 +08:00
Gareth J Barnard
7cc6112219
MDL-44854 theme: 'svg' font type not served.
2014-03-31 11:10:13 +01:00
Gareth J Barnard
9e98a0c04f
MDL-44850 theme: 'eot' font type not served.
2014-03-31 11:01:30 +01:00
Frederic Massart
33bb15eb80
MDL-44808 atto_table: Removing unused language string for JS
2014-03-31 17:21:15 +08:00
Marina Glancy
0cbc523621
Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle
2014-03-31 16:36:27 +08:00
Marina Glancy
de19c44c82
Merge branch 'MDL-44808-master' of git://github.com/FMCorz/moodle
2014-03-31 16:36:12 +08:00
Marina Glancy
b13f4e8e7c
Merge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle
2014-03-31 15:55:29 +08:00
Petr Škoda
246230715e
MDL-44733 add disabled class rows with disabled scheduled tasks
2014-03-31 15:48:19 +08:00
Damyon Wiese
c70de965aa
MDL-44583 Assign: performance fixes
2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847
Merge branch 'MDL-44822' of git://github.com/aolley/moodle
2014-03-31 12:46:21 +08:00
Frederic Massart
36beb828de
MDL-44757 atto_equation: Use Moodle Docs URL for TeX doc
2014-03-31 12:07:34 +08:00
Frederic Massart
a3fa796118
MDL-44755 atto_editor: Remove hardcoded icons from settings
...
Previously, we hardcoded a list of icons for Atto plugins. This is not
a good idea as it would be very quickly outdated, or incomplete. Now,
we proceed as we often do: if the image pix/icon exists in the plugin
it is displayed, else nothing is displayed.
2014-03-31 11:26:53 +08:00
Frederic Massart
89331bc217
MDL-44764 atto_image: Reword the alt related labels
2014-03-31 11:25:46 +08:00
Frederic Massart
7887b47524
MDL-44767 atto_editor: Browser hangs when making a selection
2014-03-31 11:13:15 +08:00
Marina Glancy
c531e2e632
Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle
2014-03-31 11:03:31 +08:00
Tim Hunt
4dc30936f7
MDL-44811 quiz settings form title: change for consistency.
...
Thanks to Fred for poining out that most other activities use the work
Appearance for these sorts of settings.
2014-03-28 18:02:02 +00:00
Frederic Massart
23cead686e
MDL-44808 atto_table: Remove accessibility information from dialogue
2014-03-28 17:27:57 +08:00
Jason Fowler
87c0e4e06b
MDL-44754 Atto: Explaining what group names are used for in toolbars
2014-03-28 14:48:38 +08:00
Petr Škoda
0a5aa65b53
MDL-44733 add support for disabling of scheduled tasks
2014-03-28 10:23:37 +08:00
sam marshall
07ba4070e4
MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
...
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
2014-03-27 16:45:04 +00:00
Marina Glancy
ad32dda90c
weekly release 2.7dev
2014-03-27 16:52:07 +08:00
Marina Glancy
6474439d55
NOBUG: Fixed file access permissions
2014-03-27 16:52:07 +08:00
Marina Glancy
a13c2addee
NOBUG: Fixed SVG browser compatibility
2014-03-27 16:52:06 +08:00
Marina Glancy
a5c3dec8e8
Merge branch 'install_master' of git://git.moodle.org/moodle-install
2014-03-27 16:52:05 +08:00
Damyon Wiese
46bb7a5a7f
MDL-43883 Fix wiki behat tests to work with Atto
2014-03-27 13:02:31 +08:00
Damyon Wiese
786ced9925
MDL-43883 Behat: Fix deprecation and move custom matches to the editor field only.
2014-03-27 12:36:37 +08:00
Rajesh Taneja
3e469992a1
MDL-44084 behat: Fixed setting value for form editor
2014-03-27 12:12:09 +08:00
AMOS bot
38164faf70
Automatically generated installer lang files
2014-03-27 00:48:26 +00:00
Adam Olley
0f204015a6
MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present
2014-03-27 11:10:25 +10:30
Adam Olley
9f7674bddc
MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()
...
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
2014-03-27 10:16:53 +10:30
Frederic Massart
6cb48e0424
MDL-44804 editor_atto: JS error when filepicker is disabled
2014-03-26 17:20:31 +08:00
Dan Poltawski
3c87c0880e
Merge branch 'MDL-43784-master-fixup' of git://github.com/FMCorz/moodle
2014-03-26 16:25:39 +08:00
Frederic Massart
969b30022e
MDL-43784 behat: Removed usage of Afterburner in a feature
2014-03-26 16:18:13 +08:00
Rajesh Taneja
b033c16390
MDL-44084 behat: Fixed behat set_value for atto editor
2014-03-26 15:56:21 +08:00
Petr Škoda
9c093a7bf8
MDL-44316 move the tag context upgrade to the end and fix issues
2014-03-26 15:36:50 +08:00
Jetha Chan
0326b83149
MDL-42588 mod_scorm: option for displaying activity name
...
Added option to display or hide activity name on SCORM player.
2014-03-26 15:27:50 +08:00
Rajesh Taneja
3233f32dfb
MDL-44557 behat: Resize window only possible with javascript
2014-03-26 14:45:30 +08:00
Marina Glancy
f2bf88130d
Merge branch 'wip-mdl-44557' of git://github.com/rajeshtaneja/moodle
2014-03-26 14:10:53 +08:00
Rajesh Taneja
3b0b5e570d
MDL-44557 behat: Allow nehat to resize window
...
Run all behat with medium (1024x768) screen size to
avoid failures with small screen size. Also, added
feature to let scenario chnage screen size if need be.
2014-03-26 13:59:14 +08:00