Commit graph

49163 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
ce9d0673d0 Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle 2011-09-12 20:37:24 +02:00
Eloy Lafuente (stronk7)
f8fa11e1af MDL-15377 filterlib - whitespace fixes 2011-09-12 16:30:10 +02:00
Sam Hemelryk
32ec60d142 Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution 2011-09-12 20:18:27 +12:00
Sam Hemelryk
9f768d6e5f Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle 2011-09-12 19:48:33 +12:00
kordan
712dee7a59 MDL-29211 fix for master 2011-09-12 09:42:18 +02:00
Sam Hemelryk
f8adfe6cc0 Merge branch 'w36_MDL-28701_m22_tempcachedir' of git://github.com/skodak/moodle 2011-09-12 18:26:09 +12:00
Andrew Davis (andyjdavis)
bb3546f3c2 MDL-22232 messaging: added the ability to temporarily disable notifications to a particular user 2011-09-12 14:05:14 +08:00
Sam Hemelryk
eb3d2faaa1 Merge branch 'w36_MDL-29025_m22_verboseauthdb' of git://github.com/skodak/moodle 2011-09-12 17:48:09 +12:00
Sun Zhigang
c5234aa1d9 MDL-29112 trigger event mod_deleted after deleting mod through AJAX 2011-09-12 17:36:02 +12:00
Sam Hemelryk
16ff2aee7d Merge branch 'MDL-28724' of git://github.com/nebgor/moodle 2011-09-12 17:24:49 +12:00
Sam Hemelryk
5da0e7fc03 Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle 2011-09-12 17:08:27 +12:00
Sam Hemelryk
5b4404f615 Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle 2011-09-12 16:52:36 +12:00
Sam Hemelryk
8d6540ffd1 Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle 2011-09-12 16:30:44 +12:00
Aparup Banerjee
48346fb11f MDL-28724 wiki : Fixed bugs in wiki forms 2011-09-12 12:28:54 +08:00
Sam Hemelryk
b13dbc43d7 Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle 2011-09-12 15:30:15 +12:00
Sam Hemelryk
8b5bab6f91 Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle 2011-09-12 15:17:08 +12:00
Sam Hemelryk
633a5edd51 Merge branch 'MDL-27635' of git://github.com/rwijaya/moodle 2011-09-12 14:38:45 +12:00
Rossiani Wijaya
ca896fdfcf MDL-27635 hub component: fixed default value for 'secret' field in 'registration_hubs' table 2011-09-12 10:25:46 +08:00
Sam Hemelryk
342e97ee9c Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle 2011-09-12 13:42:28 +12:00
Sam Hemelryk
0eac94dfc7 Merge branch 'MDL-28488' of git://github.com/stronk7/moodle 2011-09-12 13:19:12 +12:00
Sam Hemelryk
014d3c1f8d Merge branch 'MDL-29269' of git://github.com/stronk7/moodle 2011-09-12 13:09:30 +12:00
kordan
c6926ff064 MDL-29056 theme-formal_white fix for the report pagelayout that was preventing horizontal scroll 2011-09-12 13:01:49 +12:00
Eloy Lafuente (stronk7)
59fc0cbdb7 MDL-28488 backup - conditionaly apply defaults based on mode
Some modes of backup cannot be preloaded with general backup
settings because they may conflict with the definitions required/set
by the mode (for example, import backups are, by definition, without
users always, so we cannot apply one default in the opposite direction).

