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

673 commits

Author SHA1 Message Date
Bart Visscher
1fb5f96c37 Style fixes 2014-02-12 09:09:51 +01:00
Vincent Petry
c442a03d3a Merge pull request #7075 from owncloud/quota-storagexsendfile 
Added isLocal() method to storage, used for xsendfile
 2014-02-11 14:49:39 +01:00
Robin Appelman
50cc6a85e5 Add explicit sorting 2014-02-11 14:26:40 +01:00
Robin Appelman
a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac Merge branch 'master' into convert-oc_appconfig 2014-02-11 13:26:54 +01:00
Arthur Schiwon
af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon
32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon
20bfbb0fd9 wrong tld 2014-02-11 10:49:54 +01:00
Arthur Schiwon
82716ced48 sort following entries in alphabetical order 2014-02-11 10:49:41 +01:00
Arthur Schiwon
41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00
Bart Visscher
082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Vincent Petry
bea80ffe20 Merge pull request #6881 from owncloud/remove-user-storage-entry 
Also remove the user's home storage from the storage table when deleting a user
 2014-02-10 15:04:05 +01:00
Tom Needham
84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs 
[ocs API] getData() always needs to return an array
 2014-02-10 13:43:16 +00:00
Robin Appelman
753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Robin Appelman
5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Thomas Müller
45d07906b8 Merge pull request #7131 from owncloud/issue/6269 
Change MySQL to MariaDB/MySQL in the frontend
 2014-02-10 11:09:03 +01:00
Thomas Müller
8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed 
properly check if pdf and svg modules are installed
 2014-02-10 10:28:32 +01:00
