67319 Commits

Author SHA1 Message Date
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
2014-04-01 15:08:34 +08:00
Ankit Agarwal
85a4b8a3ce MDL-44717 events: Event restore process must call the init() method 2014-04-01 14:51:02 +08:00
Adrian Greeve
7ed25f480b MDL-44717 events: Fix for the name strings in various events.
AMOS BEGIN
 MOV [eventnoteupdate, core_notes],[eventnoteupdated, core_notes]
AMOS END
2014-04-01 14:45:05 +08:00
Adrian Greeve
55f59c2b44 MDL-44717 events: Quick update to incorrect mod workshop class definition. 2014-04-01 14:45:05 +08:00
Marina Glancy
e50a6fa5fb Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle 2014-04-01 14:26:08 +08:00
Marina Glancy
0b5f523164 Merge branch 'MDL-44739-master' of git://github.com/FMCorz/moodle 2014-04-01 14:24:54 +08:00
Marina Glancy
75823325d3 Merge branch 'MDL-44746_master' of git://github.com/markn86/moodle 2014-04-01 13:51:09 +08:00
Marina Glancy
0b1afc71bb Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle 2014-04-01 13:45:59 +08:00
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
73afb59759 MDL-44747 editor_atto: Renamed subplugin setting class 2014-03-31 11:28:43 +08:00
Frederic Massart
356ec27f08 MDL-44747 editor_atto: Improved validation of toolbar config
This ensures that:
- Plugins are only used once,
- Group names are unique,
- Lines match: group = plugin[, plugin[, plugin ...]],
- There are some groups and plugins defined,
- The plugins used are installed.
2014-03-31 11:28:43 +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
Mark Nelson
a82f3b4f2a MDL-44746 core_events: minor changes to the user_deleted event 2014-03-29 15:25:49 -07:00
Mark Nelson
601c998c64 MDL-44746 core_events: removed incorrect uses of snapshots 2014-03-29 15:25:49 -07: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
578645aadf MDL-44715 use parent::validate_data() consistently in all events
Includes some minor PHPDocs typo fixes.
2014-03-28 14:09:31 +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