090478a95e
if possible, getUserGroups should get memberships using memberOf virtual attribute
2015-06-03 17:38:27 +02:00
a90a84b0a7
Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
...
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
91841bb25d
Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits.
2015-06-03 15:23:37 +02:00
263bb46ff8
Catch exceptions in files ajax calls
2015-06-03 14:31:58 +02:00
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
61356b5560
Keep versions when deleting as recipient
...
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.
This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
1cccb227c3
Merge pull request #16686 from owncloud/show_cloud_id
...
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
5a38964218
Merge pull request #16629 from owncloud/files-renametoreservedname
...
Check target name on rename with web UI
2015-06-01 11:07:08 +02:00
88ee082115
Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
...
Fix files_external l10n
2015-06-01 09:11:21 +02:00
b1ac538679
[tx-robot] updated from transifex
2015-06-01 01:54:54 -04:00
8d23b34402
[tx-robot] updated from transifex
2015-05-31 01:54:44 -04:00
80d4309669
Fix files_external l10n
...
* current l10n..pl script can't extract JS functions that are within a handlebars
template - therefore they are duplicated until the script is fixed
2015-05-30 14:00:52 +02:00
a3bc112412
[tx-robot] updated from transifex
2015-05-30 01:55:46 -04:00
13617c8bf1
Check target name on rename with web UI
...
When renaming over the web UI, check early that the target name is
valid.
This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
2015-05-29 19:30:09 +02:00
01a241f711
Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
...
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
9a6d253af3
Abort expiration when file is gone
...
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.
This prevents showing useless warnings in the log and simply bail out.
2015-05-29 13:15:12 +02:00
c700f42b68
Merge pull request #16517 from owncloud/remove-logo-wide
...
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
f084eb07f2
Missing translation in ldap part.wizard-server.php
2015-05-29 10:50:02 +02:00
fff0fb66d6
[tx-robot] updated from transifex
2015-05-29 01:56:13 -04:00
b95ebb76e5
Merge pull request #16607 from owncloud/ie9-textpreviewfallback
...
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
863139c1e2
Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end
...
Make string 'SFTP with secret key login' translateable
2015-05-28 20:42:08 +02:00
29c68a4e61
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 17:59:43 +02:00
2daef7c7dc
Fallback to picture preview for IE <= 9
...
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.
So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
2015-05-28 15:36:28 +02:00
e1483f65c3
Merge pull request #16591 from owncloud/enc_improved_error_message
...
improved error message for various states
2015-05-28 10:55:53 +02:00
1726d84e73
[tx-robot] updated from transifex
2015-05-28 01:55:22 -04:00
68db3059ee
detect migration status
2015-05-27 21:00:02 +02:00
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
cdbf472c4d
Make string 'SFTP with secret key login' translatable
2015-05-27 15:38:05 +02:00
fda0995e4c
[tx-robot] updated from transifex
2015-05-27 01:55:34 -04:00
9366dde875
Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
...
[enc2] fix references to legacy encryption app name
2015-05-26 17:28:27 +02:00
39c6a36488
Merge pull request #16532 from owncloud/cors-no-cookie-auth
...
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
6198fb20cb
[tx-robot] updated from transifex
2015-05-26 01:54:57 -04:00
fe610a65d3
[tx-robot] updated from transifex
2015-05-25 01:55:06 -04:00
06934e7c00
[tx-robot] updated from transifex
2015-05-24 01:55:03 -04:00
e189435499
[tx-robot] updated from transifex
2015-05-23 01:55:05 -04:00
41a8f45b93
OCS Share API link shares now always have an url
...
To make sure clients have the correct and latest link add an url field
to all OCS Share API return statements on public link shares.
* Added unit tests
2015-05-22 14:42:57 +02:00
c8e3599cad
disallow cookie auth for cors requests
...
testing ...
fixes
fix test
add php doc
fix small mistake
add another phpdoc
remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00
156881efce
[tx-robot] updated from transifex
2015-05-22 01:55:04 -04:00
78a0464354
replace logo-wide on share page as well with better icon + text
2015-05-22 00:04:47 +02:00
42dd40ad80
[tx-robot] updated from transifex
2015-05-21 01:55:57 -04:00
d560d1ef2a
Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews
...
Restore min-height for single previews
2015-05-20 16:48:27 +02:00
39d1e99228
Merge pull request #16322 from owncloud/trash-view
...
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
1a67e5cdc3
Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled
...
Return 401 when accessing public webdav and s2s is disabled
2015-05-20 14:28:45 +02:00
13ab251c6d
Restore min-height for single previews
2015-05-20 14:09:31 +02:00
7386257676
Merge pull request #16075 from owncloud/skeleton-copy-delay
...
wait with copying the skeleton untill login and setupfs are done
2015-05-20 13:52:08 +02:00
f2a900e04c
Return 401 when accessing public webdav and s2s is disabled
2015-05-20 12:19:03 +02:00
3a4568313f
Merge pull request #16326 from owncloud/fix-16192
...
include base dn test in functionality test
2015-05-20 12:12:52 +02:00
0d78ebf6cd
Merge pull request #16444 from owncloud/close-new-dropdown
...
Closes "New" dropdown when switching category
2015-05-20 11:15:21 +02:00
9be6d8cd39
Merge pull request #16446 from owncloud/fix-url-generation
...
Fix URL generation
2015-05-20 08:20:38 +02:00
c49a06a684
[tx-robot] updated from transifex
2015-05-20 01:56:19 -04:00
f9d04f62a8
Merge pull request #16440 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
f7a2b5e7a9
Added unit tests for download URL in public sharing page
2015-05-19 17:41:06 +02:00
f59576c3ca
Merge pull request #16447 from owncloud/fix-minor-code-problems
...
Fix unexisting class and broken doc
2015-05-19 16:23:36 +02:00
d3d70e5d90
Re-add use statement
2015-05-19 16:15:00 +02:00
d832c4ae23
Fix unexisting class and broken doc
2015-05-19 15:27:50 +02:00
07483033c1
Fix URL generation
...
`params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does.
This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters.
Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with 58a87d0babhttps://github.com/owncloud/core/pull/15652 .
Without this fix downloading single files from a public shared folder is not possible.
2015-05-19 15:12:08 +02:00
581227324a
Closes "New" dropdown when switching category
...
* fixes #16394
* return false - stops all following event callbacks
2015-05-19 14:47:13 +02:00
733784ae41
cleanup move/copy logic in trash
2015-05-19 14:22:09 +02:00
fdbc21fc6c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
76dfc87227
add primary group users to resultset before caching
2015-05-19 12:56:07 +02:00
6b218039ba
Fixes returns of group memberships and counting if all members have the specific groups as primary set.
2015-05-19 12:56:07 +02:00
6d97dfb00c
Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user.
2015-05-19 12:38:03 +02:00
d90b83725f
Merge pull request #16085 from owncloud/encryption-module-rename
...
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
9e0cb4460e
Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav
...
Show a empty response for GET on non-files instead of the Browser Plugin
2015-05-19 10:54:11 +02:00
68a593a667
Merge pull request #16181 from owncloud/fix-15982
...
catch unallowed anonymous auth attempt and show specific error
2015-05-19 10:36:35 +02:00
313994a33d
[tx-robot] updated from transifex
2015-05-19 01:55:35 -04:00
cdb0689334
handle unallowed auth exception on port detection
2015-05-18 18:14:05 +02:00
5a56393657
throw exception on LDAP error 1, which we usually do not see and is pretty generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint.
2015-05-18 18:14:05 +02:00
b9e5309757
catch unallowed anonymous auth attempt and show specific error
2015-05-18 18:14:05 +02:00
8f1a609512
adjust test
2015-05-18 17:16:13 +02:00
89959a856c
fix target path for move
2015-05-18 17:16:13 +02:00
a0854b36f0
update cache after move to trash
2015-05-18 17:16:13 +02:00
b70e1ffc6d
dont go trough the view when moving to trash
2015-05-18 17:16:12 +02:00
7d2666699b
removing encryption preview check
2015-05-18 09:47:46 -04:00
d557519746
removing deletion of encryption keys
...
this will be handled in the wrapper now
2015-05-18 09:47:46 -04:00
30d165ebf2
Add missing import for the exception
2015-05-18 15:45:47 +02:00
a0c6c01137
fix references to legacy encryption app name
2015-05-18 09:45:41 -04:00
4444db61b7
Add a unit test for the decrypt method
2015-05-18 15:45:11 +02:00
7676166254
add l10n to constructor
2015-05-18 15:43:53 +02:00
86cf8e1f68
Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
...
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
7d492fefae
also encrypt files in trash bin
2015-05-18 12:51:47 +02:00
5899b7b6ea
Fix provisioning API unit tests for login
...
Properly login the user every time to make sure their FS is properly
setup.
2015-05-18 12:28:54 +02:00
724f88d9ff
fix tests
2015-05-18 12:11:32 +02:00
415f16eb24
fix tests
2015-05-18 12:11:31 +02:00
dd3d0194a6
Move files sharing app (mostly) to OCP\DB
2015-05-18 11:06:23 +02:00
be8d0a08ec
Move away from private static deprecated functio
2015-05-18 11:03:48 +02:00
7a8072e958
Move core apps from OC_Log::write to OCP\Util
2015-05-18 10:57:52 +02:00
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
73a3086945
[tx-robot] updated from transifex
2015-05-18 01:54:58 -04:00
16c320df26
[tx-robot] updated from transifex
2015-05-17 01:55:56 -04:00
744a9f2c78
[tx-robot] updated from transifex
2015-05-16 01:54:47 -04:00
246000f799
Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
...
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
8e61ad0872
Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection
...
throw exception when LDAP Connection was lost
2015-05-15 17:32:07 +02:00
03e26a0fbe
Merge pull request #16337 from owncloud/versions-expireforowner
...
Use owner when expiring versions, not the logged in user
2015-05-15 15:02:26 +02:00
f86699cd48
Fix restoring files from trash with unique name
...
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.
Also fixed the restore() method to return false if the file to restore
does not exist.
Added unit tests to cover restore cases.
2015-05-15 12:42:27 +02:00
f8a4cc0284
Added unit tests for versions storing
2015-05-15 12:24:34 +02:00
e1923bac07
Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
...
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
49c4ee98b4
[tx-robot] updated from transifex
2015-05-15 01:54:49 -04:00
e0a136d344
Show a empty response for GET on non-files instead of the Browser Plugin
...
As discussed in https://github.com/owncloud/core/pull/14151 , we missed to add this to the `files_sharing` S2S public WebDAV backend though.
2015-05-14 14:02:32 +02:00
1596a1fd32
[tx-robot] updated from transifex
2015-05-14 01:54:47 -04:00
ccbefb6e75
delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories
2015-05-13 19:06:23 +02:00
033b3dac92
Use owner when expiring versions, not the logged in user
2015-05-13 18:40:35 +02:00
2bf92e0a43
include base dn test in functionality test
2015-05-13 16:21:50 +02:00
5941e826b8
Merge pull request #16284 from owncloud/shared-storage-view
...
dont go trough the view when renaming/copying on shared storages
2015-05-13 10:37:04 +02:00
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
3b1dde7005
dont go trough the view when renaming/copying on shared storages
2015-05-12 17:09:37 +02:00
44091a1a12
Merge pull request #16277 from owncloud/fix-15971
...
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
46e4d8818c
Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view
...
Enable file icons & previews in "Shared ..." categories
2015-05-12 15:17:43 +02:00
acafc8ca46
remove superflous button. fixes #15971
2015-05-12 14:54:05 +02:00
beb6a38d85
Added rmdir to trashbin storage wrapper
...
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().
This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 -04:00
20d2d8d3dd
Merge pull request #15881 from owncloud/share-moveversionsproperly
...
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
90d8e4bc00
Merge pull request #15815 from owncloud/unshare-etag-propagate
...
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
f057efc42e
Merge pull request #16213 from cmeh/patch-5
...
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 -04:00
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 -04:00
6441721626
Grammar, removal of line break
...
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 -04:00
90611e6594
only use memcache, if available
2015-05-08 13:27:27 +02:00
4a450c9d0d
improved admin settings
2015-05-08 11:41:38 +02:00
e4c05acf94
Merge pull request #16170 from owncloud/fix-15621
...
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
dfd451777c
Merge pull request #16183 from owncloud/fix-16147
...
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
1fbf9c3d71
Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
...
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
ff0faacf0b
[tx-robot] updated from transifex
2015-05-08 01:54:52 -04:00
f2d23d7f02
check optional parameter before using it, fixes #16147
2015-05-07 22:18:29 +02:00
15d134124b
Validate the quota value to be a correct value
2015-05-07 17:56:13 +02:00
2b092f2e93
Add a test for getting the versions of an empty path
2015-05-07 16:02:35 +02:00
57e8b76f48
drop global file cache support, fixes #15621
2015-05-07 14:52:44 +02:00
05fe2006ee
Do not run method when the path is empty
2015-05-07 14:31:21 +02:00
12b24ee567
Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
...
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 -04:00
b1713b2f75
Enable file icons & previews in "Shared ..." categories
...
* sharing API returns now the mimetype icon path
* file previews are now lazyloaded by default (as the doc says)
* fixes #16086
2015-05-06 18:32:52 +02:00
71e6644ec8
fix filter index on selected groups is updated too early
2015-05-06 15:34:44 +02:00
35292eb66c
rename to 'Default encryption module'
2015-05-06 15:31:05 +02:00
795a48d45c
fix broken group presentation in selected groups list
2015-05-06 15:29:36 +02:00
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 -04:00
0e7fd82e89
cleanup
2015-05-05 14:21:12 +02:00
1c791e6000
not only send them back but also apply defaults to a new configuration. Fixes #15933
2015-05-05 14:20:58 +02:00
efce8ff905
Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller
...
Fix PHPDoc for the ext. share controller
2015-05-05 10:52:28 +02:00
2ce01ee0bf
Merge pull request #15938 from owncloud/enc_update_recovery_share_key
...
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 -04:00
d9746d8abd
Fix PHPDoc for the ext. share controller
2015-05-04 18:06:16 +02:00
ed16127a8d
Merge pull request #16026 from owncloud/enc_ux_improvements
...
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
08b98a8ede
Merge pull request #16042 from owncloud/fix-output-buffering
...
Remove hard-dependency on disabled output_buffering
2015-05-04 16:43:32 +02:00
eadc2c330c
Display the module settings in the list of the encryption modules
2015-05-04 15:04:03 +02:00
4b9e034968
Remove hard-dependency on disabled output_buffering
...
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.
However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.
Fixes https://github.com/owncloud/core/issues/16013
2015-05-04 14:15:15 +02:00
760ce3bd63
Fix DeleteOrphanedSharesJob
...
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
2015-05-04 13:58:58 +02:00
f76c055244
some small ux improvements
2015-05-04 11:55:06 +02:00
17fedc80da
Merge pull request #15652 from oparoz/better-text-previews
...
Show a text preview instead of a bitmap preview of text
2015-05-04 11:44:51 +02:00
0f7b8dd338
Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
...
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +02:00
7376ea9b26
Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
...
skip user if we don't have a public key
2015-05-04 09:57:19 +02:00
7fa308977b
[tx-robot] updated from transifex
2015-05-04 01:54:47 -04:00
7a3b74a8b9
Merge pull request #15486 from owncloud/versions-rollbackkeepfileid
...
Keep fileid when restoring version, using stream copy
2015-05-03 13:12:54 +02:00
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 -04:00
eda4d45836
[tx-robot] updated from transifex
2015-05-01 01:54:43 -04:00
972e189605
Use moveFromStorage instead of streamCopy when restoring version
2015-04-30 16:15:18 +02:00
2228faaa39
Fix version rollback to keep fileid
2015-04-30 16:15:18 +02:00
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +02:00
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +02:00
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +02:00
7795265d93
Moving encryption_dummy to the apps repo - fixes #15950
2015-04-30 10:51:51 +02:00
ae853445ef
[tx-robot] updated from transifex
2015-04-30 03:27:57 -04:00
4209757d61
Merge pull request #15919 from owncloud/enc_handle_empty_files
...
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
002d74f95a
Merge pull request #15908 from owncloud/fix-replace-with-sed
...
Replace `replace` with `sed` statement
2015-04-29 12:28:23 +02:00
8c7db2536d
Merge pull request #15596 from owncloud/issue/15589
...
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
0ab16cb823
Replace `replace` with `sed` statement
2015-04-29 09:53:45 +02:00
6ebb021359
Merge pull request #15911 from owncloud/enc_create_header_for_new_key
...
make sure that we create a header for the encrypted private key
2015-04-29 09:43:54 +02:00
3e06fd9342
Merge pull request #15706 from owncloud/fix-15705-master
...
move creation of shared key to the login handler
2015-04-29 09:36:34 +02:00
416ef1eb62
Merge pull request #15921 from cmeh/patch-4
...
Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
2015-04-29 09:28:27 +02:00
9db338df29
[tx-robot] updated from transifex
2015-04-29 01:54:45 -04:00
5e3fe7fb06
Update wizardTabElementary.js
...
Corrected "More then …" to "More than …".
2015-04-28 22:11:24 +02:00
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +02:00
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +02:00
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +02:00
b55ef51a27
Add tests for the correct share id on the call aswell
2015-04-28 14:56:13 +02:00
34181c3aef
Correctly send Federate-Cloud Share Feedback against the remote share ID
2015-04-28 14:29:04 +02:00
65fbb5eda0
Update etag of direct parent on unshare
...
Only call dirname() once instead of twice when propagating etags to the
recipient's parent folders.
2015-04-28 13:11:23 +02:00
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +02:00
66dca76f72
check the called URL
2015-04-28 11:28:54 +02:00
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
2015-04-28 11:28:54 +02:00
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
5fa5f46a88
Merge pull request #15773 from owncloud/fix-15766
...
LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
2015-04-28 10:46:23 +02:00
6679ef287a
[tx-robot] updated from transifex
2015-04-28 01:54:44 -04:00
69f88b38c9
Fix file name validation in New menu
2015-04-27 16:31:18 +02:00
5304afbecb
dont pass floats as timestamp to the changepropagator
2015-04-27 15:18:25 +02:00
678b7d7e4d
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
...
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
0789a6433e
safer teardown
2015-04-27 14:07:16 +02:00
32067f9e80
use microtime to prevent race conditions
2015-04-27 14:07:16 +02:00
83b8ac0d7b
cleanup hooks
2015-04-27 14:07:16 +02:00
2e897f05b1
triger propagation for webdav uploads
...
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
dd9601ae8f
fix merge
2015-04-27 14:07:16 +02:00
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
f488624e5f
minor fixes
2015-04-27 14:07:16 +02:00
526ea3fcba
add rename hook for propagation
2015-04-27 14:07:16 +02:00
77fbb4125b
propagate changes up reshares
2015-04-27 14:07:16 +02:00
8cb40f6043
Make sure the owner mountpoints are setup
2015-04-27 14:07:16 +02:00
d5434c9c4e
more propagation tests
2015-04-27 14:07:16 +02:00
b5c62cdad6
remove duplicates from rebase
2015-04-27 14:07:15 +02:00
19486837b2
adjust test
2015-04-27 14:07:15 +02:00
be55a90323
dont use our now non existing hook
2015-04-27 14:07:15 +02:00
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
518d5aadf5
Allow getting *all* share entries owned by a user
2015-04-27 14:07:15 +02:00
2dc11cf20e
unit test for etag propagation across shared storage boundary
2015-04-27 14:07:15 +02:00
63e2a4a5fa
Fix version rename with files and folders
...
- fix moving folder into another folder
- fix moving file or folder into shared folder as recipient
2015-04-27 13:17:03 +02:00
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
6f5de37f5b
Fix module registration
2015-04-27 12:21:27 +02:00
e58029f8ad
[tx-robot] updated from transifex
2015-04-27 01:54:46 -04:00
37adf6df01
[tx-robot] updated from transifex
2015-04-26 01:54:49 -04:00
7855174879
[tx-robot] updated from transifex
2015-04-25 01:55:13 -04:00
b9df932e3c
Merge pull request #15683 from owncloud/block-legacy-clients
...
Block old legacy clients
2015-04-24 18:21:10 +02:00
9b6a988926
add integration test to ensure correct behaviour on lost connections
2015-04-24 15:50:03 +02:00
8c0856779b
change error codes to 400
2015-04-24 09:42:02 -04:00
a2f9a2dc6d
Merge pull request #15855 from owncloud/teardownaftercommand
...
Tear down FS after running trash expire
2015-04-24 13:52:55 +02:00
18506387c0
Tear down FS after running trash expire
2015-04-24 12:09:09 +02:00
5b998e13d7
Merge pull request #15835 from owncloud/delete-permission-icon
...
Show hint if there is no delete permission
2015-04-24 11:57:47 +02:00
33d197db29
[tx-robot] updated from transifex
2015-04-24 01:55:15 -04:00
f4bc852db3
Show hint if there is no delete permission
...
* add class .no-permission which shows the default delete icon
* fixes #15172
* add unit test for no permission and for delete permission
2015-04-23 21:49:59 +02:00
0729fc2fbc
Remove overflow+watermark
2015-04-23 18:19:34 +02:00
58a87d0bab
Use authorization headers for better compatibility
...
+ add ellipsis
+ fix OC.generateUrl calls
2015-04-23 18:19:29 +02:00
a968877a8b
An idea to suggest that this is just a sample of the full text
2015-04-23 18:19:21 +02:00
530c290555
Use webDAV to have access to HTTP byte ranges
2015-04-23 18:19:17 +02:00
e113d67430
Cache the token value
2015-04-23 18:19:12 +02:00
8d3f88cf16
Show a text preview instead of a bitmap preview of text
...
+ fix the preview height
2015-04-23 18:19:07 +02:00
a672e9d556
Merge pull request #15814 from owncloud/public-reshare-webdav
...
Fix webdav access for public reshare
2015-04-23 15:28:10 +02:00
d1ef96dc9b
Merge pull request #15828 from owncloud/smb-1.0.1
...
update icewind/smb to 1.0.1
2015-04-23 14:48:25 +02:00
7a3a8e4032
fix subfolder reshares over webdav
2015-04-23 13:42:51 +02:00
cc3bc6345b
Only get encryption status when logged in
...
This removes useless warnings in the logs.
2015-04-23 13:06:00 +02:00
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 -04:00
57f49391dc
remove unneeded readonlycache
2015-04-22 20:07:54 +02:00
7eabd96e4c
update icewind/smb to 1.0.1
2015-04-22 20:05:38 +02:00
29168665cb
fix messages from settings crontroller
2015-04-22 13:26:06 -04:00
e3ec1a8bb8
remove status's and adjust js
2015-04-22 11:07:56 -04:00
1747117edf
destupify tests
2015-04-22 10:46:56 -04:00
c81bc152d7
fixing return values and adding tests
2015-04-22 10:46:55 -04:00
2adb79c794
resolve reshares in public webdav
2015-04-22 16:19:52 +02:00
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
b96b0063f6
throw exception when LDAP Connection was lost
2015-04-22 15:39:28 +02:00
03b7f1d015
use the permissions mask cache wrapper instead of the read only cache
2015-04-22 15:28:06 +02:00
42d9ba0f83
Merge pull request #15787 from owncloud/trash-partfiles
...
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
d7bdf60559
[tx-robot] updated from transifex
2015-04-22 01:55:38 -04:00
ffc796edcb
Do not trash part files, delete directly
2015-04-21 18:28:15 +02:00
9dc12d40d8
Merge pull request #15782 from owncloud/hide-modified-multiselect
...
hide modified header when multiselect is active, fix #15779
2015-04-21 16:41:41 +02:00
438cb27471
Merge pull request #15721 from oparoz/fix-readonly-cache
...
Fix read-only cache
2015-04-21 16:30:56 +02:00
723804ffd7
hide modified header when multiselect is active, fix #15779
2015-04-21 15:38:34 +02:00
1d1e188a7a
Merge pull request #15769 from owncloud/files-emptycontentreadonly
...
Added empty content message for empty read-only folders
2015-04-21 15:30:57 +02:00
503243e191
Merge pull request #15770 from owncloud/fix-15764
...
bring back border in host input field for consistency
2015-04-21 14:59:46 +02:00
9695e33e34
Renamed class + split methods
2015-04-21 14:40:11 +02:00
53a23364ef
Added empty content message for empty read-only folders
2015-04-21 14:31:13 +02:00
52025e9839
save configs when requesting a config ID. They are empty, but avoid configID collisioning when creating many new configs in the wizard without saving anything directly.
2015-04-21 13:20:31 +02:00
8593415c12
LDAP Wizard: have always-increasing 'nth Server' number per full page load, fixes #15766
2015-04-21 13:14:35 +02:00
4b968da9e6
Merge pull request #15713 from owncloud/fix-15707-master
...
[enc2] Fixing JS errors
2015-04-21 12:47:43 +02:00
19a2a22de1
bring back border in host input field for consistency
2015-04-21 12:22:40 +02:00
490e779424
doc and indent
2015-04-21 12:19:15 +02:00
4a2f8f81ca
Don't pollute the global namespace
2015-04-21 12:01:56 +02:00
c548066d2c
[tx-robot] updated from transifex
2015-04-21 01:55:37 -04:00
55962c5f5a
make jshint happy
...
This reverts commit ae681f0061
2015-04-20 20:51:15 +02:00
3bc5c1c3cf
use a simple function - OC.Encryption is already defined - fixes #15707
...
This reverts commit 0ca6398aa3
2015-04-20 20:50:08 +02:00
b78e76a1cb
Merge pull request #15677 from owncloud/enc_reset_private_key_password
...
[encryption] let user update the private key password
2015-04-20 20:48:12 +02:00
04674c06cc
Dont use the old .status way
2015-04-20 18:26:14 +02:00
3f96662609
Fix several minor things
2015-04-20 17:44:34 +02:00
a637bd7f2b
Avoid function name collision in dropbox external storage
2015-04-20 14:56:51 +02:00
3959f8ac4e
Merge pull request #15637 from owncloud/migrate-certificate-stuff
...
Migrate personal certificate handling to AppFramework controllers
2015-04-20 13:56:35 +02:00
20a6073a9f
Migrate personal certificate handling into AppFramework controllers
...
Also added unit-tests and better error-handling
2015-04-20 12:58:58 +02:00
460a78436f
move away from deprecated consts
2015-04-20 11:22:11 +02:00
4ea205e262
Block old legacy clients
...
This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance.
This has multiple reasons:
1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse
2. Old ownCloud client versions tend to be horrible buggy
In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client
2015-04-20 11:12:17 +02:00
9cb260d310
Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
...
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
75bf03a605
[tx-robot] updated from transifex
2015-04-20 01:54:44 -04:00
fad76bd1b8
Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage
...
LDAP - move from constants to class member constants
2015-04-19 21:00:04 +02:00
fd3c1484ad
[tx-robot] updated from transifex
2015-04-19 01:54:41 -04:00
cdf82909b8
Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
...
Issue/15694 display name of encryption modules
2015-04-18 22:51:15 +02:00
d2a31bcd93
Merge pull request #15727 from owncloud/cleanup-db-interface
...
DB: remove unused parameter - was forgotten during the migration to doct...
2015-04-18 22:47:40 +02:00
80a1f1858e
Tests for read-only cache
2015-04-18 19:43:20 +02:00
e837927ad5
fix followup issues with unneeded parameters
2015-04-18 17:02:39 +02:00
58e5878b4d
LDAP - move from constants to class member constants
...
* fixes scrutinizer warnings
* drops the usage of deprecated code usage
2015-04-18 15:29:08 +02:00
85d0fc5cf6
LDAP tests: swithc var_dump to exception
2015-04-18 15:09:15 +02:00
fcc1b9b3cc
Thou shalt not corrupt the answer of a cache request
2015-04-18 12:33:43 +02:00
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
491e590165
Fix dummy encryption module registration
2015-04-18 10:20:32 +02:00
37a871127b
[tx-robot] updated from transifex
2015-04-18 01:55:19 -04:00
fe237fd159
always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked
2015-04-17 23:33:59 +02:00
d0a6fb1f2c
let user update the private key password in case the login password was changed from outside
2015-04-17 20:11:22 +02:00
ae681f0061
Revert "make jshint happy"
...
This reverts commit a255866a93
2015-04-17 18:02:08 +02:00
0ca6398aa3
Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
...
This reverts commit c1a60a2349
2015-04-17 18:02:00 +02:00
a255866a93
make jshint happy
2015-04-17 17:59:53 +02:00
c1a60a2349
use a simple function - OC.Encryption is already defined - fixes #15707
2015-04-17 17:57:17 +02:00
c6e243928c
move creation of shared key to the login handler - fixes #15705
2015-04-17 17:51:18 +02:00
2e803fd2cd
Do not concat translation string
2015-04-17 14:26:58 +02:00
d9f23c0578
fixing undefined variable
2015-04-17 14:25:57 +02:00
295839930a
Merge pull request #15686 from owncloud/enc_fix_change_password
...
fix change password if no user is logged in, occ call
2015-04-17 14:14:29 +02:00
195a48b2b8
fix change password if no user is logged in, occ call
2015-04-17 13:26:38 +02:00
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
ac133e9faa
Merge pull request #15675 from owncloud/enc_error_messages
...
[encryption] display warning if password changed or if the keys are not initialized
2015-04-16 09:45:09 -04:00
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
e93f262eac
display warning if password changed or if the keys are not initialized
2015-04-16 14:30:19 +02:00
959665003b
decrypt private key for public shares correctly
2015-04-16 14:15:04 +02:00
6bcf88ca96
fix decryption of legacy private key
2015-04-16 14:15:04 +02:00
e7a4f4f3e4
add version
2015-04-16 14:15:04 +02:00
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
7b7d05eb74
Merge pull request #15805 from owncloud/fileslist-whitespace
...
add whitespace to bottom of files list to correctly show dropdowns
2015-04-22 23:53:26 +02:00
b92dd82e41
add whitespace to bottom of files list to correctly show dropdowns, fix #15801
2015-04-22 13:58:53 +02:00
8653da6c16
Merge pull request #15654 from owncloud/enc2_header_system_keys
...
make sure that encrypted private keys always have a header
2015-04-15 20:28:58 +02:00
389a101de6
make sure that encrypted private keys always have a header
2015-04-15 19:52:48 +02:00
4a5c3eea42
Add visibility for method
2015-04-15 17:40:07 +02:00
a6c5d65fd6
Fix SFTP storage id to be compatible with older ids
...
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
2015-04-15 16:25:47 +02:00
1a2475227b
Merge pull request #15613 from owncloud/allow-files-nav-icons
...
Allow files app nav entries to have a different icon class
2015-04-15 11:18:58 +02:00
1a894bd0d8
[tx-robot] updated from transifex
2015-04-15 01:54:38 -04:00
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
c53a53f705
Allow files app nav entries to have a different icon class
2015-04-14 16:17:24 +02:00
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
0f21303b75
a bit more phpdoc
2015-04-14 12:35:53 +02:00
f816acde27
fix reading of private key
2015-04-14 12:23:25 +02:00
ffa115b517
Merge pull request #15566 from owncloud/fix-filepicker
...
fix filepicker
2015-04-14 00:39:12 +02:00
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
8688660825
check that we know the parent
2015-04-13 17:10:02 +02:00
6b5daca7b7
check for source cache
2015-04-13 17:10:02 +02:00
d4c91dc835
add missing return for shared
2015-04-13 15:13:03 +02:00
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
d16ee4138d
Fix test
2015-04-13 15:13:03 +02:00
d726db7459
Implement move/copyFromStorage for shared storage
2015-04-13 15:13:03 +02:00
a88e013f72
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
...
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
b21dc35355
Do not try to make user subadmin of group twice
...
If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.
Added unit test to ensure things keep working.
2015-04-13 11:42:56 +02:00
59efcb63a3
fix filepicker
...
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
7ce4d2dec9
Merge pull request #15535 from owncloud/smb-1.0.0
...
update icewind/smb to 1.0.0
2015-04-10 23:43:55 +02:00
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
20a1a110de
Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
...
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
d1fa3c6b32
add unit test for crypt.php
2015-04-10 15:12:57 +02:00
a41fbf7a92
update icewind/smb to 1.0.0
2015-04-10 14:59:16 +02:00
4a225aa12c
Clear leftover shares from other tests
2015-04-10 14:53:17 +02:00
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +02:00
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
1427ea78d4
fix typo and comment
2015-04-10 09:12:37 +02:00
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
077ab27281
fix_tests
...
Conflicts:
apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
Arthur Schiwon
Morris Jobke
Vincent Petry
Joas Schilling
Jenkins for ownCloud
Lukas Reschke
Bjoern Schiessle
Robin Appelman
Björn Schießle
Thomas Müller
Martin
Roeland Jago Douma
Bernhard Posselt
Jan-Christoph Borchardt
Olivier Paroz
Scrutinizer Auto-Fixer
Joas Schilling
Clark Tomlinson
Christian Hoffmann
Jörn Friedrich Dreyer