4b7dfd34f8
fix conflicts and add missing closing tag
2014-01-23 13:51:51 +01:00
809fb8482d
remove %webroot% from files app
2014-01-23 13:11:08 +01:00
25e9b7a742
add icons.css file, first step to get rid of %webroot%
2014-01-23 12:55:39 +01:00
421f24868a
Now using SFTP stream wrapper from phpseclib
...
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
2014-01-23 12:43:12 +01:00
0daabe5b6a
Merge pull request #6898 from owncloud/encryption_infinite_loop
...
[encryption] infinite loop on sharing
2014-01-23 01:09:34 -08:00
ade726ad32
focus link text only on click in the input field - closes #6817
2014-01-23 01:08:42 +01:00
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
b489d6b0af
fix infinite loop if folder and subfolder has the same name
2014-01-22 17:15:01 +01:00
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
4474421ada
Merge pull request #6890 from owncloud/version_fix_array_order
...
[files_versions] fix array order
2014-01-22 02:52:30 -08:00
cf6e79cda8
Merge pull request #6719 from tripflex/fix_pubup_progbar
...
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
a567f74d86
fix array order
2014-01-22 11:13:15 +01:00
8d36ddcf03
code clean-up
2014-01-22 11:10:32 +01:00
0b89a45f11
fix size calculation of getAllVersions()
2014-01-22 11:10:23 +01:00
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
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
3b7fea25a3
Merge pull request #6863 from owncloud/versioning_expire_function_tests
...
Versioning expire function tests
2014-01-21 08:39:50 -08:00
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
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
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
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
85269641db
add first unit test for the versioning app
2014-01-21 16:22:08 +01:00
9efd07fbab
isolate getExpireList function to make it testable
2014-01-21 16:22:08 +01:00
c57c9eae76
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 16:01:24 +01:00
262f221d11
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
2014-01-21 15:35:32 +01:00
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
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
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
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
267e1f3c40
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 12:41:10 +01:00
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
21832bc890
user workarount to compare CLOB column with CHAR value
2014-01-21 11:56:34 +01:00
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
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
f29bd1cb0b
adding code coverage support
2014-01-21 00:57:18 +01:00
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
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
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
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
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
4ec6debe2b
remove unused variable
2014-01-20 17:27:03 +01:00
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
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
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
164915a3f8
Move test config folder to tests/config
2014-01-20 13:41:52 +01:00
f88360eba3
Merge pull request #6827 from rnveach/fix_6730
...
Fix 6730
2014-01-20 01:44:34 -08:00
99e068761a
adding a comment to the database schema
2014-01-20 10:17:31 +01:00
221e656e91
Revert "use getAppWebPath() in here as well"
...
This reverts commit 6254f0a403
2014-01-20 10:10:34 +01:00
8e64909e99
Updating 3rdparty once more ....
2014-01-20 09:25:30 +01:00
Morris Jobke
Jan-Christoph Borchardt
Vincent Petry
Björn Schießle
Thomas Müller
Jörn Friedrich Dreyer
icewind1991
Myles McNamara
Robin Appelman