20be58bfdc
Merge pull request #3888 from owncloud/ocs_api_fixes
...
Ocs api fixes
2013-07-03 12:33:04 -07:00
aa7d8edd14
Suppress warning in setup if config doesn't exist
2013-07-03 16:00:23 +02:00
690323092e
don't run hooks for .part files
2013-07-03 10:11:50 +02:00
04e4d9580f
if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal
2013-07-03 10:11:37 +02:00
4d4484fac1
Merge pull request #3870 from owncloud/reset_migration_status
...
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
fbdf46b76e
Merge pull request #3748 from owncloud/fixing-3740-master
...
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
2013-07-01 15:08:08 -07:00
7d7a2ce317
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
2013-07-01 23:51:43 +02:00
c777026506
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
...
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
bf901eb52f
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
...
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00
cb5811bcf5
backport from pull request #3863
2013-07-01 11:12:18 +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
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
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
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
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
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
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
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
e62eb2e8d1
correctly handle error results of PDO and MDB2 backends
2013-06-28 20:16:01 +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
8ca0a957ad
Allow setting defaults and requirements for the api route
2013-06-28 17:25:10 +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
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
125f9f4221
move storage wrappers to their own namespace
2013-06-28 15:34:25 +02:00
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
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
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
1edf01d09f
Fix usage of non existent consts
2013-06-28 11:15:25 +02:00
de93b21505
missing $
2013-06-27 23:14:32 +02:00
fb80cbd499
Fix review points
2013-06-27 22:01:52 +02:00
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
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
806f3bddec
increase size of preview to size of row
2013-06-26 18:19:13 +02:00
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
9b7efef39d
improve Image Provider
2013-06-26 14:28:40 +02:00
a98391b976
some minor improvements to preview lib
2013-06-26 11:18:53 +02:00
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
a06d901e37
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
...
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
59fa3055e1
Reviewed code for X-Sendfile2
...
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
3f20a080fe
Revert most changes for testing
2013-06-20 12:23:25 +03:00
372f261fe3
remove unnecessary exception handling
2013-06-20 10:50:53 +02:00
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
46f97f4c38
Implement X-Sendfile2 for resume support in LigHTTPd
...
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
fb67b45841
comment out old code
2013-06-19 13:41:01 +02:00
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
1fcbf8dd7a
implemenet getNoCoverThumbnail
2013-06-19 10:21:55 +02:00
4a480e4f53
Update user.php
...
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
cc478d2f48
use ppt icon instead of preview
2013-06-18 13:53:02 +02:00
bea4376fd4
remove opendocument.php
2013-06-18 11:04:08 +02:00
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
6082a0649c
stream first mb of movie to create preview
2013-06-17 12:27:26 +02:00
383e4c62b5
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
2013-06-17 00:02:42 +02:00
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
f10a4db889
scanner: give more percision about what data is reused during scanning
2013-06-14 16:58:14 +02:00
Bart Visscher
kondou
Björn Schießle
Björn Schießle
Thomas Müller
Robin Appelman
icewind1991
Jörn Friedrich Dreyer
Georg Ehrke
Roman Geber
Roland Hager
mvn23
blizzz
shkdee
Victor Dubiniuk