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

5657 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
3e2c56157b reduce width of searchbox on mobile, fix overlap, fix #7282 2014-02-20 11:33:46 +01:00
Vincent Petry
952584e9c7 Merge pull request #7195 from owncloud/files-selectall 
Do not send file list for select all on Download/delete
 2014-02-19 14:33:24 +01:00
Morris Jobke
bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2014-02-19 11:51:04 +01:00
Morris Jobke
f944707a15 fix wrong removes 2014-02-19 11:50:17 +01:00
icewind1991
2d5ab1a5c4 Merge pull request #7260 from owncloud/watcher-policy 
Allow setting the frequency of which the file watcher checks for updates
 2014-02-19 11:17:27 +01:00
Vincent Petry
e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo 
use a FileInfo object of the directory when generting the filelist
 2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
1e321406ee Merge pull request #7114 from owncloud/scrutinizer_documentation_patches 
polish documentation based on scrutinizer patches
 2014-02-19 07:04:37 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
icewind1991
3cc7228c7c Merge pull request #7253 from owncloud/preferences-caching 
Add caching to OC\Preferences
 2014-02-18 18:17:58 +01:00
Thomas Müller
8991e4505a Merge pull request #6796 from owncloud/statementwrapper-bindparam 
Add bindParam to the database statement wrapper
 2014-02-18 18:13:57 +01:00
Thomas Müller
1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps 
Remove usage of legacy OC_Appconfig
 2014-02-18 18:10:22 +01:00
Tom Needham
a573fe7d76 Merge pull request #6650 from owncloud/migration_unit_tests 
User migration fix, and basic unit test
 2014-02-18 17:35:49 +01:00
Lukas Reschke
3b1083f46e Merge pull request #7176 from owncloud/style 
Some style fixes
 2014-02-18 17:30:26 +01:00
tomneedham
0beaeed713 Remove unused variables 2014-02-18 16:28:04 +00:00
Robin Appelman
2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00
Robin Appelman
d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
Robin Appelman
ac2e3ab373 remove some unneeded isset's 2014-02-18 14:27:55 +01:00
Robin Appelman
2e97a4cd32 Fix some phpdoc 2014-02-18 14:26:27 +01:00
Robin Appelman
b6f44e9a1d Add caching to OC\Preferences 2014-02-18 11:21:39 +01:00
Thomas Müller
5d3fc03750 Merge pull request #7239 from owncloud/cbr-filetype-icon 
add cbr/cbz file type icon, fix #6953
 2014-02-18 10:23:54 +01:00
Jan-Christoph Borchardt
c2adf033f2 use file icon as fallback instead of application icon, fix #7237 2014-02-17 20:58:33 +01:00
Jan-Christoph Borchardt
0f434038a7 add cbr/cbz file type icon, fix #6953 2014-02-17 20:48:32 +01:00
tomneedham
a4b6d66703 Merge branch 'master' into migration_unit_tests 2014-02-17 11:03:57 +00:00
Thomas Müller
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
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Morris Jobke
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
Thomas Müller
41f0ad2d13 Merge pull request #7204 from owncloud/groupexists-duplicate 
Remove duplicate call to groupExists
 2014-02-14 21:53:03 +01:00
Robin Appelman
09502fcb36 remove the JsonSerializable interface from \OC\Files\FileInfo 2014-02-14 19:26:06 +01:00
icewind1991
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
Robin Appelman
b35f679483 Fix test cases for group manager 2014-02-14 15:07:08 +01:00
Robin Appelman
0ba0596341 remove duplicate call to groupExists 2014-02-14 14:25:45 +01:00
Georg Ehrke
f62f1658ce suppress error msg caused by php bug 2014-02-14 11:23:39 +01:00
Vincent Petry
d5397d813c Do not send file list for select all on Download/delete 
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
  with root
- Delete will send "allfiles" to the server that will find the file
  list or the passed directory by itself
 2014-02-13 20:28:52 +01:00
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Thomas Müller
4b84e3a7e8 Merge pull request #4624 from owncloud/convert-oc_appconfig 
Convert OC_Appconfig to object interface
 2014-02-13 15:51:40 +01:00
Bart Visscher
2c6411b897 $default of OC_Config::[gs]etValue can have more then string as type 2014-02-12 17:38:32 +01:00
icewind1991
7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse 
Reuse the calculated free_space in buildFileStorageStatistics
 2014-02-12 15:48:14 +01:00
Robin Appelman
d6576c640c Add unit tests for JobList 2014-02-12 13:52:13 +01:00
Robin Appelman
62288971ca Additional phpdoc 2014-02-12 13:32:16 +01:00
Robin Appelman
3aafa837b8 Remove internal methods from the public interface 2014-02-12 13:25:50 +01:00
Robin Appelman
60bd9d512d Merge branch 'master' into backgroundjob-public 2014-02-12 13:21:47 +01:00
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