Tim Hunt
bca8065844
MDL-28259 Individual answers Feedback not shown in Cloze questions
2011-09-16 12:02:08 +01:00
Eloy Lafuente (stronk7)
9cfaebbd0e
weekly release 2.2dev
2011-09-16 01:37:34 +02:00
Eloy Lafuente (stronk7)
6c4319d46a
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-09-16 01:34:18 +02:00
Petr Skoda
eb7d00a69a
Revert "MDL-29081 add support for proxy in TinyMCE GoogleSpell plugin"
...
This reverts commit 57638f2c05857bceea25909d0ef31ecf5f99b142.
2011-09-15 10:10:27 +02:00
Petr Skoda
c6bba40392
MDL-29025 fix missing $ espacing
2011-09-15 09:25:30 +02:00
Eloy Lafuente (stronk7)
3ae79749f1
MDL-29093 auth - help string now specifies MNet exception. Thanks Helen!
2011-09-14 11:36:42 +02:00
Eloy Lafuente (stronk7)
b7aefc8de5
Merge branch 'w36_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle
2011-09-14 11:23:44 +02:00
Eloy Lafuente (stronk7)
847c66f5fc
Merge branch 'w36_MDL-28455_m22_tinymce' of git://github.com/skodak/moodle
2011-09-14 11:20:19 +02:00
Eloy Lafuente (stronk7)
53d2fe2ac1
MDL-29093 auth - help string changed to VBFET suggestion
...
(very best favourite english translator, aka. Helen :-P)
2011-09-14 10:10:49 +02:00
Petr Skoda
f22cd93999
MDL-28455 bump up editor version file
2011-09-14 09:07:47 +02:00
Sam Hemelryk
113b970e62
MDL-29188 course_formats Fixed up formatting of section name within navigation
2011-09-14 11:39:48 +12:00
Eloy Lafuente (stronk7)
cdcb1b9ea1
Merge branch 'wip-MDL-29093-master' of git://github.com/samhemelryk/moodle
2011-09-14 00:28:56 +02:00
Petr Skoda
148c65bfc8
MDL-29295 do not use strtok in dml and ddl layers
...
This prevents clobbering of internal pointer when code calling DML
uses strtok too. Unit test added to prevent future uses.
2011-09-14 00:19:55 +02:00
Eloy Lafuente (stronk7)
3afd493065
Merge branch 'w36_MDL-29326_m22_sqlsrv' of git://github.com/skodak/moodle
2011-09-13 17:33:42 +02:00
Eloy Lafuente (stronk7)
7cf7471100
Merge branch 'w36_MDL-29328_m22_adodb' of github.com:skodak/moodle
2011-09-13 17:28:43 +02:00
Eloy Lafuente (stronk7)
60bf24f024
Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle
2011-09-13 17:24:48 +02:00
Petr Skoda
f848c0f6e6
MDL-29351 add missing temp and cache dirs to installers
2011-09-13 13:33:06 +02:00
Aparup Banerjee
af4f1cc722
MDL-26257 Authentication : whitespace/style fixes
2011-09-13 19:10:54 +08:00
Aparup Banerjee
631c9c02ab
Merge branch 'MDL-26257' of git://github.com/bostelm/moodle
2011-09-13 19:07:22 +08:00
Aparup Banerjee
d1e362405e
Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
...
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated
2011-09-13 16:06:21 +08:00
Aparup Banerjee
7eae2c5ae2
Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle
...
- resolved conflict.
2011-09-13 13:52:31 +08:00
Aparup Banerjee
f7dd6bda31
Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle
2011-09-13 11:58:21 +08:00
Aparup Banerjee
9568a4e87b
Merge branch 'master' of git.moodle.org:/git/integration
2011-09-13 11:42:18 +08:00
Aparup Banerjee
5433da6064
Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
...
- resolved conflicts.
2011-09-13 11:39:06 +08:00
Sam Hemelryk
4bc844f770
Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes
2011-09-13 15:34:03 +12:00
Sam Hemelryk
2c7a91475f
MDL-29093 - Authentication improved new setting name and strings
2011-09-13 15:10:22 +12:00
Iñaki Arenaza
4f6aa35eb8
MDL-29093 - Authentication for authentication only, not for user creation
...
There are cases when a moodle installation needs to only deal
user authentication and not user creation (this is especially
interesting when using external authentication sources such as LDAP,
CAS, etc.)
Add an option to prevent automatic user creation if the administrator
does't want users to be automatically created.
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2011-09-13 15:08:57 +12:00
Sam Hemelryk
62b214d9a6
Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle
2011-09-13 12:45:34 +12:00
Sam Hemelryk
eb38d45b4e
MDL-29189 course Minor fixups after code review
2011-09-13 11:17:18 +12:00
Eloy Lafuente (stronk7)
452b166526
Merge branch 'wip-MDL-23534-master' of git://github.com/samhemelryk/moodle
2011-09-12 21:59:38 +02:00
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
Petr Skoda
5cc6b84731
MDL-29326 add support for auth and enrol using mssqlnative adodb driver
2011-09-12 09:23:47 +02:00
Petr Skoda
3a67b21769
MDL-29328 update 3rd party library list with new adodb version
2011-09-12 09:13:39 +02:00
Petr Skoda
7911fccafc
MDL-29328 import latest adodb
2011-09-12 09:12:46 +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
