9bebe2bbbc
MDL-44967 upgrade: fixed theme removal when themes have been removed already
2014-04-06 10:50:34 +12:00
52329a32f1
MDL-44747 editor_atto: Improved configuration error messages
2014-04-03 11:24:05 +08:00
fc7557677d
MDL-44720 modinfo: whitespace fix
2014-04-02 23:17:10 +02:00
6b8798dedb
Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle
2014-04-02 21:32:42 +02:00
ac32e42827
Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle
2014-04-02 14:54:59 +08:00
2b0c88e2f6
MDL-42891 adminstration: update strings and display for login fails
2014-04-02 14:18:25 +08:00
c790670d77
Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle
2014-04-02 04:05:19 +02:00
9ad87e7900
MDL-44749 atto_collapse: Skip button inclusion if it will impact UX
...
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
2014-04-02 09:52:22 +08:00
0555761203
Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle
2014-04-02 02:22:51 +02:00
3ed2a4b2cc
Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle
2014-04-02 13:04:46 +13:00
57c92af7ad
Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
2014-04-02 01:52:41 +02:00
929e32489f
Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
2014-04-02 01:12:52 +02:00
e154e9d8cd
Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle
...
Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
2014-04-02 00:27:30 +02:00
de878a38c8
Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/deprecatedlib.php
2014-04-02 09:54:13 +13:00
8412561a3d
Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle
2014-04-02 09:51:47 +13:00
53361c3087
Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-02 09:43:25 +13:00
3b07cc1c4e
Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle
2014-04-02 09:29:11 +13:00
9b1a4cde78
Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-02 09:28:49 +13:00
0ea11b7cee
Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-04-02 09:27:23 +13:00
b3d75528de
Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle
2014-04-01 17:40:35 +08:00
53b9e63b80
MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis
2014-04-01 17:35:01 +08:00
52dc1de746
MDL-42891 administration: Re-implement incorrect login notification, without using the logtable.
2014-04-01 17:18:15 +08:00
5bb81ad437
Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle
2014-04-01 15:50:14 +08:00
b1421abdb6
MDL-44770 editor_atto: moved table context menu
2014-04-01 15:46:37 +08:00
1a1049990f
Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle
2014-04-01 15:42:21 +08:00
99342b5197
Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle
2014-04-01 15:35:05 +08:00
7fff0290eb
Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle
2014-04-01 15:34:44 +08:00
9632cad16b
Merge branch 'MDL-44717-master' of git://github.com/ankitagarwal/moodle
2014-04-01 15:34:28 +08:00
9746748e04
Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle
2014-04-01 15:33:38 +08:00
43a737d1b5
MDL-43999 Atto : Make image dialogue open on double click of an image.
2014-04-01 15:22:12 +08:00
1eb5839cf9
MDL-44777 atto_equation: More consistent width of buttons
2014-04-01 15:21:11 +08:00
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
364411b123
MDL-44747 editor_atto: coding error fixed
2014-04-01 14:55:39 +08:00
85a4b8a3ce
MDL-44717 events: Event restore process must call the init() method
2014-04-01 14:51:02 +08:00
3accdbff60
Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle
2014-04-01 14:44:13 +08:00
dfd5127531
MDL-44234 atto_table: Reduce the size of the caption field
2014-04-01 14:37:33 +08:00
e50a6fa5fb
Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle
2014-04-01 14:26:08 +08:00
75823325d3
Merge branch 'MDL-44746_master' of git://github.com/markn86/moodle
2014-04-01 13:51:09 +08:00
0b1afc71bb
Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle
2014-04-01 13:45:59 +08:00
2f7949cd57
Merge branch 'MDL-44755-master' of git://github.com/FMCorz/moodle
2014-04-01 13:32:03 +08:00
814f40ba31
Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle
2014-04-01 11:19:26 +08:00
d767af7c2d
Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle
2014-04-01 11:08:40 +08:00
c390774ade
MDL-44752 atto: Correct spelling of color => colour in plugin languages
2014-04-01 11:08:18 +08:00
5491fd7f07
MDL-44763 editor_atto: removed unnecessary "preview" label
2014-04-01 10:57:16 +08:00
5259d51317
Merge branch 'MDL-44837-master' of git://github.com/sammarshallou/moodle
2014-04-01 10:39:24 +08:00
19ed179716
MDL-30085 Moved to lib/classes for support autoloading
2014-03-31 15:15:18 +02:00
198e802f9d
MDL-30085 core_grades functions moved to correct location
2014-03-31 15:15:17 +02:00
d35499312d
MDL-30085 core_grade: added a grade web service
2014-03-31 15:15:17 +02:00
33bb15eb80
MDL-44808 atto_table: Removing unused language string for JS
2014-03-31 17:21:15 +08:00
0cbc523621
Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle
2014-03-31 16:36:27 +08:00
Sam Hemelryk