Commit graph

55767 commits

Author SHA1 Message Date
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
116ad39b7a MDL-34877 add tinymce subplugin setting support
Includes migration of spell related settings to spellchecker plugin.
2012-08-24 16:10:59 +02:00
Eloy Lafuente (stronk7)
d71c486507 weekly release 2.4dev 2012-08-23 19:26:37 +02:00
Eloy Lafuente (stronk7)
920d5b8d1a Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-08-23 19:18:22 +02:00
Eloy Lafuente (stronk7)
7f4de36ddb MDL-31957 Course reset: Add missing global 2012-08-23 02:04:13 +02:00
Eloy Lafuente (stronk7)
0a31b2f308 Merge branch 'MDL-34738_fixup' of git://github.com/jmvedrine/moodle 2012-08-22 16:36:53 +02:00
Jean-Michel Vedrine
7263fd6c53 MDL-34738 fix for the problem found during testing : dat files not accepted on some servers 2012-08-22 15:19:54 +02:00
Dan Poltawski
e073565364 MDL-34444 - actually display the title, just don't link it..
Don't worry, i'm going on holiday, so i'll be away from this git repo
for a while to prevent any more mess.
2012-08-22 11:16:07 +02:00
Dan Poltawski
bd43383d7e MDL-34444 course - don't show to 'unavaibile' sections title
Instead we just show the availability info in the index page,
this makes the navigation etc much simpler.
2012-08-22 10:50:39 +02:00
Dan Poltawski
134e28b79c Revert "MDL-34444 course: show section availability info"
Turns out this change was just wrong, we shouldn't be allowing linking
to unaavilable sections. Just show the availability information on the
'index page'

