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)
77dd8ab1de
Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle
2012-08-21 21:18:15 +02: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
f418f82e52
Merge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle
2012-08-21 14:39:54 +08:00
Adrian Greeve
2b7ece005e
MDL-6424 - blocks - Adding a warning screen when the user clicks the delete link.
2012-08-21 14:31:24 +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
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
Dan Poltawski
d642260cfe
Merge branch 'w34_MDL-34954_m24_subplugins' of git://github.com/skodak/moodle
2012-08-21 10:34:28 +08:00
Eloy Lafuente (stronk7)
fffb9b9064
Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle
2012-08-21 02:39:10 +02:00
Eloy Lafuente (stronk7)
ee998a687c
Merge branch 'MDL-34889' of git://github.com/timhunt/moodle
2012-08-21 02:24:50 +02:00
Eloy Lafuente (stronk7)
afe404068d
Merge branch 'MDL-29847' of git://github.com/timhunt/moodle
2012-08-21 01:28:34 +02:00
Eloy Lafuente (stronk7)
57733008c9
Merge branch 'MDL-31957-master' of git://github.com/sammarshallou/moodle
2012-08-21 01:21:18 +02:00
Eloy Lafuente (stronk7)
2672817478
Merge branch 'w34_MDL-34960_m24_gmapsv2drop' of git://github.com/skodak/moodle
2012-08-20 20:34:13 +02:00
Eloy Lafuente (stronk7)
040d4c63be
Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle
2012-08-20 16:34:18 +02:00
Eloy Lafuente (stronk7)
53db05a507
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-20 16:28:09 +02:00
Dan Poltawski
328e4d280c
Merge branch 'w34_MDL-34956_m24_pluginlibregression' of git://github.com/skodak/moodle
2012-08-20 15:56:41 +08:00
Dan Poltawski
9d218eedb5
Merge branch 'w34_MDL-34740_m24_pageclass' of git://github.com/skodak/moodle
2012-08-20 15:33:36 +08:00
Dan Poltawski
20db0a6ff0
Merge branch 'MDL-34934' of git://github.com/stronk7/moodle
2012-08-20 14:46:42 +08:00
Aaron Barnes
154a72b002
MDL-34332 completion: timeenrolled not always set correctly
2012-08-20 16:51:51 +12:00
Dan Poltawski
7447d328dd
Merge branch 'MDL-31926-master' of git://github.com/FMCorz/moodle
2012-08-20 12:12:54 +08:00
Dan Poltawski
a563bdc119
Merge branch 'MDL-34535-master' of git://github.com/ankitagarwal/moodle
2012-08-20 12:06:50 +08:00
Frederic Massart
d5bdbbba26
MDL-34756 Unit Tests: Move backup helper tests
2012-08-20 10:24:37 +08:00
Petr Škoda
2ea6d5686f
MDL-34893 use standard options in Hint_ResultPrinter
...
This is a very nasty hack!
2012-08-19 22:09:46 +02:00
Petr Škoda
704533fca7
MDL-34960 drop deprecated Google Maps API V2
2012-08-19 20:07:27 +02:00
Petr Škoda
fcb46048c1
MDL-34901 fix user login times handling
2012-08-19 15:33:31 +02:00
Petr Škoda
e197d9a457
MDL-34956 fix recent plugin parent fetching regression
2012-08-18 21:52:44 +02:00
Petr Škoda
f8c9397222
MDL-34876 add tinymce subplugin uninstallation
2012-08-18 14:03:06 +02:00
Petr Škoda
7d59d8dae1
MDL-34954 allow subplugins to define plugininfo_* class
2012-08-18 13:03:58 +02:00
Petr Škoda
975311d3d2
MDL-34954 prevent false IDE code inspection errors
2012-08-18 12:47:58 +02:00
Petr Škoda
b4bfdf5a53
MDL-34954 include filelib stuff only when needed
2012-08-18 12:46:05 +02:00
Petr Škoda
3edc37cb13
MDL-34740 add class file option to $CFG->moodlepageclass and $CFG->blockmanagerclass
2012-08-18 10:02:46 +02:00
Petr Škoda
4a38e65977
MDL-34912 fix invalid descriptionformat default handling
2012-08-18 09:52:31 +02:00
sam marshall
5ae17b09a8
MDL-31957 Course reset: Does not erase activity completion data
2012-08-17 10:35:44 +01:00
Frederic Massart
7b05e14659
MDL-28531 Unit Tests: Fixed tests to work with core update
2012-08-17 15:00:10 +08:00
Frederic Massart
4d91f7354e
MDL-28531 Backup: Automated backups run when they are scheduled
2012-08-17 15:00:10 +08:00
Frederic Massart
c216eb2008
MDL-31926 Course: Obfuscating an email supports subject and body parameters
2012-08-17 14:59:46 +08:00
David Scotson
289320528c
MDL-34293 Themes: Added thead to flexible table
2012-08-17 14:50:20 +08:00
Matt Meisberger
dbc623c4fc
MDL-34742 - adding ability to move blocks into empty column
2012-08-17 14:44:06 +08:00
Eloy Lafuente (stronk7)
1a33536c4d
MDL-34934 general: Delete unnecessary .gitignore
2012-08-16 20:43:24 +02:00
Tim Hunt
85b72a7511
MDL-34889 phpunit: progress output in util.php --drop.
...
It is slow for me, and it is nice to know that something is going on.
2012-08-16 17:13:59 +01:00
Tim Hunt
2ec325c252
MDL-29847 question preview: garbage collect old preview data.
...
This adds cron code which looks for question previews that have not been
touched for more than 24 hours, and deletes them.
We try to delete previews immediately. For example if the user clicks
start again, then we immediately delete their previous preview. However,
we can't do that if they just close the preview window. Hence we need
some cron code to clean up old preview that have got left lying around.
Normally, this code will not have much to do, so it will be very fast,
so we can afford to run it every cron.
This has been implemented in such a way that in future it will be easy
to add other cron code to the question bank.
Sadly, to make this work on MySQL, we require a horrible hack in the
already hacky delete_usage_records_for_mysql function.
2012-08-16 17:02:01 +01:00
sam marshall
007bf47f10
MDL-34446 Fix bugs in previous commit
2012-08-16 14:37:11 +08:00
Eloy Lafuente (stronk7)
92f2403bf3
Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle
2012-08-15 03:18:58 +02:00
Eloy Lafuente (stronk7)
4998a013aa
Merge branch 'MDL-34885' of git://github.com/timhunt/moodle
2012-08-15 03:16:16 +02:00
Eloy Lafuente (stronk7)
76b97631b0
Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-08-15 00:41:04 +02:00
Eloy Lafuente (stronk7)
267c898bfd
Merge branch 'w33_MDL-34782_m24_mysqlunsigned' of git://github.com/skodak/moodle
2012-08-14 23:09:30 +02:00
