Sam Hemelryk
931f89cc13
Merge branch 'wip-mdl-25937' of git://github.com/rajeshtaneja/moodle
2011-09-19 17:01:00 +12:00
Sam Hemelryk
cb2c93c8db
Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle
2011-09-19 13:32:37 +12:00
Eloy Lafuente (stronk7)
37b5d8b0c4
MDL-29321 syntax - fix switch() statement
2011-09-19 01:24:51 +02:00
Eloy Lafuente (stronk7)
b1c1eeaec9
MDL-29314 syntax - fix switch() statement
2011-09-19 01:21:57 +02:00
Sam Hemelryk
2b834a1d06
Merge branch 'MDL-29415' of git://github.com/stronk7/moodle
2011-09-19 11:15:04 +12:00
Eloy Lafuente (stronk7)
018213bed2
MDL-29415 xmldb - fix get_columns() in oracle to get char based lengths + test
2011-09-19 00:34:10 +02:00
Petr Skoda
a419316622
MDL-29406 fix greedy config settings cleanup
2011-09-17 13:36:22 +02:00
Petr Skoda
b610f1d4d7
MDL-29313 allow larger char fields
2011-09-16 08:55:23 +02:00
Petr Skoda
aa6dba5538
MDL-29321 tweak large varchar unit tests for oracle
2011-09-16 08:53:11 +02:00
Petr Skoda
2ba8f87a89
MDL-29322 instruct oracle to use current NLS char size when creating VARCHAR2 fields
...
This solves problems on servers with default configuration where VARCHAR2 sizes are specified in bytes. Also add more reserved words.
2011-09-16 08:51:09 +02:00
Petr Skoda
257ad88f89
MDL-29313 enforce varchar size limit
2011-09-16 08:49:42 +02:00
Petr Skoda
b2cfdcf697
MDL-29314 enforce index size limits
2011-09-16 08:45:06 +02:00
Rajesh Taneja
7dfe3c517b
MDL-25937 Forms Library: Added Javascript validation for filepicker and filemanager. Also fixed disbledif rule check for both
2011-09-16 09:17:20 +08:00
Rajesh Taneja
f03a17bb09
MDL-25937 Froms Library: Added server side validation for filepicker and filemanager
2011-09-16 09:17:19 +08:00
Petr Skoda
eb7d00a69a
Revert "MDL-29081 add support for proxy in TinyMCE GoogleSpell plugin"
...
This reverts commit 57638f2c05
.
2011-09-15 10:10:27 +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
Petr Skoda
f22cd93999
MDL-28455 bump up editor version file
2011-09-14 09:07:47 +02: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)
7cf7471100
Merge branch 'w36_MDL-29328_m22_adodb' of github.com:skodak/moodle
2011-09-13 17:28:43 +02: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
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
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
8d6540ffd1
Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle
2011-09-12 16:30:44 +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
016ba63816
MDL-23534 Added setting to set the site pages node to the sites shortname if desired
2011-09-12 13:46:04 +12:00
Sam Hemelryk
342e97ee9c
Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle
2011-09-12 13:42:28 +12:00
Petr Skoda
1ad8143a30
MDL-28595 explain the need to install into new db if something fails during the initial install
2011-09-11 00:07:28 +02:00
Petr Skoda
3efe6bbb88
MDL-28595 do not print continue link if install fails
2011-09-10 23:57:11 +02:00
Petr Skoda
57638f2c05
MDL-29081 add support for proxy in TinyMCE GoogleSpell plugin
2011-09-10 22:56:57 +02:00
Petr Skoda
3e48e0b009
MDL-28455 fix versions in readmes
2011-09-10 21:53:58 +02:00
Petr Skoda
ceef298f39
MDL-28455 remove previous TinyMCE version
2011-09-10 21:53:51 +02:00
Petr Skoda
2c2fc4ad75
MDL-28455 switch to new TinyMCE 3.4.5
2011-09-10 21:53:45 +02:00
Petr Skoda
fb916bf046
MDL-28455 import customised TinyMCE 3.4.5
2011-09-10 21:53:36 +02:00