Commit graph

11992 commits

Author SHA1 Message Date
Bart Visscher
6831b78597 Use db setup class for option validation 2013-06-29 21:15:05 +02:00
Bart Visscher
2faccaee0d Change database creation to use array to select db setup class 2013-06-29 21:07:11 +02:00
Bart Visscher
e232907698 Convert database setup code to objects 2013-06-29 21:07:11 +02:00
Bart Visscher
a6d07cd512 Split database specific install/setup code to their own class 2013-06-29 21:07:11 +02:00
Bart Visscher
ae48e5b496 Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
Escape dropdown
2013-06-29 04:38:18 -07:00
Lukas Reschke
0217315a24 Escape dropdown
Fixes #3241
2013-06-29 13:24:05 +02:00
Bart Visscher
414b5f150e Merge pull request #2914 from Kondou-ger/label_overlapping_value
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
Bart Visscher
bd3e266408 Merge pull request #3688 from roha4000/fix_upload_max_filesize
upload_max_filesize = 0 not possible if post_max_size is not 0
2013-06-29 04:07:34 -07:00
Bart Visscher
d699ee9845 Merge pull request #3635 from owncloud/storage-wrapper
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
Bart Visscher
68c0d54568 Merge pull request #3268 from owncloud/convert-oc_log
Convert OC_Log to object so it can be used for DI
2013-06-29 03:38:56 -07:00
Jenkins for ownCloud
d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00
Thomas Müller
dfa6aa25c3 Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
for now we disable public upload in case encryption is enabled
2013-06-28 13:59:33 -07:00
Morris Jobke
c2ac0fb4df Merge pull request #3881 from owncloud/archive_tar_php5.5
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 13:41:18 -07:00
Morris Jobke
67ed48d4c9 Merge pull request #3884 from owncloud/fixing-unittests-master
Fixing unittests master
2013-06-28 13:38:44 -07:00
icewind1991
30a403e327 Merge pull request #3892 from owncloud/static-streamwrapper
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
Bart Visscher
e3df2b8c87 Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
Bart Visscher
89dc8be9f5 update to !== 2013-06-28 21:00:09 +02:00
Robin Appelman
a0d8377109 better unit tests for static stream wrapper 2013-06-28 19:59:04 +02:00
Robin Appelman
dc0ebe9007 fix is_file and is_dir for the static streamwrapper 2013-06-28 19:54:16 +02:00
Robin Appelman
156e72a0c4 add option to clear the files in the static streamwrapper 2013-06-28 19:41:28 +02:00
Jörn Friedrich Dreyer
f3c4a37a78 Merge pull request #3832 from owncloud/oracle_sql_fixes
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Robin Appelman
a7c70915d5 fix storage wrapper namespaces 2013-06-28 18:18:12 +02:00
Thomas Mueller
f726de3cab for now we disable public upload in case encryption is enabled 2013-06-28 16:49:25 +02:00
Jörn Friedrich Dreyer
7d3490036c Merge pull request #3838 from rgeber/master
Public Upload Feature
2013-06-28 07:30:41 -07:00
Bart Visscher
b1a2ddd149 Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Müller
3bedb09753 Merge pull request #3843 from owncloud/sabre-exceptions
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
Bart Visscher
6ad7a0336f Oracle doesn't know & as bitwise AND
Conflicts:
	lib/public/share.php
2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221 move storage wrappers to their own namespace 2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c Merge pull request #3865 from owncloud/fix_test_for_oracle
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
Thomas Mueller
de66861ef1 make phpunit happy - adding asserts 2013-06-28 15:13:57 +02:00
Bart Visscher
df9e56efd0 Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
Thomas Mueller
3abeb252d8 make PHPUnit happy and add asserts 2013-06-28 14:37:52 +02:00
Thomas Mueller
42cb77b982 TimedJob: make PhpUnit happy with asserts 2013-06-28 13:24:24 +02:00
Bart Visscher
7f3ddd4341 Skip Test_Archive_TAR in php 5.5 for now 2013-06-28 11:30:47 +02:00
Bart Visscher
1edf01d09f Fix usage of non existent consts 2013-06-28 11:15:25 +02:00
Jenkins for ownCloud
6127fee5aa [tx-robot] updated from transifex 2013-06-28 02:04:58 +02:00
Thomas Mueller
de93b21505 missing $ 2013-06-27 23:14:32 +02:00
Jörn Friedrich Dreyer
df43ddb902 Merge pull request #3872 from bantu/phpunit-xml-dist
Use phpunit.xml.dist instead of phpunit.xml ...
2013-06-27 13:07:42 -07:00
Bart Visscher
fb80cbd499 Fix review points 2013-06-27 22:01:52 +02:00
Bart Visscher
2eaad58922 Make the object drive the logging backend
This is the other way around then it was.
2013-06-27 20:10:54 +02:00
Thomas Tanghus
be22d28eb9 Merge pull request #3576 from owncloud/jquery.multiselect-1.13
Update to jquery.multiselect 1.13
2013-06-27 07:50:47 -07:00
Andreas Fischer
2269145b4d gitignore: Fix typo + adjust comment format. 2013-06-27 16:50:17 +02:00
Andreas Fischer
d015b9219c PHPUnit: Add tests/phpunit.xml to gitignore. 2013-06-27 16:44:55 +02:00
Andreas Fischer
121e4ca395 PHPUnit: Allow developers to use their own custom phpunit.xml file.
The order of precedence of configuration files for PHPUnit is:
 - phpunit.xml (allowing custom user defined configuration)
 - phpunit.xml.dist (configuration distributed with the software)
2013-06-27 16:31:31 +02:00
Jörn Friedrich Dreyer
45c897acf3 one if less 2013-06-27 13:13:49 +02:00
Thomas Müller
aa7403500f Merge pull request #3847 from bantu/phpunit-json-listener-removal
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console
2013-06-27 01:55:57 -07:00
Jenkins for ownCloud
29caae3491 [tx-robot] updated from transifex 2013-06-27 02:12:00 +02:00
Roman Geber
da0caadf4e Added file-upload to GIT repo
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00
Jörn Friedrich Dreyer
5d51118cb2 fix type of numeric columns 2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b check item id is set 2013-06-26 19:57:28 +02:00