Sam Hemelryk
a7cd1f5a53
Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle
2012-03-27 11:03:19 +13:00
Sam Hemelryk
5dc1a544ea
Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle
2012-03-27 10:05:43 +13:00
Sam Hemelryk
c194925278
Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle
2012-03-27 09:51:40 +13:00
Eloy Lafuente (stronk7)
9ee910e69c
MDL-32112 mysql: change rename sql generator to pass validation
2012-03-26 19:57:58 +02:00
Eloy Lafuente (stronk7)
43616f61f1
Merge branch 'w13_MDL-32112_m23_dbman' of git://github.com/skodak/moodle
2012-03-26 19:40:58 +02:00
Petr Skoda
68a7c9a696
MDL-32095 some more E_STRICT fixes
2012-03-26 11:47:15 +02:00
Dan Poltawski
9efaab4949
Merge branch 'MDL-32176' of git://github.com/timhunt/moodle
2012-03-26 09:35:49 +08:00
Rajesh Taneja
4d6f9478ed
MDL-31903 course: Title on highlight and hide icon should be only added in ie
2012-03-26 11:44:50 +13:00
Rajesh Taneja
618c155a24
MDL-31903 course: Highlight icon will get iniatlised properly
2012-03-26 11:44:50 +13:00
Rajesh Taneja
f753887155
MDL-31903 course: update patch to fix course highlight icon and title toggle
2012-03-26 11:44:50 +13:00
Juho Viitasalo
730477a878
MDL-31903 course: Fixed course highlight icon and title toggle
2012-03-26 11:44:16 +13:00
Sam Hemelryk
991b3a3a9b
Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
2012-03-26 11:13:54 +13:00
Sam Hemelryk
75e5bd51ea
Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle
2012-03-26 10:35:48 +13:00
Petr Skoda
436b961381
MDL-32112 use constants for field and table limits
...
For now using the same JS hardcoding trick Eloy did the last time...
2012-03-24 11:45:36 +01:00
Petr Skoda
7fd31fe86c
MDL-32112 horrible hack that ignores invalid size for XMLDB_TYPE_NUMBER in numerical question type
...
The easies fix could be to use VARCHAR instead because this field is used only for reading and writing, no selects on this field it seems.
2012-03-24 11:40:15 +01:00
Petr Skoda
d3232735ee
MDL-32112 validate float definition in sql_generator
2012-03-24 11:40:15 +01:00
Petr Skoda
54e71a43ba
MDL-32112 validate number definition in sql_generator
2012-03-24 11:40:15 +01:00
Petr Skoda
720d605e61
MDL-32112 validate integer definition in sql_generator
2012-03-24 11:40:15 +01:00
Petr Skoda
f9090b195b
MDL-32112 validate table name restrictions in sql_generator
2012-03-24 11:40:15 +01:00
Petr Skoda
6cfade8f5a
MDL-32112 validate field name restrictions in sql_generator
2012-03-24 11:40:14 +01:00
Petr Skoda
f0bf9ffeaa
MDL-31685 new setting for prevention of file based locking
...
Please note that this setting can not be stored in database because some scripts use ABORT_AFTER_CONFIG.
2012-03-24 11:37:13 +01:00
Petr Skoda
62cd8cd9f5
MDL-32029 fix get_tables() when prefix empty in external database
2012-03-24 11:36:01 +01:00
Petr Skoda
3f0fe2b820
MDL-32109 migrate tests to PHPUnit
2012-03-24 11:33:59 +01:00
Petr Skoda
986f8ea285
MDL-32109 do not use HTMLPurifier for some safe and valid html fragments
2012-03-24 11:29:59 +01:00
Tim Hunt
1851b00b07
MDL-32176 formslib: allow {no} in repeat_element default values.
2012-03-23 15:22:41 +00:00
Ankit Agarwal
af572078cf
MDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in
...
require_login
2012-03-23 14:40:35 +08:00
Dan Marsden
dbdc735559
MDL-32147 - use correct 404 for server type
2012-03-23 10:01:04 +13:00
Ruslan Kabalin
70ad827c6c
MDL-11378 Add SMTP security protocol setting to email configuration
2012-03-22 15:29:17 +00:00
Ruslan Kabalin
43798a4efa
MDL-32026 messaging: Fix non-existing variable in the error output
2012-03-22 15:12:40 +00:00
Sam Hemelryk
7aea08e1b0
MDL-31857 phpunit: PHPDoc and typo fixes during integration
2012-03-22 10:45:17 +13:00
Sam Hemelryk
3222f6eca1
Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle
2012-03-22 10:44:04 +13:00
Petr Skoda
5bd4040866
MDL-31857basic phpunit support
...
Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.
2012-03-21 10:31:37 +01:00
Dan Poltawski
727dac2f34
Merge branch 'wip-MDL-27236-master' of git://github.com/marinaglancy/moodle
2012-03-21 14:51:40 +08:00
Marina Glancy
e2652f1a31
MDL-27236: Server files, improve tree view
...
- Removed 'Private files' from 'Server files' repository;
- Show only non-empty directories (taking into account filetype filter);
- If there is only one non-empty filearea within a module, do not show it and skip the extra subdirectory level;
- If the user is not admin (does not have 'moodle/course:update' capability in system context), do not show course categories, just list available courses;
- Also when retrieving the course files capability to managefiles is checked before retrieving the modules list for performance tuning on sites with a lot of courses
2012-03-21 13:55:22 +08:00
Dan Poltawski
0a4660484c
Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle
...
Conflicts:
mod/scorm/version.php
mod/scorm/db/upgrade.php
2012-03-21 11:38:09 +08:00
Dan Poltawski
19526d915a
MDL-29515 lib/upgrade.txt: add a note about removed methods
2012-03-21 09:31:38 +08:00
Dan Poltawski
d68c62fe12
Merge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle
2012-03-21 09:25:47 +08:00
Aaron Barnes
94db27498d
MDL-27469 scorm: Add extra activity completion conditions
2012-03-21 09:48:38 +13:00
Sam Hemelryk
23dfb50687
Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle
2012-03-21 09:20:29 +13:00
Dan Poltawski
149da7724b
Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle
2012-03-20 16:40:28 +08:00
Petr Skoda
c2daa41a2e
MDL-32094 fix duration test
2012-03-20 09:22:29 +01:00
Sam Hemelryk
ef844d0a15
Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle
2012-03-20 16:47:17 +13:00
Aparup Banerjee
b36135b66a
Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle
2012-03-20 10:09:43 +08:00
Sam Hemelryk
9340d834f3
Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle
2012-03-20 12:50:21 +13:00
Sam Hemelryk
e2edc82058
Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle
2012-03-20 12:12:44 +13:00
Sam Hemelryk
f40400b91e
Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle
2012-03-20 12:06:07 +13:00
Sam Hemelryk
fab344f54b
Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle
2012-03-20 11:46:00 +13:00
Sam Hemelryk
6f3570ffec
MDL-19125 upgrade: Fixed assignment typo
2012-03-20 10:34:30 +13:00
Sam Hemelryk
2cd97ff3c5
Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle
2012-03-19 20:16:34 +13:00
Sam Hemelryk
96e7855298
MDL-31528 navigation: Fixed up missing break and optimised category.php
2012-03-19 19:32:15 +13:00
