moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67330 commits 37 branches 544 tags 1.3 GiB
Commit graph

18215 commits

Author SHA1 Message Date
Marina Glancy
7fff0290eb Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle 2014-04-01 15:34:44 +08:00
Marina Glancy
9632cad16b Merge branch 'MDL-44717-master' of git://github.com/ankitagarwal/moodle 2014-04-01 15:34:28 +08:00
Marina Glancy
9746748e04 Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle 2014-04-01 15:33:38 +08:00
Frederic Massart
1eb5839cf9 MDL-44777 atto_equation: More consistent width of buttons 2014-04-01 15:21:11 +08:00
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
Marina Glancy
364411b123 MDL-44747 editor_atto: coding error fixed 2014-04-01 14:55:39 +08:00
Ankit Agarwal
85a4b8a3ce MDL-44717 events: Event restore process must call the init() method 2014-04-01 14:51:02 +08:00
Marina Glancy
3accdbff60 Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle 2014-04-01 14:44:13 +08:00
Frederic Massart
dfd5127531 MDL-44234 atto_table: Reduce the size of the caption field 2014-04-01 14:37:33 +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
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
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
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
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
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
Petr Škoda
96255f472c MDL-44862 always add dbport to dbsocket in pg driver 
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
 2014-03-30 10:06:39 +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
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
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
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
Frederic Massart
6cb48e0424 MDL-44804 editor_atto: JS error when filepicker is disabled 2014-03-26 17:20:31 +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
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
Mark Nelson
0a341617e4 MDL-44316 upgrade: fix to ensure upgraded and new installations have matching 'tag_instance' tables 2014-03-25 22:17:30 -07:00
Sam Hemelryk
e1190da615 Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle 2014-03-26 16:35:47 +13:00
Petr Škoda
08ec831ff8 MDL-44510 fix class guessing in phpunit 4 2014-03-26 11:32:33 +08:00