wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12183 commits 157 branches 562 tags 714 MiB
Commit graph

12183 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
b28b6da4cd Merge pull request #3897 from bantu/gitignore 
gitignore: Make paths relative to repository root.
 2013-06-29 14:48:34 -07:00
Thomas Müller
2c7549f17e Merge pull request #2703 from owncloud/cleanup-setup 
Cleanup OC_Setup
 2013-06-29 14:47:29 -07:00
Bart Visscher
60eb63e35a Fix review items 2013-06-29 21:15:06 +02:00
Bart Visscher
e93ce26f27 Fix found errors 2013-06-29 21:15:06 +02:00
Bart Visscher
42c44d5165 Fix OCI setupDatabase parameter 2013-06-29 21:15:06 +02:00
Bart Visscher
bf30e03048 Remove unsued parameter 2013-06-29 21:15:05 +02:00
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
Andreas Fischer
4da9eaa4c7 gitignore: Make paths relative to repository root. 
Paths without the leading slash apply to all subdirectories, which especially
means that /tests/data is ignored, making it unnecessarily hard to add test
data.
 2013-06-29 16:33:42 +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
Victor Dubiniuk
13bfa3be27 Use svg to png fallback on demand only 2013-06-28 23:18:11 +03:00
Victor Dubiniuk
6ecbae7da9 Add fallback for svg app icons 2013-06-28 23:10:40 +03: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
Victor Dubiniuk
d110e60316 Hide a ghost image on the apps management page 2013-06-28 21:53:56 +03:00
Bart Visscher
c80e76720f Going from text to clob is not something we do. 
Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html
 2013-06-28 20:16:01 +02:00
Thomas Mueller
66e1eaac93 isError should detect a PEAR_Error even if the backend is PDO. 
This can happen on errors during schema migration - which is always done with MDB2
 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
4bbdd67a22 remove wrong check here 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
e62eb2e8d1 correctly handle error results of PDO and MDB2 backends 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
7b6fcddbc5 use executeAudited, add table name to assert message, skip schema changing test on oracle 2013-06-28 20:13:48 +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
Bart Visscher
22d759964f Use raw PathInfo for matching urls 2013-06-28 17:25:36 +02:00
Bart Visscher
8ca0a957ad Allow setting defaults and requirements for the api route 2013-06-28 17:25:10 +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
3b91ce695f session_life_time -> session_lifetime 
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
 2013-06-28 15:17:54 +02: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