Commit graph

67344 commits

Author SHA1 Message Date
Marina Glancy
e3e9701113 Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle 2014-04-01 17:40:22 +08:00
Ankit Agarwal
53b9e63b80 MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis 2014-04-01 17:35:01 +08:00
Ankit Agarwal
52dc1de746 MDL-42891 administration: Re-implement incorrect login notification, without using the logtable. 2014-04-01 17:18:15 +08:00
Jenny Gray
f8b3cd4bdf MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error 2014-04-01 09:34:06 +01:00
Sam Hemelryk
4b92f2b79b Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle 2014-04-01 21:20:05 +13:00
Marina Glancy
5bb81ad437 Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle 2014-04-01 15:50:14 +08:00
Jetha Chan
b1421abdb6 MDL-44770 editor_atto: moved table context menu 2014-04-01 15:46:37 +08:00
Marina Glancy
1a1049990f Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle 2014-04-01 15:42:21 +08:00
Marina Glancy
99342b5197 Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle 2014-04-01 15:35:05 +08:00
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
Damyon Wiese
43a737d1b5 MDL-43999 Atto : Make image dialogue open on double click of an image. 2014-04-01 15:22:12 +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
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
3accdbff60 Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle 2014-04-01 14:44:13 +08:00
Marina Glancy
0a4af310fd Merge branch 'MDL-44741-master' of git://github.com/FMCorz/moodle 2014-04-01 14:43:49 +08:00
Frederic Massart
dfd5127531 MDL-44234 atto_table: Reduce the size of the caption field 2014-04-01 14:37:33 +08:00
Frederic Massart
7ff7f5ad27 MDL-44741 theme_more: Updated description of the theme 2014-04-01 14:34:42 +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