So, after the patch, current general_backup setting will be only applied
to general backups, import/hub modes won't be using any default and
automated backup defaults should be loaded here (TODO)
2011-09-11 19:35:56 +02:00
Eloy Lafuente (stronk7)
2a4ba40f31 MDL-28488 backup - '[backup|restore]:configure cap does not control import mode anymore 2011-09-11 19:09:59 +02:00
Petr Skoda
1d16e92700 MDL-29292 fix feature typo
Credit goes to Raminder Singh.
2011-09-11 12:50:16 +02:00
Petr Skoda
ab6e0848c1 MDL-29025 standardise cli verbose output and general cleanup 2011-09-11 12:43:43 +02:00
Eloy Lafuente (stronk7)
9530e1ed68 MDL-28488 backup - fixup some strings and delete legacy ones 2011-09-11 12:03:11 +02:00
Petr Skoda
05e60bd206 MDL-29306 support multiple roles in ext enrol db 2011-09-10 23:30:58 +02:00
Petr Skoda
e7dd4ff575 MDL-29131 fix multiple groups issues on the recent activity report 2011-09-10 13:52:42 +02:00
Petr Skoda
af08a48b2d MDL-29257 use more entropy in ws upload 2011-09-10 12:06:59 +02:00
Petr Skoda
cedc3d338c MDL-29257 use more entropy in repo upload 2011-09-10 12:05:29 +02:00
Petr Skoda
2c479c8fe6 MDL-29257 use counter for unique element ids 2011-09-10 12:02:51 +02:00
Petr Skoda
3e6e4d001f MDL-28701 temp and cache upgrade notes 2011-09-10 11:36:41 +02:00
Petr Skoda
32db0f0d83 MDL-28701 add old cache and temp creation debug message and improve docs a bit 2011-09-10 11:24:46 +02:00
Petr Skoda
b6b5023144 MDL-28701 some more tempdirs updated 2011-09-10 10:55:32 +02:00
Petr Skoda
8f6e5a8d19 MDL-28701 one more make_cache_directory 2011-09-10 10:49:04 +02:00
Tom Lanyon
5a87c912a2 MDL-28701 Change uses of make_upload_directory(cache) to make_cache_directory(). 2011-09-10 10:44:43 +02:00
Tom Lanyon
af9b14446d MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory(). 2011-09-10 10:43:49 +02:00
Tom Lanyon
e695890739 MDL-28701 Add make_temp_directory() and make_cache_directory(). 2011-09-10 10:35:48 +02:00
Tom Lanyon
365bec4c06 MDL-28701 Change all uses of $CFG->dataroot/cache to $CFG->cachedir 2011-09-10 10:35:46 +02:00
Tom Lanyon
383d388411 MDL-28701 Fixed broken $CFG->tempdir default and added $CFG->cachedir 2011-09-10 10:35:41 +02:00
Tom Lanyon
7aa06e6ded MDL-28701 Change all uses of $CFG->dataroot/temp to $CFG->tempdir 2011-09-10 10:35:39 +02:00
Tom Lanyon
3e93987142 MDL-28701 Added $CFG->tempdir setting 2011-09-10 10:35:37 +02:00
Eloy Lafuente (stronk7)
77c2ca69af MDL-28488 backup - make backup and import capabilities independent
Before this change, in order to perform one course import it was
necessary to have both the backupcourse and the backuptargetimport
capabilities. After agreement now each one will control its own
backup mode. Same applies for restore.
2011-09-09 17:46:21 +02:00
Eloy Lafuente (stronk7)
8645a28f3e MDL-28488 backup - activity duplication requires 2 capabilities in ctx 2011-09-09 15:53:02 +02:00
Petr Skoda
b8cc71e724 MDL-29175 use new optinal_param_array in cloze question verification 2011-09-09 15:50:27 +02:00
Eloy Lafuente (stronk7)
7aacd75be4 MDL-29269 textlib - better handling of collation warnings and errors 2011-09-08 13:00:30 +02:00
sam marshall
371fbe1cc1 MDL-29236 Labels (and other content from modules) on course page should use module filter settings
E.g. if you disable smileys for a label, this ought to work (it doesn't previously, as everything is filtered using the course context).
2011-09-07 17:57:12 +01:00
Eloy Lafuente (stronk7)
5d2db8acc8 weekly release 2.2dev 2011-09-07 17:56:05 +02:00
Eloy Lafuente (stronk7)
a1b888384e MDL-27001 Integration bump needed (we were already @ 2011083100.01) 2011-09-06 15:57:49 +02:00