5a869732d1
adjust file type icon placement for when no preview can be generated
2014-01-29 15:28:57 +01:00
929c930b0a
Use $storageInfo['free']
2014-01-29 21:24:31 +08:00
58c7042e70
Added error message for when target folder was removed
...
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.
In the case of upload of multiple files, the upload is cancelled.
This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
609d5f2458
Merge pull request #6987 from owncloud/share_api_and_encryption
...
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
d310df505c
permanently show download action on mobile, only icon
2014-01-29 11:43:34 +01:00
8f81f007cd
fix horizontal scrollbar appearing when footer is too long, footer wraps now
2014-01-29 11:06:19 +01:00
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
e6f93fc841
Fix warnings in logs when renaming over the web UI
...
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.
This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
cd4e044f66
public upload is also possible with encryption enabled, since OC6
2014-01-28 17:28:20 +01:00
7f83f2a8f2
use more accurate error codes
2014-01-28 13:31:43 +01:00
0a77d41178
Merge pull request #6965 from owncloud/unused-free-space
...
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
b590f019f6
Remove unused $freeSpace
2014-01-27 16:51:32 +01:00
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
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
46745895ae
Merge pull request #5153 from owncloud/core-em-to-px
...
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
6fbc73e673
Merge pull request #5152 from owncloud/files-em-to-px
...
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
1d3da8b0ed
Merge pull request #6916 from owncloud/encryption_update_filecache
...
[encryption] update file cache after the file was written
2014-01-27 01:37:52 -08:00
2a0e8329f9
Fixes settings.css and converts more styles.
2014-01-26 03:02:52 +05:30
932e8f9f58
Fixes width of the dropdown menus as per computed styles.
2014-01-26 02:59:28 +05:30
c767ebcc03
fix multiselect bar being too short on big displays
2014-01-24 18:20:52 +01:00
dff2675efa
Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
...
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
6875e3d9c7
Merge pull request #6921 from owncloud/trash_mimetype_size
...
increase size of mimetype column
2014-01-24 07:05:18 -08:00
83878b9a7d
only update file cache with the unenecrypted size when the file was written
2014-01-24 16:01:00 +01:00
19675c2c9d
Fix variable name
2014-01-24 22:54:16 +08:00
1fe60e435e
Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
...
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
9f003a3546
Merge pull request #5954 from owncloud/extstorage-stream-sftp
...
[Ext storage] Now using SFTP stream wrapper from phpseclib
2014-01-24 06:20:23 -08:00
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
0671c58e36
Fixed filelist unit tests hidden params
...
Also added dummy table
2014-01-24 13:19:44 +01:00
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
4734146580
Fixed max upload size input field style
...
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00
617aa3cf29
Instead of 'No preview available for ...' we simple display the mieme-type icon
2014-01-23 20:15:10 +01:00
28b6434f46
increase size of mimetype column
2014-01-23 18:28:59 +01:00
799e744ad7
remove background and width from multiselect bar, fix Download button not showing on mobile
2014-01-23 15:35:30 +01:00
bf95532fb6
Removed unused writeBack method
2014-01-23 15:05:05 +01:00
f0c9e8205f
remove %webroot from files_sharing app
2014-01-23 14:04:13 +01:00
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
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
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +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
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
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
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
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
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01: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
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
f88360eba3
Merge pull request #6827 from rnveach/fix_6730
...
Fix 6730
2014-01-20 01:44:34 -08:00
f354717c4c
Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
...
Fixed isPreviewAvailable warnings in log
2014-01-19 04:48:12 -08:00
fea1cc82e8
Keep the EOF-Newline
2014-01-18 17:51:41 +01:00
9edbd142a2
Removes Bogus Styles.
2014-01-18 00:46:06 +05:30
a41440436c
added trigger to redo selection text on a directory change
2014-01-17 11:49:00 -05:00
90a41ef26a
fixed selector string and removed all checkbox if it was selected
2014-01-17 11:46:44 -05:00
f0a5007e9a
fix input element closing tag
2014-01-17 16:32:01 +01:00
b291fb9cd7
make sure there's enough room for the file actions
2014-01-17 15:47:26 +01:00
1df6bf997a
add link to documentation
2014-01-17 14:56:15 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00
f4c198b907
Fixed isPreviewAvailable warnings in log
...
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.
Fixes #6423
2014-01-17 14:22:05 +01:00
21d32d8a9e
Merge pull request #6810 from kofemann/for-upstream
...
webdav: return SPACE_UNKNOWN if server do not support quota
2014-01-17 04:09:53 -08:00
ec7c339930
Don't use is_array on FileInfo
2014-01-17 12:56:17 +01:00
4d4bbbda3a
Merge pull request #6807 from owncloud/enc_updated_description
...
updated description of the files encryption app
2014-01-17 03:54:09 -08:00
a78dc11732
webdav: return SPACE_UNKNOWN if server do not support quota
...
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-17 11:45:26 +01:00
6b69c52037
updated description of the files encryption app
2014-01-17 11:08:49 +01:00
4726a2021b
Add $freeSpace and $uploadLimit to files_sharing
2014-01-17 17:10:42 +08:00
4f593f99b6
Removes Bogus classes from previous commits.
2014-01-16 23:35:30 +05:30
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
12e5d0f68d
Fixes typos, adds ; wherever not present.
2014-01-16 21:06:14 +05:30
b7b83377c5
Fixes header going down in trash bin app.
2014-01-16 21:00:57 +05:30
d463edaf09
on mobile, show single shared image at full width without margin
2014-01-16 15:56:18 +01:00
5cdab5fff3
show publicly shared image on full width, without margin
2014-01-16 15:32:23 +01:00
c0590676a0
fix public share download button width
2014-01-16 15:28:39 +01:00
16033c8123
Merge pull request #6264 from owncloud/files-draggabledestroy
...
Fix to not destroy draggable when no draggable was set
2014-01-16 05:52:43 -08:00
6ec50e4b0c
Comments to clarify
2014-01-16 19:48:46 +08:00
2233aa2a04
Fixed files row height in Firefox/KDE
...
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.
This fix makes the checkbox absolute to prevent it to influence the row
height.
2014-01-16 12:05:05 +01:00
cd6ab29313
Use t() 's native method
2014-01-16 17:51:00 +08:00
fd49d3c5c5
Fixes typo in versions.css
2014-01-16 14:45:23 +05:30
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
f975fd5499
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
2014-01-16 14:23:39 +05:30
62040fe2d2
change em to px
2014-01-15 17:06:48 -05:00
bd643c47f3
Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix
...
Fixed Dropbox/Google storage async save call
2014-01-15 07:41:01 -08:00
5163e648f8
Merge pull request #6780 from owncloud/trash_bin_copy_recursively
...
copy files to owners trash recursively
2014-01-15 06:57:33 -08:00
3e7cf4110d
tweak color and position of username in public share
2014-01-15 15:49:42 +01:00
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
50ae2ab14c
add download button on single file share page
2014-01-15 15:31:27 +01:00
b3a6683784
remove unused js code and css rules
2014-01-15 15:22:40 +01:00
ce231c406d
no new menu on public upload
2014-01-15 15:07:52 +01:00
6c76b4ba12
fixing preview generation
2014-01-15 15:07:24 +01:00
807b885a0e
reuse file upload as used within files app - remove public upload button
2014-01-15 14:36:18 +01:00
592ae16603
remove old code
2014-01-15 14:35:17 +01:00
f4179a3f5a
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 14:29:33 +01:00
f11f65c6a5
copy files to owner trash recursively
2014-01-15 14:27:23 +01:00
d279ddd9a2
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
2014-01-15 13:36:14 +01:00
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
76fa7bab63
call getFileInfo to enforce a file cache entry for the new version, fix #6286
2014-01-15 11:37:47 +01:00
d8eac2b9bc
Merge branch 'master' into files-em-to-px
...
Conflicts:
apps/files/css/files.css
2014-01-15 14:59:50 +05:30
dbbbfee7de
Fix namespace
2014-01-15 12:36:27 +08:00
072ef7f010
remove min-width rule to fix mobile views
2014-01-14 22:14:46 +01:00
2bdd014f83
first mobile style rules, hide extra columns in files view and scroll header
2014-01-14 22:14:06 +01:00
8135828b2e
Fix to not destroy draggable when no draggable was set
...
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.
Fixes #6254
2014-01-14 19:17:23 +01:00
25fecb4f25
typo, grammar
2014-01-14 16:33:18 +01:00
097b6b8be9
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page
2014-01-14 16:33:09 +01:00
bb6bad6b3c
remove unused variables
2014-01-14 16:33:02 +01:00
e4b7c6ef10
LDAP: fix TLS detection
2014-01-14 16:32:55 +01:00
ab21c25e38
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
...
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
cb071a9f35
Merge pull request #6755 from owncloud/remove-ru_RU-master
...
remove ru_RU - it has bee removed from transifex
* owncloud/remove-ru_RU-master:
remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
1eb5ebd58c
Fixed timezone issue with SMB storage
...
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
5e04b7f284
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
...
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
97be32e2e8
modify js to move upload wrapper, modify css to match core values
2014-01-10 14:07:20 -05:00
9ebffd6635
remove extra upload controls
2014-01-10 14:03:55 -05:00
0802b662be
fix upload button layout
2014-01-10 12:20:31 -05:00
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
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
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
677d83d45f
LDAP: add tests for countUsers
2014-01-08 12:24:29 +01:00
53498bc876
remove unnecessary line
2014-01-08 12:20:56 +01:00
b669e1a3c1
LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search.
2014-01-08 12:07:57 +01:00
a8d20e0919
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
...
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
e2d739fa21
Merge pull request #6580 from monreal/master
...
Silence output of 'which' command used in smbclient detection
2014-01-05 04:32:30 -08:00
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
aaa48576ee
[tx-robot] updated from transifex
2014-01-04 01:55:57 -05:00
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
760fa9ea30
[tx-robot] updated from transifex
2013-12-31 01:55:42 -05:00
9ea9638490
[tx-robot] updated from transifex
2013-12-30 01:55:38 -05:00
e345f3f511
[tx-robot] updated from transifex
2013-12-29 01:55:36 -05:00
71c829f92a
[tx-robot] updated from transifex
2013-12-28 01:55:35 -05:00
f52a9e5e42
Silence output of 'which' command used in smbclient detection
2013-12-27 18:10:47 +01:00
64a001edab
[tx-robot] updated from transifex
2013-12-27 01:55:35 -05:00
dbfe313a63
[tx-robot] updated from transifex
2013-12-25 01:55:35 -05:00
6523960de9
Merge pull request #6554 from owncloud/fix_5982
...
fix preview for reshared file
2013-12-24 04:03:20 -08:00
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
c90e3e4f5b
fix preview for reshared file
2013-12-22 20:27:38 +01:00
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
cd26631a6d
[tx-robot] updated from transifex
2013-12-21 01:56:13 -05:00
371a476eb5
[tx-robot] updated from transifex
2013-12-20 01:57:49 -05:00
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
517a55a437
tests added
2013-12-19 19:43:57 +01:00
f0da7b20c1
Merge pull request #6517 from owncloud/fix_6510
...
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
552d0a6feb
check if the old owner and the old path is available
2013-12-19 18:40:40 +01:00
165542f27d
fix rename of shared files
2013-12-19 17:29:38 +01:00
06dec2632f
Merge pull request #6512 from owncloud/master-failingoracletests
...
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
079f1a6f41
Merge pull request #6495 from owncloud/enc_fseek_fallback
...
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
fe7fb66ef8
we can also have a path user/cache/...
2013-12-19 15:58:10 +01:00
963ee31efb
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
37cdbc3be0
[tx-robot] updated from transifex
2013-12-19 01:57:03 -05:00
df0c1fe7f3
add test for the stream wrapper to read encrypted files from the system folder /tmp
2013-12-18 17:07:35 +01:00
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
4f8ae789ae
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
2013-12-18 15:43:50 +01:00
d9668977cd
implement ftell stream wrapper and fix return value from fseek stream wrapper
2013-12-18 15:41:40 +01:00
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
ee2ecbe543
Merge pull request #6366 from owncloud/fix-6335
...
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
22a6bf9e5a
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
...
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
0b9f4130b0
clarifying license
2013-12-17 17:32:01 +01:00
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
c955381d56
fall back to getLocalFile if storage doesn't support fseek
2013-12-17 16:18:05 +01:00
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
c06844c374
Fix ```createCertificateBundle``` and ```getCertificates``` methods
...
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
2013-12-17 10:13:14 +01:00
b245e2e3d8
Fixing tab/space coding style
...
Only set SSL things when ```$this->secure``` is ```true```
2013-12-17 09:38:43 +01:00
753525c57f
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
...
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
3e17fbe30d
always show home breadcrumb in files view
2013-12-16 17:40:35 +01:00
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
Jan-Christoph Borchardt
Pellaeon Lin
Vincent Petry
Björn Schießle
Morris Jobke
VicDeo
Robin Appelman
Thomas Müller
raghunayyar
Jörn Friedrich Dreyer
icewind1991
Myles McNamara
kondou
rnveach
Tigran Mkrtchyan
Myles McNamara
Arthur Schiwon
Andreas Fischer
Michael Monreal
Georg Ehrke
Frank Karlitschek
Carlos Cerrillo