c2adf033f2
use file icon as fallback instead of application icon, fix #7237
2014-02-17 20:58:33 +01:00
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
df282d9ef8
Merge pull request #7207 from owncloud/fileinfo-serializable
...
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
41f0ad2d13
Merge pull request #7204 from owncloud/groupexists-duplicate
...
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
09502fcb36
remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 19:26:06 +01:00
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
b35f679483
Fix test cases for group manager
2014-02-14 15:07:08 +01:00
0ba0596341
remove duplicate call to groupExists
2014-02-14 14:25:45 +01:00
f62f1658ce
suppress error msg caused by php bug
2014-02-14 11:23:39 +01:00
4b84e3a7e8
Merge pull request #4624 from owncloud/convert-oc_appconfig
...
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
d6576c640c
Add unit tests for JobList
2014-02-12 13:52:13 +01:00
62288971ca
Additional phpdoc
2014-02-12 13:32:16 +01:00
3aafa837b8
Remove internal methods from the public interface
2014-02-12 13:25:50 +01:00
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
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
50cc6a85e5
Add explicit sorting
2014-02-11 14:26:40 +01:00
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
32afdcbefe
Inject logger
2014-02-11 10:49:59 +01:00
20bfbb0fd9
wrong tld
2014-02-11 10:49:54 +01:00
82716ced48
sort following entries in alphabetical order
2014-02-11 10:49:41 +01:00
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
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
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
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
5ffc43cba0
Merge branch 'master' into remove-user-storage-entry
2014-02-10 13:53:01 +01:00
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
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
8de9758fee
Merge pull request #7071 from jcfischer/master
...
close statement in MimeType detection is executed [#7069 ]
2014-02-10 10:27:21 +01:00
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
dbec143f09
Change MySQL to MySQL/MariaDB in the frontend
...
Fix issue #6269
2014-02-07 17:03:43 +01:00
dc53c83e7b
getData() always needs to return an array
2014-02-07 16:38:15 +01:00
60cba9962d
Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files
...
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 14:49:22 +01:00
cd3ef0bb9d
Add caching to appconfig
2014-02-07 14:03:39 +01:00
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
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
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
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
5ab12a8b85
Merge pull request #6445 from owncloud/fix_5956
...
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
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
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
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
3c80071807
Merge pull request #4795 from owncloud/setup
...
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
d55ef442cd
properly check if pdf and svg modules are installed
2014-02-04 12:59:14 +01:00
36838b2837
add test for password remove method
2014-02-04 11:18:04 +01:00
Jan-Christoph Borchardt
Thomas Müller
Morris Jobke
Robin Appelman
icewind1991
Georg Ehrke
Vincent Petry
Arthur Schiwon
Tom Needham
Andreas Fischer
Joas Schilling
Bjoern Schiessle
Jens-Christian Fischer