Dan Poltawski
5c4dea968e
Merge branch 'w38_MDL-35460_m24_offlineassign' of git://github.com/skodak/moodle
2012-09-17 12:49:58 +08:00
Dan Poltawski
7e3d57fca9
Merge branch 'MDL-35376' of git://github.com/rlorenzo/moodle
2012-09-17 12:47:46 +08:00
Dan Poltawski
7560bf8a8c
Merge branch 'MDL-30847_master' of git://github.com/dmonllao/moodle
2012-09-17 12:39:37 +08:00
Dan Poltawski
7248a6f90a
Merge branch 'MDL-34975-master' of git://github.com/FMCorz/moodle
2012-09-17 11:59:43 +08:00
Dan Poltawski
6d2c3be183
Merge branch 'MDL-35374' of git://github.com/rlorenzo/moodle
2012-09-17 11:47:27 +08:00
Dan Poltawski
d4422a4a50
Merge branch 'w38_MDL-35454_m24_bogusmaxsize' of git://github.com/skodak/moodle
2012-09-17 11:44:35 +08:00
Frederic Massart
0cf2e0a40a
MDL-34975 Accessibility: Collapsible areas captions can be clicked to expand/collapse
2012-09-17 09:47:16 +08:00
David Monllao
683bed9182
MDL-30847 core Adding ARIA attribute to help windows
2012-09-17 09:26:42 +08:00
Petr Škoda
fcae4a0ce3
MDL-35460 add offline feedback from mod_assign to standard plugins
2012-09-16 09:35:04 +02:00
Petr Škoda
e58a797ce0
MDL-35355 use YUI3 in resource resizing code
2012-09-15 12:52:48 +02:00
Petr Škoda
adc75629e4
MDL-35454 ignore invalid $custombytes in get_max_upload_sizes()
...
This fixes installation and phpunit init regression.
2012-09-15 11:13:04 +02:00
Eloy Lafuente (stronk7)
2bc620b363
Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle
2012-09-14 01:08:49 +02:00
Sam Hemelryk
fd9a54c2e3
Merge branch 'wip-mdl-30667' of git://github.com/rajeshtaneja/moodle
2012-09-13 11:19:30 +12:00
Eloy Lafuente (stronk7)
7ec68510d9
Merge branch 'MDL-34082' of git://github.com/timhunt/moodle
2012-09-12 17:19:17 +02:00
Tim Hunt
e08eaf7da3
MDL-34082 course restrict modules: typo in MDL-19125 upgrade code.
2012-09-12 16:15:11 +01:00
Sam Hemelryk
6aa130499b
Merge branch 'wip-mdl-34568' of git://github.com/rajeshtaneja/moodle
2012-09-12 11:08:56 +12:00
Rex Lorenzo
ff37d63c1b
MDL-35376 - Shortcut/alias not working for Private file repo
2012-09-11 14:23:12 -07:00
Rex Lorenzo
1336e2e160
MDL-35374 - Cannot delete blocks off frontpage
2012-09-11 12:27:17 -07:00
Eloy Lafuente (stronk7)
e633ea6b46
Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle
2012-09-11 16:28:46 +02:00
Eloy Lafuente (stronk7)
c0d716d7b9
Merge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle
2012-09-11 02:44:30 +02:00
Eloy Lafuente (stronk7)
513480c22a
Merge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle
2012-09-11 01:53:17 +02:00
Sam Hemelryk
c91614ef52
Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle
2012-09-11 10:38:23 +12:00
Eloy Lafuente (stronk7)
5e51915c80
Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle
2012-09-10 23:35:12 +02:00
Eloy Lafuente (stronk7)
2c248bd416
Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle
...
Conflicts:
lib/editor/tinymce/version.php
2012-09-10 22:13:36 +02:00
Petr Škoda
5ba3a966f6
MDL-35284 patch empty toolbar crashing TinyMCE
2012-09-10 22:10:25 +02:00
Petr Škoda
6dd4241f81
MDL-35318 fix lang revision incrementation conditions
2012-09-10 20:23:14 +02:00
Adrian Greeve
8e73fbf5aa
MDL-32785 - lib - Ignorning hard frozen fields when submitting data.
2012-09-10 11:12:10 +08:00
Petr Škoda
79df150a62
MDL-35318 use new lang revision to invalidate TinyMCE lang caches
2012-09-09 12:18:32 +02:00
Petr Škoda
a46e11b5df
MDL-35318 add lang revision counter and improve PHPUnit test reset
...
We need this for hacks that need to find out if strings changed.
2012-09-09 12:15:30 +02:00
Petr Škoda
29149f981c
MDL-35289 use unmodified TinyMCE
2012-09-09 11:57:25 +02:00
Petr Škoda
7a7b8a1f19
MDL-35071 redesign enrol restore
...
Includes option to convert all enrolments to enrol_manual instances, support for mapping of custom fields and fixes for several other problems. This does not include support for custom enrol tables, it will be addressed in another issue.
2012-09-07 11:11:28 +02:00
Petr Škoda
a4a4b2f6c6
MDL-35289 use new TinyMCE en lang import
...
AMOS BEGIN
MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END
2012-09-07 10:11:37 +02:00
Rossiani Wijaya
8510d731bb
MDL-34984 admin setting: fixed labeling and shortname display for admin setting
2012-09-07 15:34:38 +08:00
Frederic Massart
59b9a14063
MDL-8307 Course: Course requests can suggest a category
2012-09-07 11:22:08 +08:00
Dan Poltawski
4501a081d3
MDL-35257 lib: if $CFG->logguests is disabled, avoid some log actions
...
This is for performance, else there can be great contention on the guest
user record as we've seen on moodle.org.
2012-09-07 10:25:22 +08:00
Rajesh Taneja
0465ef6e31
MDL-34568: Accessibility: Added missing lables in quiz section
...
AMOS BEGIN
CPY [pluginname,grade_export_xls],[downloadexcel,table]
CPY [pluginname,grade_export_ods],[downloadods,table]
AMOS END
2012-09-07 10:18:15 +08:00
Eloy Lafuente (stronk7)
3b70685c26
fix permissions
2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
df5ac8d0ec
MDL-6424 - blocks - Add missing global vars.
2012-09-06 19:39:49 +02:00
Eloy Lafuente (stronk7)
7c2bc95ae2
Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle
2012-09-06 19:31:43 +02:00
Eloy Lafuente (stronk7)
0cbf023ab6
Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle
2012-09-06 12:08:26 +02:00
Eloy Lafuente (stronk7)
0e08f394f5
Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle
2012-09-06 02:01:11 +02:00
Eloy Lafuente (stronk7)
44a2eb911b
Revert "MDL-30643 - Fixed speed issues with stats generation."
...
This reverts commit 5d911452cd9ef60f8f79ed9bd39fc8302211a96c.
2012-09-05 19:04:01 +02:00
Eloy Lafuente (stronk7)
cbcf50a2f4
Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables."
...
This reverts commit e710925a24bbbe0a4f0ddfa0b760380091890083.
2012-09-05 19:03:46 +02:00
Eloy Lafuente (stronk7)
583a19d772
Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."
...
This reverts commit 678f53c5f781d45424020530435382645325ab73.
2012-09-05 19:03:30 +02:00
Eloy Lafuente (stronk7)
6a7fb9f778
Revert "MDL-30643 - Now loading table definitions from XML files."
...
This reverts commit d352e733b3729ee820de8859d67c859cda81ee34.
2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8
Revert "MDL-30643 - Added statslib test file."
...
This reverts commit 8646f5a4363a4331c8673e2bc98a7372ed789182.
2012-09-05 19:03:06 +02:00
Eloy Lafuente (stronk7)
06d54f411c
Revert "MDL-30643 - Fixing minor log output error and test cases."
...
This reverts commit 2da32bd6a5a0071756c29a4684c73694f0971664.
2012-09-05 19:02:54 +02:00
Eloy Lafuente (stronk7)
fa4fbd9790
Revert "MDL-30643 - Updated test cases to handle timezones better."
...
This reverts commit f0f0fec29572e6670cb46f4325955201f871b519.
2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f
Revert "RFC-30643 - Removed get_context_instance calls."
...
This reverts commit eb0ffd3214ad568ded291936c2cd6e67276350b6.
2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5
Revert "MDL-30643 fixed whitespace"
...
This reverts commit 5c27678d3aa51af7c6e5ce992e52e55a29195a22.
2012-09-05 19:02:07 +02:00