cb5811bcf5
backport from pull request #3863
2013-07-01 11:12:18 +02:00
7b0e3e6303
Merge branch 'master' of github.com:owncloud/core
2013-07-01 10:48:58 +02:00
d8b3aee24e
set default logo claim to ''
2013-07-01 10:48:26 +02:00
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
aead759f47
logo claim added
2013-07-01 10:48:02 +02:00
f622f35a1a
make mail footer aware of different themes
...
Conflicts:
lib/mail.php
2013-07-01 10:47:44 +02:00
68369ebb86
remove unneeded if condition
2013-07-01 10:46:49 +02:00
996b1e80c6
lib/defaults.php should only contain the default strings and read the other strings directly from the theme
2013-07-01 10:46:27 +02:00
87bbdc1ed9
check for updates only in the community edition
2013-07-01 10:46:16 +02:00
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
180faa24a1
Merge pull request #3857 from owncloud/enable_single_autotest
...
enable testing individual tests
2013-07-01 01:42:39 -07:00
b19033b353
Merge pull request #3223 from owncloud/fix-2820
...
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
80a8b9c995
[tx-robot] updated from transifex
2013-07-01 03:28:25 +02:00
121d3904c9
Merge pull request #3852 from owncloud/fixing-3830-master
...
session life time is now configurable and set to the same value
2013-06-30 14:41:51 -07:00
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
d051d6f925
make rmdir recursive for mappellocal storage backend
2013-06-30 17:44:49 +02:00
4d74e8955f
[tx-robot] updated from transifex
2013-06-30 02:13:07 +02:00
b28b6da4cd
Merge pull request #3897 from bantu/gitignore
...
gitignore: Make paths relative to repository root.
2013-06-29 14:48:34 -07:00
2c7549f17e
Merge pull request #2703 from owncloud/cleanup-setup
...
Cleanup OC_Setup
2013-06-29 14:47:29 -07:00
60eb63e35a
Fix review items
2013-06-29 21:15:06 +02:00
e93ce26f27
Fix found errors
2013-06-29 21:15:06 +02:00
42c44d5165
Fix OCI setupDatabase parameter
2013-06-29 21:15:06 +02:00
bf30e03048
Remove unsued parameter
2013-06-29 21:15:05 +02:00
6831b78597
Use db setup class for option validation
2013-06-29 21:15:05 +02:00
2faccaee0d
Change database creation to use array to select db setup class
2013-06-29 21:07:11 +02:00
e232907698
Convert database setup code to objects
2013-06-29 21:07:11 +02:00
a6d07cd512
Split database specific install/setup code to their own class
2013-06-29 21:07:11 +02:00
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
ae48e5b496
Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
...
Escape dropdown
2013-06-29 04:38:18 -07:00
0217315a24
Escape dropdown
...
Fixes #3241
2013-06-29 13:24:05 +02:00
414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
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
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
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
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00
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
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
67ed48d4c9
Merge pull request #3884 from owncloud/fixing-unittests-master
...
Fixing unittests master
2013-06-28 13:38:44 -07:00
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
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
89dc8be9f5
update to !==
2013-06-28 21:00:09 +02:00
a0d8377109
better unit tests for static stream wrapper
2013-06-28 19:59:04 +02:00
dc0ebe9007
fix is_file and is_dir for the static streamwrapper
2013-06-28 19:54:16 +02:00
156e72a0c4
add option to clear the files in the static streamwrapper
2013-06-28 19:41:28 +02:00
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
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
f726de3cab
for now we disable public upload in case encryption is enabled
2013-06-28 16:49:25 +02:00
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
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
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
Björn Schießle
Morris Jobke
Jenkins for ownCloud
Robin Appelman
Bart Visscher
Andreas Fischer
Lukas Reschke
icewind1991
Jörn Friedrich Dreyer