Thomas Müller
8de9758fee Merge pull request #7071 from jcfischer/master 
close statement in MimeType detection is executed [#7069]
 2014-02-10 10:27:21 +01:00
Andreas Fischer
bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers 
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
 2014-02-08 14:21:19 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Joas Schilling
dbec143f09 Change MySQL to MySQL/MariaDB in the frontend 
Fix issue #6269
 2014-02-07 17:03:43 +01:00
Bjoern Schiessle
dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Robin Appelman
cd3ef0bb9d Add caching to appconfig 2014-02-07 14:03:39 +01:00
Thomas Müller
f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings 
change order of issubdirectory() calls to avoid error messages for non-apps
 2014-02-07 13:47:33 +01:00
Robin Appelman
b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Vincent Petry
788c8540aa Added isLocal() method to storage, used for xsendfile 
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
 2014-02-06 20:53:15 +01:00
Vincent Petry
be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support 
New user agent added for the Freebox.
 2014-02-06 18:12:32 +01:00
Vincent Petry
5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956 
fix issue with logging non utf8 chars
 2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Robin Appelman
1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt
0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Jens-Christian Fischer
11f46e121c close statement in MimeType detection is executed [#7069] 
close statement was never executed due to it being after a return
statement.
 2014-02-04 17:03:52 +01:00
Vincent Petry
bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix 
Allow getting info or renaming part files through WebDAV
 2014-02-04 07:48:37 -08:00
Morris Jobke
3c80071807 Merge pull request #4795 from owncloud/setup 
Move core setup code to controller class
 2014-02-04 06:04:21 -08:00
icewind1991
a27529709b Merge pull request #6647 from owncloud/memcache-public 
Add Memcache to the public api
 2014-02-04 05:38:53 -08:00
Georg Ehrke
d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Bjoern Schiessle
36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Björn Schießle
c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log 
wrap stat() call in a try/catch block
 2014-02-03 07:58:44 -08:00
Robin Appelman
0ae4022fb4 Also clean up the filecache table when deleting a storage entry 2014-02-03 16:36:21 +01:00
Robin Appelman
8d6a3a00b4 Revert "Use Cache->clear to cleanup the filecache for removed users" 
This reverts commit 5a5b6f187e.
 2014-02-03 16:29:04 +01:00
Bjoern Schiessle
cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle
44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bart Visscher
f1c60c7f8b Remove unused functions from OC_Helper 
init_var and init_radio  where only used in the installation template
 2014-01-31 17:33:15 +01:00
Bart Visscher
bca725dc32 Merge branch 'master' into setup 
Conflicts:
	core/setup.php
 2014-01-31 16:43:12 +01:00
Robin Appelman
0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Pellaeon Lin
099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg 
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
 2014-01-30 22:50:20 +08:00
Robin Appelman
4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt
f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons 
Add/fix Microsoft Office file icons.
 2014-01-29 07:31:25 -08:00
Bjoern Schiessle
229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Martial Saunois
0f1c587e6b The regexp of the Freebox user agent is now more strict. 
A new unit test has been added in consequence.
 2014-01-29 10:58:34 +01:00
Thomas Müller
ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions 
Added exception logger plugin for sabre connector
 2014-01-27 07:48:40 -08:00
Robin Appelman
3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Vincent Petry
11ef12a106 Added exception logger plugin for sabre connector 
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
 2014-01-27 11:40:17 +01:00
Martial Saunois
c2ed8d5aa1 New user agent added for the Freebox. 
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
 2014-01-26 18:46:09 +01:00
Robin Appelman
1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Robin Appelman
fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Otto Sabart
2f8ebd03b0 Add check for apc.enabled option 
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
 2014-01-24 15:52:28 +01:00
Vincent Petry
5ad28f4d1f Allow getting info or renaming part files through WebDAV 
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.

This fix leaves the file cache untouched but gives direct access to part
file info when requested.

This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.

Fixes #6068
 2014-01-23 18:42:56 +01:00
Andreas Fischer
96f194c0f6 Add icons for mdb and accdb files. 2014-01-23 03:06:14 +01:00
Andreas Fischer
47ea7704ca Fix icons for xml,ppt,dot,dotx files. 2014-01-23 02:46:05 +01:00
Andreas Fischer
689516ebd7 Remove duplicate mimetypes while keeping previous behaviour. 2014-01-23 02:23:20 +01:00
Andreas Fischer
6241655df4 Bring mimetype list into alphabetical order. 2014-01-23 02:15:42 +01:00
Robin Appelman
02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Robin Appelman
5a5b6f187e Use Cache->clear to cleanup the filecache for removed users 2014-01-22 13:00:45 +01:00
Robin Appelman
374e3475c9 Also remove the user's home storage from the storage table when deleting a user 2014-01-21 23:58:48 +01:00
Jörn Friedrich Dreyer
0dd54a1250 Merge pull request #6844 from owncloud/fix-css-loading-master 
Revert "use getAppWebPath() in here as well"
 2014-01-21 08:31:22 -08:00
Thomas Müller
262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Jörn Friedrich Dreyer
267e1f3c40 use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:41:10 +01:00
Thomas Müller
23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Thomas Müller
0f794b6889 Merge pull request #6820 from owncloud/phpunit-test-config 
Load a separate config (if present) when running unit tests
 2014-01-20 12:14:09 -08:00
Robin Appelman
3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Vincent Petry
62dd58aa19 Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix 
Fixed quota wrapper to not wrap failed fopen streams
 2014-01-20 05:29:27 -08:00
Thomas Müller
221e656e91 Revert "use getAppWebPath() in here as well" 
This reverts commit 6254f0a403.
 2014-01-20 10:10:34 +01:00
Thomas Müller
39be83ca8b Merge pull request #6676 from aseques/check_internet_proxy 
Fix internet detection to use OC_Util::getUrlContent
 2014-01-19 12:08:55 -08:00
Vincent Petry
1af7dab535 Fixed quota wrapper to not wrap failed fopen streams 
When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832
 2014-01-19 18:51:36 +01:00
Morris Jobke
3a2e03a7f0 Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps 
Fix activation of unknown apps
 2014-01-18 08:13:57 -08:00
Bjoern Schiessle
bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Robin Appelman
5cb08bb9cb Merge branch 'master' into fileinfo 
Conflicts:
	tests/lib/files/cache/cache.php
 2014-01-17 14:47:29 +01:00
Robin Appelman
6b4c3df087 Load a separate config (if present) when running unit tests 2014-01-17 14:40:48 +01:00
Robin Appelman
504645cf00 Add bindParam to statement wrapper 2014-01-16 14:07:16 +01:00
Thomas Müller
7f68497b39 error handling in case a requested app doesn't exists 2014-01-15 17:11:29 +01:00
Robin Appelman
729210daa0 Merge branch 'master' into memcache-public 
Conflicts:
	apps/user_ldap/lib/connection.php
 2014-01-15 13:02:15 +01:00
Thomas Müller
d4519125db Merge pull request #6744 from owncloud/fix_ocs_response_messages 
keep response message
 2014-01-15 03:17:24 -08:00
Vincent Petry
34559ef114 Merge pull request #6768 from owncloud/scanner-use-storage-mtime 
Use storage_mtime when determining if we can reuse cached data while scanning
 2014-01-15 01:31:33 -08:00
Robin Appelman
c01949ec0e Merge branch 'master' into fileinfo 2014-01-14 16:31:08 +01:00
Vincent Petry
c3a0b0d7f3 Merge pull request #6704 from owncloud/encryptedfoldersizecalc 
Fix calculated folder size to use unencrypted size
 2014-01-14 07:20:16 -08:00
Robin Appelman
203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
Robin Appelman
e706cf6c06 add Support for passing a FileInfo instance to View->putFileInfo 2014-01-13 15:57:49 +01:00
Robin Appelman
82762bb462 remove ArrayAccess, JsonSerializable from the public part of FileInfo 2014-01-13 15:13:45 +01:00
Robin Appelman
617acbd6f9 Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search 2014-01-13 14:28:49 +01:00
Bjoern Schiessle
6845860470 keep response message 2014-01-13 12:27:05 +01:00
st3so
a2cae551f3 fixing typo in redirection query string 2014-01-12 15:49:32 +01:00
Georg Ehrke
6f21da12e8 encode imagePath and fix documentation of loadFromFile 2014-01-11 12:07:28 +01:00
Joan
2abea96462 Disabled internet checking as mentioned when in proxy mode 2014-01-10 09:33:35 +01:00
Andreas Fischer
acd81f6c69 Readd support for memcached_server config variable. 2014-01-10 00:57:40 +01:00
Andreas Fischer
320353c237 Add support for multiple memcached servers. 2014-01-10 00:57:34 +01:00
Vincent Petry
4faba49f0a Fix calculated folder size to use unencrypted size 
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
 2014-01-09 17:47:50 +01:00
Vincent Petry
b24c21b00f Merge pull request #6687 from owncloud/sharing-fixpartfilehandling 
Removed special handling of part files in shared storage rename
 2014-01-09 06:16:43 -08:00
Robin Appelman
5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Thomas Müller
22bd69f75c set login name within apache auth backend 2014-01-09 10:28:24 +01:00