This reverts commit 87a31bb5d8.
2012-08-22 10:50:28 +02:00
Dan Poltawski
569747faec MDL-34444 course: Dont display links to hidden sections
This is what happens when you dont use the navigation api
2012-08-22 08:40:52 +02:00
Dan Poltawski
29eaccab15 MDL-34444 course: show section availability info
When available, rather than a capability error.
2012-08-22 08:40:48 +02:00
Dan Poltawski
8b63e25692 Merge branch 'MDL-35000' of git://github.com/timhunt/moodle 2012-08-22 10:25:26 +08:00
Dan Poltawski
957a5fa7a4 MDL-34853 tests - fix broken phpunit test 2012-08-22 10:13:52 +08:00
Dan Poltawski
d94ef56395 MDL-34870 enrol_cohort - don't need to do useless work 2012-08-22 10:02:53 +08:00
Dan Poltawski
cff2026980 Merge branch 'MDL-34870' of git://github.com/aolley/moodle 2012-08-22 09:52:48 +08:00
Eloy Lafuente (stronk7)
b6b34345ac Merge branch 'MDL-34853' of local stronk7 repo.
(originally w34_MDL-34853_m24_durationsetting @ git://github.com/skodak/moodle.git)
2012-08-22 03:41:14 +02:00
Eloy Lafuente (stronk7)
444af7c65f MDL-34853 code style fixes 2012-08-22 03:25:40 +02:00
Dan Poltawski
23b5bbf49d Merge branch 'MDL-34733' of git://github.com/timhunt/moodle 2012-08-22 09:16:10 +08:00
Petr Škoda
ef2737a4df MDL-34853 use new duration setting type in enrol_paypal 2012-08-22 03:00:12 +02:00
Petr Škoda
0bf660cad6 MDL-34853 use new duration setting type in enrol_self 2012-08-22 03:00:12 +02:00
Petr Škoda
38257347ed MDL-34853 add new admin setting for duration (time in seconds) 2012-08-22 03:00:11 +02:00
Petr Škoda
090b173437 MDL-34853 add weeks unit to forms element duration 2012-08-22 03:00:11 +02:00
Petr Škoda
47c8b9788f MDL-34853 use new duration setting type in enrol_manual 2012-08-22 03:00:11 +02:00
Eloy Lafuente (stronk7)
df27efbd46 Merge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle 2012-08-22 02:33:34 +02:00
Eloy Lafuente (stronk7)
b85b7b34b2 Merge branch 'MDL-34702' of git://github.com/timhunt/moodle 2012-08-22 02:10:22 +02:00
Eloy Lafuente (stronk7)
9075481920 Merge branch 'MDL-34795' of git://github.com/srynot4sale/moodle 2012-08-22 02:04:47 +02:00
Eloy Lafuente (stronk7)
a477affda0 Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle 2012-08-22 01:58:13 +02:00
Eloy Lafuente (stronk7)
41624a5682 Merge branch 'w34_MDL-34776_m24_notinsql' of git://github.com/skodak/moodle 2012-08-22 01:55:34 +02:00
Eloy Lafuente (stronk7)
479fa62207 MDL-34866 whitespace fix 2012-08-22 01:48:45 +02:00
Eloy Lafuente (stronk7)
1f0f592cea Merge branch 'MDL-34866' of git://github.com/rlorenzo/moodle 2012-08-22 01:47:20 +02:00
Eloy Lafuente (stronk7)
dd12051df2 Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle 2012-08-21 22:24:20 +02:00
Eloy Lafuente (stronk7)
77dd8ab1de Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle 2012-08-21 21:18:15 +02:00
Tim Hunt
172238f435 MDL-35000 quiz: Complete activity report broken by bad require.
Fix the stupid error that caused this. Also, make all the other
require_once calls in the file consistent.
2012-08-21 18:01:32 +01:00
Tim Hunt
d869de66a6 MDL-34733 quiz 'secure' mode: finish review link broken in previews
This fix a small API change in mod_quiz_renderer::finish_review_link.
At least the required change is an improvement, since it gives the
renderer more flexibility.
2012-08-21 12:08:57 +01:00
Dan Poltawski
d81c02feef Merge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle 2012-08-21 15:44:46 +08:00
Petr Škoda
2cd58c83ea MDL-34876 improve coding style 2012-08-21 09:40:10 +02:00
Dan Poltawski
9e5680f100 MDL-34648 - increment version number 2012-08-21 14:40:51 +08:00
Dan Poltawski
f418f82e52 Merge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle 2012-08-21 14:39:54 +08:00
Dan Poltawski
5d9e2ab19e Merge branch 'MDL-34691_assign_overdue_by' of https://github.com/SWiT/moodle 2012-08-21 14:36:41 +08:00
Dan Poltawski
b6476885a4 Merge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle 2012-08-21 13:56:58 +08:00
Rajesh Taneja
4625404451 MDL-34293 Themes: Added tbody to flexible table 2012-08-21 13:50:38 +08:00
Frederic Massart
ad778c84e8 MDL-34648 Course: Added capability to control sections moving 2012-08-21 13:31:19 +08:00
Dan Poltawski
509b17c71d Merge branch 'MDL-32705' of git://github.com/timhunt/moodle 2012-08-21 12:37:43 +08:00
Dan Poltawski
828ecbaf13 Merge branch 'MDL-34569_accessibility' of git://github.com/rwijaya/moodle 2012-08-21 12:35:05 +08:00
Dan Poltawski
34f5898f5e Merge branch 'MDL-34118' of git://github.com/timhunt/moodle 2012-08-21 12:29:16 +08:00
Dan Poltawski
3a66d4255d MDL-31341 mod_assign: fixup minor coding style issues 2012-08-21 12:18:40 +08:00
Dan Poltawski
94fb9f9fae Merge branch 'MDL-31341' of git://github.com/netspotau/moodle-mod_assign 2012-08-21 12:13:51 +08:00
Dan Poltawski
6c6604350d Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle 2012-08-21 12:02:17 +08:00
Dan Poltawski
74c0bc34d7 Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle 2012-08-21 11:59:14 +08:00