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

15800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Björn Schießle
0daabe5b6a Merge pull request #6898 from owncloud/encryption_infinite_loop 
[encryption] infinite loop on sharing
 2014-01-23 01:09:34 -08:00
Bjoern Schiessle
b489d6b0af fix infinite loop if folder and subfolder has the same name 2014-01-22 17:15:01 +01:00
Bjoern Schiessle
eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Björn Schießle
4474421ada Merge pull request #6890 from owncloud/version_fix_array_order 
[files_versions] fix array order
 2014-01-22 02:52:30 -08:00
Morris Jobke
cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar 
Fix public upload progress bar
 2014-01-22 02:28:28 -08:00
Bjoern Schiessle
a567f74d86 fix array order 2014-01-22 11:13:15 +01:00
Bjoern Schiessle
8d36ddcf03 code clean-up 2014-01-22 11:10:32 +01:00
Bjoern Schiessle
0b89a45f11 fix size calculation of getAllVersions() 2014-01-22 11:10:23 +01:00
Vincent Petry
9851727b0d Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master 
adding password protection check to getShareByToken()
 2014-01-21 11:08:58 -08:00
Thomas Müller
9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller
3b7fea25a3 Merge pull request #6863 from owncloud/versioning_expire_function_tests 
Versioning expire function tests
 2014-01-21 08:39:50 -08:00
Vincent Petry
91e66eeee1 Merge pull request #6868 from owncloud/enc-fixrandomfailunittest 
Replaced time() with uniqid() to make sure the file name is unique
 2014-01-21 08:35:41 -08: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
3a17220c9f Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master 
OC_Util::setupFS($user) will create a data dir for the given string - no...
 2014-01-21 07:36:30 -08:00
Vincent Petry
f09c19c316 Replaced time() with uniqid() to make sure the file name is unique 
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
 2014-01-21 16:31:58 +01:00
Bjoern Schiessle
85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle
9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller
c57c9eae76 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 16:01:24 +01:00
Thomas Müller
262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Thomas Müller
98415d68a5 Merge pull request #6864 from owncloud/protect-versions-preview-master 
don't use the user id within the versions preview call as it could be us...
 2014-01-21 06:16:22 -08:00
Thomas Müller
37e278f2a9 don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 13:50:56 +01:00
Thomas Müller
2e7fed1b9b Merge pull request #6861 from owncloud/neutral_download_zip_default_name 
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
 2014-01-21 04:19:26 -08:00
Thomas Müller
c9194f761f Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle 
user workaround to compare CLOB column with CHAR value
 2014-01-21 04:14:28 -08: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
a3ea5aa2ac fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 12:07:08 +01:00
Jörn Friedrich Dreyer
21832bc890 user workarount to compare CLOB column with CHAR value 2014-01-21 11:56:34 +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
6746ad0a73 in case no share is found for the given token we can return right away 2014-01-21 10:55:10 +01:00
Thomas Müller
9fd4cb1b66 adding password protection check to getShareByToken() 2014-01-21 10:42:47 +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
icewind1991
92d8db6f19 Merge pull request #6849 from owncloud/checkupdate-reuse 
Reuse the data retrieved from the cache in checkUpdate
 2014-01-20 10:37:18 -08:00
Vincent Petry
ee30977383 Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc 
When reading the size of "files" mountpoints need to be excluded
 2014-01-20 09:28:49 -08:00
Myles McNamara
9555305565 change publicUploadButtonMock to public_upload 
Changed jQuery selector for public preview to public_upload to correctly show preview
 2014-01-20 11:58:01 -05:00
Jörn Friedrich Dreyer
cdb7f40412 Merge pull request #6842 from owncloud/fix-quotes-again-master 
Quote column names on adding description
 2014-01-20 08:52:21 -08:00
Vincent Petry
ca57a849ff When reading the size of "files" mountpoints need to be excluded 
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
 2014-01-20 17:11:33 +01: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
Robin Appelman
164915a3f8 Move test config folder to tests/config 2014-01-20 13:41:52 +01:00
Morris Jobke
f88360eba3 Merge pull request #6827 from rnveach/fix_6730 
Fix 6730
 2014-01-20 01:44:34 -08:00
Thomas Müller
99e068761a adding a comment to the database schema 2014-01-20 10:17:31 +01: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
8e64909e99 Updating 3rdparty once more .... 2014-01-20 09:25:30 +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
Vincent Petry
f354717c4c Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix 
Fixed isPreviewAvailable warnings in log
 2014-01-19 04:48:12 -08:00
Morris Jobke
903b330ccc Merge pull request #6721 from tsumi/patch-1 
Added SVG fallback to apps settings popup
 2014-01-18 08:34:45 -08: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
Morris Jobke
419d2d27e8 Merge pull request #6818 from owncloud/add_documentation_to_appinfo 
Allow app developers to add documentation links to the appinfo
 2014-01-18 08:09:07 -08:00
rnveach
a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00