Jenkins for ownCloud
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
Jenkins for ownCloud
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
Vincent Petry
87f3500fda
Merge pull request #17483 from rullzer/migrate-mimetype-js
...
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
2015-07-10 10:14:03 +02:00
Jenkins for ownCloud
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
Morris Jobke
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
Roeland Jago Douma
eb7a796ad9
Fix unit tests
2015-07-09 18:42:46 +02:00
Roeland Jago Douma
7d943b2ddc
Make the filelist get the mimetypeicon from the mimetype
2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532
Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl
2015-07-09 13:40:13 +02:00
Roeland Jago Douma
1aa2f6638f
Make getMimeIcon use OC.MimeType.getIconUrl
2015-07-09 13:40:12 +02:00
Arthur Schiwon
bfdf39b9bd
LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516
2015-07-09 12:19:04 +02:00
Morris Jobke
2b86ba43e3
Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype
...
No more leaking of mounttype via metadata or icon in public shares.
2015-07-09 09:41:27 +02:00
Jenkins for ownCloud
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
Bjoern Schiessle
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +02:00
Bjoern Schiessle
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
Bjoern Schiessle
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +02:00
Bjoern Schiessle
db65eeb580
only move real files to the trash bin
2015-07-08 11:32:06 +02:00
Hendrik Leppelsack
03a6e12bdb
fix tipsy dependency
2015-07-08 10:55:53 +02:00
Morris Jobke
0fe81d2f21
Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
...
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
Jenkins for ownCloud
2fd84607ee
[tx-robot] updated from transifex
2015-07-08 01:55:28 -04:00
Morris Jobke
3f5aa27d49
refactoring into proper methods
2015-07-07 15:16:37 +02:00
Morris Jobke
3d8297c254
Fix unit tests and introduce better mocks of the HTML
2015-07-07 13:56:49 +02:00
Morris Jobke
e557fe0aab
Add proper download started feedback
...
* this code adds a cookie when a special get parameter is set
* the content of this get parameter is used as value for the cookie
* the cookie expires after 20 seconds
* the JS code checks every 500 milliseconds for the cookie
-> if the cookie is set the request returned and the download is started
2015-07-07 13:56:49 +02:00
Morris Jobke
5a528214b8
Make download status fully visible
2015-07-07 13:56:49 +02:00
Morris Jobke
28a8697995
Reduce timeout for download spinner to 2 seconds
2015-07-07 13:56:49 +02:00
Morris Jobke
16c29021e6
Add loading spinner to multi select download button
2015-07-07 13:56:48 +02:00
Morris Jobke
0cdb46b5c6
Fix layout of disabled links in the file list
...
* also disable download button after click
2015-07-07 13:56:48 +02:00
Morris Jobke
28a51ef724
Add loading spinner to download icon
...
* vanishes after 7 seconds
2015-07-07 13:56:48 +02:00
Joas Schilling
594f5b6a29
Add visibility to test methods
2015-07-07 11:07:11 +02:00
Vincent Petry
fb0fef78f4
Add test case when owner renames shared folder
2015-07-07 11:06:21 +02:00
Vincent Petry
547c4b9a9f
Add unit test for getUsersSharingFile
...
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
2015-07-07 11:06:11 +02:00
Jenkins for ownCloud
ee5dd25290
[tx-robot] updated from transifex
2015-07-07 01:55:18 -04:00
Roeland Douma
b4f782b568
Merge pull request #16724 from owncloud/mimetype-js
...
Javascript to fetch mimetype icons
2015-07-06 20:59:56 +02:00
Jan-Christoph Borchardt
e84806f017
Merge pull request #17418 from owncloud/fix-public-download-button-regression
...
Fix regression of button at public download page
2015-07-06 17:10:23 +02:00
Roeland Jago Douma
868bc421cb
Share app no longer use the OCS API icon
...
Switch to new javascript mimetype resolver
2015-07-06 16:32:15 +02:00
Thomas Müller
14eef434ff
Merge pull request #17290 from owncloud/remove-readonly-wrapper
...
Replace readonly wrapper with permissions mask
2015-07-06 15:36:11 +02:00
Thomas Müller
dba6ba2523
Merge pull request #16964 from owncloud/versions_occ
...
add occ tool to delete versions
2015-07-06 15:34:40 +02:00
Morris Jobke
7da5e53741
Fix regression of button at public download page
...
* introduced with #17159
2015-07-06 13:37:14 +02:00
Joas Schilling
4dbc8ab77f
Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities
...
Improve federated cloud sharing activities
2015-07-06 10:23:33 +02:00
Joas Schilling
fca6bcb632
Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares
...
Add OCS API to send, get, accept and decline remote shares
2015-07-06 10:12:29 +02:00
Jenkins for ownCloud
5734edfe20
[tx-robot] updated from transifex
2015-07-06 01:54:38 -04:00
Jenkins for ownCloud
55f4d0eea1
[tx-robot] updated from transifex
2015-07-05 01:54:50 -04:00
Jenkins for ownCloud
468871818d
[tx-robot] updated from transifex
2015-07-04 01:55:24 -04:00
Roeland Jago Douma
cf732c4d27
Do not leak mounttype of a public share
2015-07-04 07:27:56 +02:00
Thomas Müller
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
Vincent Petry
cc373ab89a
Merge pull request #15470 from rullzer/files_sharing_getUrlContent
...
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Bjoern Schiessle
763b601e4a
use the correct user if we update the share table
2015-07-03 15:58:52 +02:00
Björn Schießle
525745caf5
Merge pull request #17140 from owncloud/trashbin_occ
...
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
Morris Jobke
9da10788bc
Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
...
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
Joas Schilling
2118713477
Add OCS api to get, accept and decline remote shares
2015-07-03 09:30:49 +02:00
Joas Schilling
df303b910a
Allow sharing with type remote share
2015-07-03 09:28:56 +02:00
Jenkins for ownCloud
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
Morris Jobke
a3df41ddb6
Merge pull request #17159 from owncloud/fix-duplicate-id
...
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Vincent Petry
71ae96bb56
Do not show static share owner if not available
...
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
Vincent Petry
e65034e4bc
Do not register JS share plugin if core sharing API is disabled
2015-07-02 14:56:33 +02:00
Joas Schilling
ddb8cc2303
Use federated cloud id as a parameter type
2015-07-02 13:14:02 +02:00
Thomas Müller
063071b58d
Merge pull request #17328 from owncloud/revert-15363-ext-ocp
...
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
Morris Jobke
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Vincent Petry
aedf4848f7
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
...
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Thomas Müller
079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
Joas Schilling
c7968d202f
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
...
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
Joas Schilling
aa7c8ad191
Add the item name to the federated sahre activity
2015-07-02 12:28:48 +02:00
Joas Schilling
95faaad5cf
Use the app constant to fix the grouping
2015-07-02 12:27:58 +02:00
Joas Schilling
7e3f8d3ac1
Use the item name when refering to the unaccepted remote share
2015-07-02 12:26:06 +02:00
Joas Schilling
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
Lukas Reschke
b100036457
Bump versions
2015-07-02 09:18:41 +02:00
Lukas Reschke
68f8717056
[master] Remove OCS IDs
...
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Jenkins for ownCloud
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
Vincent Petry
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
Robin Appelman
dd20cd1995
remove no longer needed readonly wrapper
2015-07-01 15:45:54 +02:00
Robin Appelman
365fafc9bc
use permissions mask wrapper instead of readonly wrapper
2015-07-01 15:45:23 +02:00
Robin Appelman
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
Robin Appelman
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
Vincent Petry
5caeda33f1
Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
...
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
Vincent Petry
5d3aa36355
Catch more error codes thrown by federated shares
...
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.
This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Robin McCorkell
728a22cda1
Use OCP classes as much as possible in files_external
2015-07-01 09:08:28 +02:00
Morris Jobke
8f05d4b662
Merge pull request #16535 from rullzer/ocs_share_api_url
...
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
Morris Jobke
044d2ece07
Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
...
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke
f25b71f70e
Merge pull request #15475 from rullzer/files_sharing_OCP_DB
...
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Thomas Müller
0a23d566ba
Merge pull request #17255 from owncloud/fix-17119
...
[LDAP] Filter user groups obtained by memberof
2015-07-01 00:33:39 +02:00
Arthur Schiwon
5f4db0540a
tests solidity
2015-06-30 14:09:11 +02:00
Arthur Schiwon
646f2f1d41
adjust unit test
2015-06-30 13:56:25 +02:00
Arthur Schiwon
663cd7af4d
integration test
2015-06-30 12:52:27 +02:00
Thomas Müller
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
Robin Appelman
abb0c728ef
handle error during setup
2015-06-29 14:06:32 +02:00
Vincent Petry
b55f71ee03
Merge pull request #17083 from owncloud/share-etag-update-target
...
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Jenkins for ownCloud
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
Jenkins for ownCloud
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
Lukas Reschke
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Lukas Reschke
465606c254
Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
...
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
Jenkins for ownCloud
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
Clark Tomlinson
ca1da0acb7
add check if server returns a 500 and display error
...
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
Olivier Paroz
b30515ddda
Signature of overriding method should match the parent
2015-06-26 17:45:04 +02:00
Arthur Schiwon
8625a8cf23
ensure groups match filter when using memberOf to read users group, refs #17119
2015-06-26 16:42:11 +02:00
Vincent Petry
56d9df34cb
Unit test for etag update on custom share folder
2015-06-26 16:32:28 +02:00
Björn Schießle
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Thomas Müller
9558562883
Merge pull request #17082 from owncloud/shared-etag-propagate-file
...
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Jenkins for ownCloud
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
Robin Appelman
0128a86df1
add some docs
2015-06-25 14:29:40 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Morris Jobke
5cb1e20214
remove duplicate ID in HTML template for public shares
2015-06-25 10:13:56 +02:00
Morris Jobke
160d8003f8
Merge pull request #17152 from owncloud/LDAP/AD-Typo
...
Ldap/ad typo
2015-06-25 07:56:04 +02:00
Jenkins for ownCloud
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
Lukas Reschke
a63f6023fd
Dropped an S from the mouseover
...
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
Bjoern Schiessle
407db913de
add occ command to trashbin to remove deleted files
2015-06-24 19:09:20 +02:00
Robin Appelman
c87ab65081
fix etag propagation for single file shares
2015-06-24 18:16:03 +02:00
Robin Appelman
f847d9409e
add unit test for single file share etag propagation
2015-06-24 18:16:03 +02:00
Morris Jobke
5f59393b30
Merge pull request #17110 from owncloud/share-error-handling
...
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407
Merge pull request #17136 from rullzer/fix_remove_link_OCS
...
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Roeland Jago Douma
6c3da1ec90
Added unit test to verify link password removeal
2015-06-24 12:38:33 +02:00
Thomas Müller
4da1c84296
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 12:17:17 +02:00
Jenkins for ownCloud
ceb80ac123
[tx-robot] updated from transifex
2015-06-24 01:55:55 -04:00
Morris Jobke
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
Vincent Petry
e01db549a0
Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
...
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
Björn Schießle
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke
a059b090c3
Merge pull request #17085 from owncloud/use-trusted-mimetype
...
Use trusted mimetype
2015-06-23 08:45:05 +02:00
Jenkins for ownCloud
3cad0d4ed2
[tx-robot] updated from transifex
2015-06-23 01:56:15 -04:00
Thomas Müller
25581c7b63
Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
...
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
Robin Appelman
5e1865530b
take share target into account when updating recipient etags
2015-06-22 18:21:54 +02:00
Clark Tomlinson
5466dcadc0
adding correct blocking logic for fff
2015-06-22 11:42:42 -04:00
VicDeo
5cfcda3e95
Merge pull request #17068 from owncloud/fix_16878
...
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
Joas Schilling
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt
9dde482315
remove whitespace on bottom when no search results, fix laylout, fix #16878
2015-06-22 15:30:29 +02:00
Lukas Reschke
3d2ac6dbb6
Use trusted mimetype
...
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
Bjoern Schiessle
8eda9ae83c
add filter-empty class if no search result in current folder
2015-06-22 12:13:05 +02:00
Jenkins for ownCloud
c77e44117d
[tx-robot] updated from transifex
2015-06-22 01:55:00 -04:00
Robin McCorkell
05fb9ceef9
Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
...
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Jenkins for ownCloud
59513ac377
[tx-robot] updated from transifex
2015-06-21 01:55:06 -04:00
Jenkins for ownCloud
183bd6dd49
[tx-robot] updated from transifex
2015-06-20 01:55:10 -04:00
Bjoern Schiessle
ed3dc199ae
remove files_encryption from database at the end of the migration process
2015-06-19 14:15:56 +02:00
Thomas Müller
5c2646a4bf
Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
...
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
Jenkins for ownCloud
a5eb2f01a9
[tx-robot] updated from transifex
2015-06-19 01:55:29 -04:00
Vincent Petry
e15dd783ab
Workaround for empty dir deletion for SFTP
...
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.
This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
Lukas Reschke
ebb5523698
Verify if path exists
...
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
2015-06-18 16:48:32 +02:00
Björn Schießle
7a0917e5b2
Merge pull request #16692 from owncloud/add_social_media_buttons
...
Add social media buttons
2015-06-18 14:41:58 +02:00
Bjoern Schiessle
f9093466bf
add id to url
2015-06-18 13:00:50 +02:00
Thomas Müller
a04cb82fd9
Merge pull request #16890 from owncloud/fix-16588
...
the user is gone, userExists will not bring him back. But the user's …
2015-06-18 12:51:06 +02:00
Lukas Reschke
8d4f918671
Merge pull request #16993 from owncloud/verify-if-path-exists
...
[master] Verify if path exists
2015-06-18 10:05:12 +02:00
Jenkins for ownCloud
c4cb34da9d
[tx-robot] updated from transifex
2015-06-18 01:55:14 -04:00
Morris Jobke
9a0b0ba488
Merge pull request #16893 from owncloud/fixSlideToggle
...
Fix childs of slideToggle not sliding the target
2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt
b43bfaf132
fix look of 'Share with me via ownCloud' button, fix wording
2015-06-17 16:05:05 +02:00
Lukas Reschke
414896d8a0
Throw nicer error message instead 500
2015-06-17 15:39:13 +02:00
Lukas Reschke
2d648ed0eb
Verify if path exists
...
We need to verify if the specified path exists to gracefully prevent errors.
2015-06-17 15:06:50 +02:00
Jan-Christoph Borchardt
2abedd544b
remove unneeded span around Settings text, fixes cursor
2015-06-17 14:37:58 +02:00
Arthur Schiwon
0e522a0b01
delete user test to take getHome into account to ensure it is also deleted subsequently
2015-06-17 14:13:01 +02:00
Bjoern Schiessle
fa16c1f9b4
fix path to owncloud logo
2015-06-17 13:53:59 +02:00
Bjoern Schiessle
ac9733a8b8
make the click actions work
2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt
4599da9608
federated cloud ID: add icons, fix HTML & layout, fix wording
2015-06-17 13:53:59 +02:00
Bjoern Schiessle
06d0a41915
add social media button for diaspora, twitter, facebook and google+
2015-06-17 13:53:59 +02:00
Thomas Müller
d2305f2527
Merge pull request #16729 from owncloud/scanner-read-lock
...
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Jenkins for ownCloud
3898b8c9b8
[tx-robot] updated from transifex
2015-06-17 01:55:34 -04:00
Bjoern Schiessle
b645d795d2
add occ tool to delete versions
2015-06-16 16:56:27 +02:00
Morris Jobke
b052eccd9a
Merge pull request #16938 from owncloud/ext-s3-opendirduplicate
...
Skip directory entry in S3 opendir
2015-06-16 09:48:10 +02:00
Jenkins for ownCloud
0a5d73b874
[tx-robot] updated from transifex
2015-06-16 01:55:41 -04:00
Vincent Petry
f98030020f
Properly set mtime on S3 for touch operation
...
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.
Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
2015-06-15 17:35:09 +02:00
Vincent Petry
d3f828af45
Skip directory entry in S3 opendir
...
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
2015-06-15 17:30:09 +02:00
Robin Appelman
f02e110aea
explain pre-hook scan
2015-06-15 15:43:19 +02:00
Robin Appelman
5efbab4ab8
ensure we dont have to scan a file in the trash wrapper
2015-06-15 14:32:29 +02:00
Thomas Müller
433db48027
Merge pull request #16911 from oparoz/prettier-public-thumbnails
...
Determine the size we need before asking for a thumbnail
2015-06-15 13:30:44 +02:00
Thomas Müller
3ce616fb03
Merge pull request #16885 from owncloud/files-previewurlresolutionrounding
...
Truncate preview resolution
2015-06-15 12:53:05 +02:00
Jenkins for ownCloud
2806c9476c
[tx-robot] updated from transifex
2015-06-15 01:54:58 -04:00
Jenkins for ownCloud
fe9b28a800
[tx-robot] updated from transifex
2015-06-14 01:54:49 -04:00
Jenkins for ownCloud
51d181f331
[tx-robot] updated from transifex
2015-06-13 01:55:04 -04:00
Olivier Paroz
7b84343cfc
floats are not welcome when setting the size of a preview
2015-06-12 18:56:18 +02:00
Olivier Paroz
8ff4a66f01
Determine the size we need before asking for a thumbnail
...
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
2015-06-12 18:50:21 +02:00
Jenkins for ownCloud
abd70932c6
[tx-robot] updated from transifex
2015-06-12 01:55:11 -04:00
Arthur Schiwon
97127cd971
the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway
2015-06-11 18:24:45 +02:00
Vincent Petry
d256425aba
Truncate preview resolution
...
This prevents having float numbers appear in the URL
2015-06-11 17:17:40 +02:00
Jenkins for ownCloud
88d3c9ad40
[tx-robot] updated from transifex
2015-06-11 01:55:05 -04:00
Thomas Müller
4747c7f509
Merge pull request #16736 from owncloud/utilize-member-of
...
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud
4d88302b3a
[tx-robot] updated from transifex
2015-06-10 01:54:55 -04:00
Thomas Müller
5f4f7e69cf
Merge pull request #16810 from owncloud/disable-search-if-not-implemented
...
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00
Morris Jobke
7550bf0917
Disable video preview if previews are disabled
2015-06-09 17:49:59 +02:00
Thomas Müller
0fde0e6569
Search results have to explicitly be added to the content area of the app
2015-06-09 12:39:40 +02:00
Morris Jobke
bacd5de453
Merge pull request #16811 from espenfjo/master
...
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Jenkins for ownCloud
75bd040f1c
[tx-robot] updated from transifex
2015-06-09 01:55:06 -04:00
Bjoern Schiessle
d743d6d356
add hint to exception
2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen
308b97db4c
Fix regression in preview height calculation
...
Fix regressions introduced in a672e9d
regarding the image height calculation
2015-06-08 20:57:19 +02:00
Jenkins for ownCloud
2fb1b0864a
[tx-robot] updated from transifex
2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761
[tx-robot] updated from transifex
2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
16708ae187
[tx-robot] updated from transifex
2015-06-06 01:55:26 -04:00
Morris Jobke
62ae39208a
Add owner to the storage stats to enable better notifications
...
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Thomas Müller
9899e10a04
Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
...
Check whether the user exists before trying to set up his file system
2015-06-05 16:22:03 +02:00
Joas Schilling
bd0b9a0fe0
Add unit tests for non existing users
2015-06-05 13:23:50 +02:00
Thomas Müller
ccbb1cce3c
Merge pull request #16718 from owncloud/files-catchajaxexceptions
...
Catch exceptions in files ajax calls
2015-06-05 12:01:01 +02:00
Joas Schilling
4e24486a89
Check whether the user exists before trying to set up his file system
2015-06-05 11:31:49 +02:00
Morris Jobke
c747a58978
Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression
...
port detection needs to take care of now thrown exceptions when LDAP …
2015-06-05 11:10:37 +02:00
Jenkins for ownCloud
e544d5b2c6
[tx-robot] updated from transifex
2015-06-05 01:55:04 -04:00
Arthur Schiwon
6f69fab384
port detection needs to take care of now thrown exceptions when LDAP server is not available
2015-06-04 16:28:48 +02:00
Jenkins for ownCloud
66a24ff479
[tx-robot] updated from transifex
2015-06-04 01:56:24 -04:00
Arthur Schiwon
090478a95e
if possible, getUserGroups should get memberships using memberOf virtual attribute
2015-06-03 17:38:27 +02:00
Morris Jobke
a90a84b0a7
Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
...
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
Arthur Schiwon
91841bb25d
Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits.
2015-06-03 15:23:37 +02:00
Vincent Petry
263bb46ff8
Catch exceptions in files ajax calls
2015-06-03 14:31:58 +02:00
Joas Schilling
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
Jenkins for ownCloud
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
Vincent Petry
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
Lukas Reschke
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
Morris Jobke
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
Bjoern Schiessle
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
Lukas Reschke
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Vincent Petry
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
Lukas Reschke
88ee082115
Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
...
Fix files_external l10n
2015-06-01 09:11:21 +02:00
Jenkins for ownCloud
b1ac538679
[tx-robot] updated from transifex
2015-06-01 01:54:54 -04:00
Jenkins for ownCloud
8d23b34402
[tx-robot] updated from transifex
2015-05-31 01:54:44 -04:00
Morris Jobke
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
Jenkins for ownCloud
a3bc112412
[tx-robot] updated from transifex
2015-05-30 01:55:46 -04:00
Vincent Petry
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
Björn Schießle
01a241f711
Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
...
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
Vincent Petry
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
Thomas Müller
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
Martin
f084eb07f2
Missing translation in ldap part.wizard-server.php
2015-05-29 10:50:02 +02:00
Jenkins for ownCloud
fff0fb66d6
[tx-robot] updated from transifex
2015-05-29 01:56:13 -04:00
Thomas Müller
b95ebb76e5
Merge pull request #16607 from owncloud/ie9-textpreviewfallback
...
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
Thomas Müller
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
Vincent Petry
29c68a4e61
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 17:59:43 +02:00
Vincent Petry
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
Björn Schießle
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
Jenkins for ownCloud
1726d84e73
[tx-robot] updated from transifex
2015-05-28 01:55:22 -04:00
Bjoern Schiessle
68db3059ee
detect migration status
2015-05-27 21:00:02 +02:00
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Martin
cdbf472c4d
Make string 'SFTP with secret key login' translatable
2015-05-27 15:38:05 +02:00
Jenkins for ownCloud
fda0995e4c
[tx-robot] updated from transifex
2015-05-27 01:55:34 -04:00
Björn Schießle
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
Vincent Petry
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
Jenkins for ownCloud
6198fb20cb
[tx-robot] updated from transifex
2015-05-26 01:54:57 -04:00
Jenkins for ownCloud
fe610a65d3
[tx-robot] updated from transifex
2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00
[tx-robot] updated from transifex
2015-05-24 01:55:03 -04:00
Jenkins for ownCloud
e189435499
[tx-robot] updated from transifex
2015-05-23 01:55:05 -04:00
Roeland Jago Douma
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
Bernhard Posselt
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
Jenkins for ownCloud
156881efce
[tx-robot] updated from transifex
2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt
78a0464354
replace logo-wide on share page as well with better icon + text
2015-05-22 00:04:47 +02:00
Jenkins for ownCloud
42dd40ad80
[tx-robot] updated from transifex
2015-05-21 01:55:57 -04:00
Vincent Petry
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
Morris Jobke
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
Morris Jobke
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
Olivier Paroz
13ab251c6d
Restore min-height for single previews
2015-05-20 14:09:31 +02:00
Vincent Petry
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
Vincent Petry
f2a900e04c
Return 401 when accessing public webdav and s2s is disabled
2015-05-20 12:19:03 +02:00
Morris Jobke
3a4568313f
Merge pull request #16326 from owncloud/fix-16192
...
include base dn test in functionality test
2015-05-20 12:12:52 +02:00
Jan-Christoph Borchardt
0d78ebf6cd
Merge pull request #16444 from owncloud/close-new-dropdown
...
Closes "New" dropdown when switching category
2015-05-20 11:15:21 +02:00
Lukas Reschke
9be6d8cd39
Merge pull request #16446 from owncloud/fix-url-generation
...
Fix URL generation
2015-05-20 08:20:38 +02:00
Jenkins for ownCloud
c49a06a684
[tx-robot] updated from transifex
2015-05-20 01:56:19 -04:00
Thomas Müller
f9d04f62a8
Merge pull request #16440 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
Vincent Petry
f7a2b5e7a9
Added unit tests for download URL in public sharing page
2015-05-19 17:41:06 +02:00
Thomas Müller
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
Morris Jobke
d3d70e5d90
Re-add use statement
2015-05-19 16:15:00 +02:00
Joas Schilling
d832c4ae23
Fix unexisting class and broken doc
2015-05-19 15:27:50 +02:00
Lukas Reschke
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 58a87d0bab
of https://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
Morris Jobke
581227324a
Closes "New" dropdown when switching category
...
* fixes #16394
* return false - stops all following event callbacks
2015-05-19 14:47:13 +02:00
Robin Appelman
733784ae41
cleanup move/copy logic in trash
2015-05-19 14:22:09 +02:00
Scrutinizer Auto-Fixer
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
Arthur Schiwon
76dfc87227
add primary group users to resultset before caching
2015-05-19 12:56:07 +02:00
Arthur Schiwon
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
Thomas Müller
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
Thomas Müller
d90b83725f
Merge pull request #16085 from owncloud/encryption-module-rename
...
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Joas Schilling
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
Morris Jobke
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
Jenkins for ownCloud
313994a33d
[tx-robot] updated from transifex
2015-05-19 01:55:35 -04:00
Arthur Schiwon
cdb0689334
handle unallowed auth exception on port detection
2015-05-18 18:14:05 +02:00
Arthur Schiwon
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
Arthur Schiwon
b9e5309757
catch unallowed anonymous auth attempt and show specific error
2015-05-18 18:14:05 +02:00
Robin Appelman
8f1a609512
adjust test
2015-05-18 17:16:13 +02:00
Robin Appelman
89959a856c
fix target path for move
2015-05-18 17:16:13 +02:00
Robin Appelman
a0854b36f0
update cache after move to trash
2015-05-18 17:16:13 +02:00
Robin Appelman
b70e1ffc6d
dont go trough the view when moving to trash
2015-05-18 17:16:12 +02:00
Clark Tomlinson
7d2666699b
removing encryption preview check
2015-05-18 09:47:46 -04:00
Clark Tomlinson
d557519746
removing deletion of encryption keys
...
this will be handled in the wrapper now
2015-05-18 09:47:46 -04:00
Joas Schilling
30d165ebf2
Add missing import for the exception
2015-05-18 15:45:47 +02:00
Clark Tomlinson
a0c6c01137
fix references to legacy encryption app name
2015-05-18 09:45:41 -04:00
Joas Schilling
4444db61b7
Add a unit test for the decrypt method
2015-05-18 15:45:11 +02:00
Bjoern Schiessle
7676166254
add l10n to constructor
2015-05-18 15:43:53 +02:00
Vincent Petry
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
Bjoern Schiessle
7d492fefae
also encrypt files in trash bin
2015-05-18 12:51:47 +02:00
Vincent Petry
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
Robin Appelman
724f88d9ff
fix tests
2015-05-18 12:11:32 +02:00
Robin Appelman
415f16eb24
fix tests
2015-05-18 12:11:31 +02:00
Roeland Jago Douma
dd3d0194a6
Move files sharing app (mostly) to OCP\DB
2015-05-18 11:06:23 +02:00
Roeland Jago Douma
be8d0a08ec
Move away from private static deprecated functio
2015-05-18 11:03:48 +02:00
Roeland Jago Douma
7a8072e958
Move core apps from OC_Log::write to OCP\Util
2015-05-18 10:57:52 +02:00
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Jenkins for ownCloud
73a3086945
[tx-robot] updated from transifex
2015-05-18 01:54:58 -04:00
Jenkins for ownCloud
16c320df26
[tx-robot] updated from transifex
2015-05-17 01:55:56 -04:00
Jenkins for ownCloud
744a9f2c78
[tx-robot] updated from transifex
2015-05-16 01:54:47 -04:00
Vincent Petry
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
Thomas Müller
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
Joas Schilling
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
Vincent Petry
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
Vincent Petry
f8a4cc0284
Added unit tests for versions storing
2015-05-15 12:24:34 +02:00
Joas Schilling
e1923bac07
Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
...
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
Thomas Müller
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
Jenkins for ownCloud
49c4ee98b4
[tx-robot] updated from transifex
2015-05-15 01:54:49 -04:00
Lukas Reschke
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
Jenkins for ownCloud
1596a1fd32
[tx-robot] updated from transifex
2015-05-14 01:54:47 -04:00
Bjoern Schiessle
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
Vincent Petry
033b3dac92
Use owner when expiring versions, not the logged in user
2015-05-13 18:40:35 +02:00
Arthur Schiwon
2bf92e0a43
include base dn test in functionality test
2015-05-13 16:21:50 +02:00
Lukas Reschke
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
Jenkins for ownCloud
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
Robin Appelman
3b1dde7005
dont go trough the view when renaming/copying on shared storages
2015-05-12 17:09:37 +02:00
Morris Jobke
44091a1a12
Merge pull request #16277 from owncloud/fix-15971
...
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt
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
Arthur Schiwon
acafc8ca46
remove superflous button. fixes #15971
2015-05-12 14:54:05 +02:00
Vincent Petry
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
Jenkins for ownCloud
deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 -04:00
Vincent Petry
20d2d8d3dd
Merge pull request #15881 from owncloud/share-moveversionsproperly
...
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Morris Jobke
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
Morris Jobke
f057efc42e
Merge pull request #16213 from cmeh/patch-5
...
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 -04:00
Jenkins for ownCloud
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 -04:00
Christian Hoffmann
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
Jenkins for ownCloud
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 -04:00
Arthur Schiwon
90611e6594
only use memcache, if available
2015-05-08 13:27:27 +02:00
Bjoern Schiessle
4a450c9d0d
improved admin settings
2015-05-08 11:41:38 +02:00
Thomas Müller
e4c05acf94
Merge pull request #16170 from owncloud/fix-15621
...
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller
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
Morris Jobke
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
Jenkins for ownCloud
ff0faacf0b
[tx-robot] updated from transifex
2015-05-08 01:54:52 -04:00
Arthur Schiwon
f2d23d7f02
check optional parameter before using it, fixes #16147
2015-05-07 22:18:29 +02:00
Thomas Müller
15d134124b
Validate the quota value to be a correct value
2015-05-07 17:56:13 +02:00
Joas Schilling
2b092f2e93
Add a test for getting the versions of an empty path
2015-05-07 16:02:35 +02:00
Arthur Schiwon
57e8b76f48
drop global file cache support, fixes #15621
2015-05-07 14:52:44 +02:00
Joas Schilling
05fe2006ee
Do not run method when the path is empty
2015-05-07 14:31:21 +02:00
Morris Jobke
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
Jenkins for ownCloud
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 -04:00
Morris Jobke
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
Arthur Schiwon
71e6644ec8
fix filter index on selected groups is updated too early
2015-05-06 15:34:44 +02:00
Jan-Christoph Borchardt
35292eb66c
rename to 'Default encryption module'
2015-05-06 15:31:05 +02:00
Arthur Schiwon
795a48d45c
fix broken group presentation in selected groups list
2015-05-06 15:29:36 +02:00
Jenkins for ownCloud
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 -04:00
Arthur Schiwon
0e7fd82e89
cleanup
2015-05-05 14:21:12 +02:00
Arthur Schiwon
1c791e6000
not only send them back but also apply defaults to a new configuration. Fixes #15933
2015-05-05 14:20:58 +02:00
Joas Schilling
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
Björn Schießle
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
Jenkins for ownCloud
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 -04:00
Lukas Reschke
d9746d8abd
Fix PHPDoc for the ext. share controller
2015-05-04 18:06:16 +02:00
Björn Schießle
ed16127a8d
Merge pull request #16026 from owncloud/enc_ux_improvements
...
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
Thomas Müller
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
Joas Schilling
eadc2c330c
Display the module settings in the list of the encryption modules
2015-05-04 15:04:03 +02:00
Lukas Reschke
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
Morris Jobke
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
Bjoern Schiessle
f76c055244
some small ux improvements
2015-05-04 11:55:06 +02:00
Lukas Reschke
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
Thomas Müller
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
Thomas Müller
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
Jenkins for ownCloud
7fa308977b
[tx-robot] updated from transifex
2015-05-04 01:54:47 -04:00
Morris Jobke
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
Jenkins for ownCloud
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 -04:00
Jenkins for ownCloud
eda4d45836
[tx-robot] updated from transifex
2015-05-01 01:54:43 -04:00
Vincent Petry
972e189605
Use moveFromStorage instead of streamCopy when restoring version
2015-04-30 16:15:18 +02:00
Vincent Petry
2228faaa39
Fix version rollback to keep fileid
2015-04-30 16:15:18 +02:00
Joas Schilling
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +02:00
Bjoern Schiessle
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +02:00
Bjoern Schiessle
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +02:00
Thomas Müller
7795265d93
Moving encryption_dummy to the apps repo - fixes #15950
2015-04-30 10:51:51 +02:00
Jenkins for ownCloud
ae853445ef
[tx-robot] updated from transifex
2015-04-30 03:27:57 -04:00
Clark Tomlinson
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
Vincent Petry
002d74f95a
Merge pull request #15908 from owncloud/fix-replace-with-sed
...
Replace `replace` with `sed` statement
2015-04-29 12:28:23 +02:00
Morris Jobke
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
Morris Jobke
0ab16cb823
Replace `replace` with `sed` statement
2015-04-29 09:53:45 +02:00
Björn Schießle
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
Lukas Reschke
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
Thomas Müller
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
Jenkins for ownCloud
9db338df29
[tx-robot] updated from transifex
2015-04-29 01:54:45 -04:00
cmeh
5e3fe7fb06
Update wizardTabElementary.js
...
Corrected "More then …" to "More than …".
2015-04-28 22:11:24 +02:00
Bjoern Schiessle
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +02:00
Joas Schilling
b55ef51a27
Add tests for the correct share id on the call aswell
2015-04-28 14:56:13 +02:00
Joas Schilling
34181c3aef
Correctly send Federate-Cloud Share Feedback against the remote share ID
2015-04-28 14:29:04 +02:00
Vincent Petry
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
Bjoern Schiessle
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +02:00
Joas Schilling
66dca76f72
check the called URL
2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
2015-04-28 11:28:54 +02:00
Morris Jobke
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
Thomas Müller
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
Jenkins for ownCloud
6679ef287a
[tx-robot] updated from transifex
2015-04-28 01:54:44 -04:00
Vincent Petry
69f88b38c9
Fix file name validation in New menu
2015-04-27 16:31:18 +02:00
Robin Appelman
5304afbecb
dont pass floats as timestamp to the changepropagator
2015-04-27 15:18:25 +02:00
Thomas Müller
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
Robin Appelman
0789a6433e
safer teardown
2015-04-27 14:07:16 +02:00
Robin Appelman
32067f9e80
use microtime to prevent race conditions
2015-04-27 14:07:16 +02:00
Robin Appelman
83b8ac0d7b
cleanup hooks
2015-04-27 14:07:16 +02:00
Robin Appelman
2e897f05b1
triger propagation for webdav uploads
...
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
Robin Appelman
dd9601ae8f
fix merge
2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
Robin Appelman
f488624e5f
minor fixes
2015-04-27 14:07:16 +02:00
Robin Appelman
526ea3fcba
add rename hook for propagation
2015-04-27 14:07:16 +02:00
Robin Appelman
77fbb4125b
propagate changes up reshares
2015-04-27 14:07:16 +02:00
Robin Appelman
8cb40f6043
Make sure the owner mountpoints are setup
2015-04-27 14:07:16 +02:00
Robin Appelman
d5434c9c4e
more propagation tests
2015-04-27 14:07:16 +02:00
Robin Appelman
b5c62cdad6
remove duplicates from rebase
2015-04-27 14:07:15 +02:00
Robin Appelman
19486837b2
adjust test
2015-04-27 14:07:15 +02:00
Robin Appelman
be55a90323
dont use our now non existing hook
2015-04-27 14:07:15 +02:00
Robin Appelman
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5
Allow getting *all* share entries owned by a user
2015-04-27 14:07:15 +02:00
Robin Appelman
2dc11cf20e
unit test for etag propagation across shared storage boundary
2015-04-27 14:07:15 +02:00
Vincent Petry
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
Bjoern Schiessle
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
Joas Schilling
6f5de37f5b
Fix module registration
2015-04-27 12:21:27 +02:00
Jenkins for ownCloud
e58029f8ad
[tx-robot] updated from transifex
2015-04-27 01:54:46 -04:00
Jenkins for ownCloud
37adf6df01
[tx-robot] updated from transifex
2015-04-26 01:54:49 -04:00
Jenkins for ownCloud
7855174879
[tx-robot] updated from transifex
2015-04-25 01:55:13 -04:00
Lukas Reschke
b9df932e3c
Merge pull request #15683 from owncloud/block-legacy-clients
...
Block old legacy clients
2015-04-24 18:21:10 +02:00
Arthur Schiwon
9b6a988926
add integration test to ensure correct behaviour on lost connections
2015-04-24 15:50:03 +02:00
Clark Tomlinson
8c0856779b
change error codes to 400
2015-04-24 09:42:02 -04:00
Lukas Reschke
a2f9a2dc6d
Merge pull request #15855 from owncloud/teardownaftercommand
...
Tear down FS after running trash expire
2015-04-24 13:52:55 +02:00
Vincent Petry
18506387c0
Tear down FS after running trash expire
2015-04-24 12:09:09 +02:00
Jan-Christoph Borchardt
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
Jenkins for ownCloud
33d197db29
[tx-robot] updated from transifex
2015-04-24 01:55:15 -04:00
Morris Jobke
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
Olivier Paroz
0729fc2fbc
Remove overflow+watermark
2015-04-23 18:19:34 +02:00
Olivier Paroz
58a87d0bab
Use authorization headers for better compatibility
...
+ add ellipsis
+ fix OC.generateUrl calls
2015-04-23 18:19:29 +02:00
Olivier Paroz
a968877a8b
An idea to suggest that this is just a sample of the full text
2015-04-23 18:19:21 +02:00
Olivier Paroz
530c290555
Use webDAV to have access to HTTP byte ranges
2015-04-23 18:19:17 +02:00
Olivier Paroz
e113d67430
Cache the token value
2015-04-23 18:19:12 +02:00
Olivier Paroz
8d3f88cf16
Show a text preview instead of a bitmap preview of text
...
+ fix the preview height
2015-04-23 18:19:07 +02:00
Vincent Petry
a672e9d556
Merge pull request #15814 from owncloud/public-reshare-webdav
...
Fix webdav access for public reshare
2015-04-23 15:28:10 +02:00
Thomas Müller
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
Robin Appelman
7a3a8e4032
fix subfolder reshares over webdav
2015-04-23 13:42:51 +02:00
Vincent Petry
cc3bc6345b
Only get encryption status when logged in
...
This removes useless warnings in the logs.
2015-04-23 13:06:00 +02:00
Jenkins for ownCloud
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 -04:00
Robin Appelman
57f49391dc
remove unneeded readonlycache
2015-04-22 20:07:54 +02:00
Robin Appelman
7eabd96e4c
update icewind/smb to 1.0.1
2015-04-22 20:05:38 +02:00
Clark Tomlinson
29168665cb
fix messages from settings crontroller
2015-04-22 13:26:06 -04:00
Clark Tomlinson
e3ec1a8bb8
remove status's and adjust js
2015-04-22 11:07:56 -04:00
Clark Tomlinson
1747117edf
destupify tests
2015-04-22 10:46:56 -04:00
Clark Tomlinson
c81bc152d7
fixing return values and adding tests
2015-04-22 10:46:55 -04:00
Robin Appelman
2adb79c794
resolve reshares in public webdav
2015-04-22 16:19:52 +02:00
Thomas Müller
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
Arthur Schiwon
b96b0063f6
throw exception when LDAP Connection was lost
2015-04-22 15:39:28 +02:00
Robin Appelman
03b7f1d015
use the permissions mask cache wrapper instead of the read only cache
2015-04-22 15:28:06 +02:00
Morris Jobke
42d9ba0f83
Merge pull request #15787 from owncloud/trash-partfiles
...
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
Thomas Müller
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
Jenkins for ownCloud
d7bdf60559
[tx-robot] updated from transifex
2015-04-22 01:55:38 -04:00
Vincent Petry
ffc796edcb
Do not trash part files, delete directly
2015-04-21 18:28:15 +02:00
Morris Jobke
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
Thomas Müller
438cb27471
Merge pull request #15721 from oparoz/fix-readonly-cache
...
Fix read-only cache
2015-04-21 16:30:56 +02:00
Jan-Christoph Borchardt
723804ffd7
hide modified header when multiselect is active, fix #15779
2015-04-21 15:38:34 +02:00
Jan-Christoph Borchardt
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
Morris Jobke
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
Olivier Paroz
9695e33e34
Renamed class + split methods
2015-04-21 14:40:11 +02:00
Vincent Petry
53a23364ef
Added empty content message for empty read-only folders
2015-04-21 14:31:13 +02:00
Arthur Schiwon
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
Arthur Schiwon
8593415c12
LDAP Wizard: have always-increasing 'nth Server' number per full page load, fixes #15766
2015-04-21 13:14:35 +02:00
Morris Jobke
4b968da9e6
Merge pull request #15713 from owncloud/fix-15707-master
...
[enc2] Fixing JS errors
2015-04-21 12:47:43 +02:00
Arthur Schiwon
19a2a22de1
bring back border in host input field for consistency
2015-04-21 12:22:40 +02:00
Thomas Müller
490e779424
doc and indent
2015-04-21 12:19:15 +02:00
Thomas Müller
4a2f8f81ca
Don't pollute the global namespace
2015-04-21 12:01:56 +02:00
Jenkins for ownCloud
c548066d2c
[tx-robot] updated from transifex
2015-04-21 01:55:37 -04:00
Thomas Müller
55962c5f5a
make jshint happy
...
This reverts commit ae681f0061
.
2015-04-20 20:51:15 +02:00
Thomas Müller
3bc5c1c3cf
use a simple function - OC.Encryption is already defined - fixes #15707
...
This reverts commit 0ca6398aa3
.
2015-04-20 20:50:08 +02:00
Thomas Müller
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
Joas Schilling
04674c06cc
Dont use the old .status way
2015-04-20 18:26:14 +02:00
Joas Schilling
3f96662609
Fix several minor things
2015-04-20 17:44:34 +02:00
Thomas Müller
a637bd7f2b
Avoid function name collision in dropbox external storage
2015-04-20 14:56:51 +02:00
Lukas Reschke
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
Lukas Reschke
20a6073a9f
Migrate personal certificate handling into AppFramework controllers
...
Also added unit-tests and better error-handling
2015-04-20 12:58:58 +02:00
Arthur Schiwon
460a78436f
move away from deprecated consts
2015-04-20 11:22:11 +02:00
Lukas Reschke
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
Morris Jobke
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
Jenkins for ownCloud
75bf03a605
[tx-robot] updated from transifex
2015-04-20 01:54:44 -04:00
Thomas Müller
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
Jenkins for ownCloud
fd3c1484ad
[tx-robot] updated from transifex
2015-04-19 01:54:41 -04:00
Thomas Müller
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
Thomas Müller
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
Olivier Paroz
80a1f1858e
Tests for read-only cache
2015-04-18 19:43:20 +02:00
Morris Jobke
e837927ad5
fix followup issues with unneeded parameters
2015-04-18 17:02:39 +02:00
Morris Jobke
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
Morris Jobke
85d0fc5cf6
LDAP tests: swithc var_dump to exception
2015-04-18 15:09:15 +02:00
Olivier Paroz
fcc1b9b3cc
Thou shalt not corrupt the answer of a cache request
2015-04-18 12:33:43 +02:00
Joas Schilling
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
Joas Schilling
491e590165
Fix dummy encryption module registration
2015-04-18 10:20:32 +02:00
Jenkins for ownCloud
37a871127b
[tx-robot] updated from transifex
2015-04-18 01:55:19 -04:00
Arthur Schiwon
fe237fd159
always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked
2015-04-17 23:33:59 +02:00
Bjoern Schiessle
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
Thomas Müller
ae681f0061
Revert "make jshint happy"
...
This reverts commit a255866a93
.
2015-04-17 18:02:08 +02:00
Thomas Müller
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
Thomas Müller
a255866a93
make jshint happy
2015-04-17 17:59:53 +02:00
Thomas Müller
c1a60a2349
use a simple function - OC.Encryption is already defined - fixes #15707
2015-04-17 17:57:17 +02:00
Thomas Müller
c6e243928c
move creation of shared key to the login handler - fixes #15705
2015-04-17 17:51:18 +02:00
Thomas Müller
2e803fd2cd
Do not concat translation string
2015-04-17 14:26:58 +02:00
Thomas Müller
d9f23c0578
fixing undefined variable
2015-04-17 14:25:57 +02:00
Thomas Müller
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
Bjoern Schiessle
195a48b2b8
fix change password if no user is logged in, occ call
2015-04-17 13:26:38 +02:00
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Jenkins for ownCloud
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
Clark Tomlinson
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
Clark Tomlinson
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
Bjoern Schiessle
e93f262eac
display warning if password changed or if the keys are not initialized
2015-04-16 14:30:19 +02:00
Bjoern Schiessle
959665003b
decrypt private key for public shares correctly
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
6bcf88ca96
fix decryption of legacy private key
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e7a4f4f3e4
add version
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
Jenkins for ownCloud
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
Morris Jobke
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
Jan-Christoph Borchardt
b92dd82e41
add whitespace to bottom of files list to correctly show dropdowns, fix #15801
2015-04-22 13:58:53 +02:00
Morris Jobke
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
Bjoern Schiessle
389a101de6
make sure that encrypted private keys always have a header
2015-04-15 19:52:48 +02:00
Morris Jobke
4a5c3eea42
Add visibility for method
2015-04-15 17:40:07 +02:00
Vincent Petry
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
Thomas Müller
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
Jenkins for ownCloud
1a894bd0d8
[tx-robot] updated from transifex
2015-04-15 01:54:38 -04:00
Jenkins for ownCloud
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
Björn Schießle
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
Morris Jobke
c53a53f705
Allow files app nav entries to have a different icon class
2015-04-14 16:17:24 +02:00
Morris Jobke
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
Thomas Müller
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
Robin Appelman
0f21303b75
a bit more phpdoc
2015-04-14 12:35:53 +02:00
Thomas Müller
f816acde27
fix reading of private key
2015-04-14 12:23:25 +02:00
Thomas Müller
ffa115b517
Merge pull request #15566 from owncloud/fix-filepicker
...
fix filepicker
2015-04-14 00:39:12 +02:00
Robin Appelman
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
Robin Appelman
8688660825
check that we know the parent
2015-04-13 17:10:02 +02:00
Robin Appelman
6b5daca7b7
check for source cache
2015-04-13 17:10:02 +02:00
Robin Appelman
d4c91dc835
add missing return for shared
2015-04-13 15:13:03 +02:00
Robin Appelman
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
Robin Appelman
d16ee4138d
Fix test
2015-04-13 15:13:03 +02:00
Robin Appelman
d726db7459
Implement move/copyFromStorage for shared storage
2015-04-13 15:13:03 +02:00
Morris Jobke
a88e013f72
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
...
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
Vincent Petry
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
Arthur Schiwon
41ad4f46c8
adjust to current master
2015-04-13 12:04:51 +02:00
Arthur Schiwon
a418150470
fix and more robustness thx to scrutinizer
2015-04-13 11:50:09 +02:00
Arthur Schiwon
66bc8145a9
allow login names to be used for s2s with LDAP users
2015-04-13 11:50:09 +02:00
Roeland Jago Douma
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
Morris Jobke
59efcb63a3
fix filepicker
...
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Morris Jobke
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
Clark Tomlinson
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
Thomas Müller
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Morris Jobke
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
Bjoern Schiessle
d1fa3c6b32
add unit test for crypt.php
2015-04-10 15:12:57 +02:00
Robin Appelman
a41fbf7a92
update icewind/smb to 1.0.0
2015-04-10 14:59:16 +02:00
Vincent Petry
4a225aa12c
Clear leftover shares from other tests
2015-04-10 14:53:17 +02:00
Vincent Petry
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +02:00
Vincent Petry
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
Jörn Friedrich Dreyer
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
Morris Jobke
1427ea78d4
fix typo and comment
2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
077ab27281
fix_tests
...
Conflicts:
apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
488405d1ec
do not hide exception when ldap server has a hiccup
2015-04-10 09:12:37 +02:00
Morris Jobke
43b503641c
Merge pull request #15521 from owncloud/shareinfo-catchguzzle503
...
Properly catch guzzle 503 when querying share info
2015-04-10 00:23:05 +02:00
Thomas Müller
02614d214e
Merge pull request #15437 from owncloud/deleteorphanedfiles
...
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
blizzz
c6151053ba
Merge pull request #15492 from owncloud/ldap-wizard-overhaul
...
LDAP Wizard Overhaul
2015-04-09 23:52:53 +02:00
Arthur Schiwon
60bf934e6f
change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability
2015-04-09 21:05:20 +02:00
Arthur Schiwon
a8b831b018
compile user and login filter on the first time automatically, if a suggestion was provided
2015-04-09 21:05:16 +02:00
Lukas Reschke
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Vincent Petry
4feb97d8e4
Properly catch guzzle 503 when querying share info
2015-04-09 18:55:28 +02:00
Vincent Petry
2865f09984
Merge pull request #15282 from owncloud/keepsharerelationshipondelete
...
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Vincent Petry
5803a1f5f7
Remove trashbin storage wrapper when disabling it for tests
2015-04-09 15:02:24 +02:00
Arthur Schiwon
ca9426308d
escape filter for output
2015-04-09 14:49:11 +02:00
Arthur Schiwon
3abc72dad8
fix number and insert position when adding/copying a config
2015-04-09 14:44:40 +02:00
Arthur Schiwon
00c2970547
update back/continue buttons also on tab click
2015-04-09 14:40:00 +02:00
Lukas Reschke
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
Arthur Schiwon
b4c96e6ba0
cleanup
2015-04-09 14:01:39 +02:00
Arthur Schiwon
630e35d8cc
newlines at end of file
...
yes, IDE is now configured accordingly.
2015-04-09 14:00:34 +02:00
Arthur Schiwon
9ed9741d81
doc
2015-04-09 13:56:20 +02:00
Arthur Schiwon
3354881355
move script and style inclusions into template
2015-04-09 13:52:35 +02:00
Lukas Reschke
96e7f607d5
Remove unneeded file
2015-04-09 13:29:51 +02:00
Arthur Schiwon
8e7081d784
run functionality checks also when host field changes
2015-04-09 12:36:53 +02:00
Vincent Petry
08a9d1d2dc
Remove unused $toRemove
2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt
c840c18252
Merge pull request #15499 from owncloud/admin-hints
...
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
Jan-Christoph Borchardt
65dc958418
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:07:05 +02:00
Arthur Schiwon
40edaa5a69
adjust tests
2015-04-09 12:00:11 +02:00
Lukas Reschke
4ca6419475
Fix PHPDoc
2015-04-09 10:54:53 +02:00
Lukas Reschke
3aad47c0f0
Fix code style
2015-04-09 10:46:46 +02:00
Lukas Reschke
d869f8212b
Enforce string as passed type
2015-04-09 10:45:50 +02:00
Vincent Petry
461302244e
Keep shares when deleting shared folders
...
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Arthur Schiwon
5355c285fc
LDAP Wizard Overhaul
...
wizard refactor
reimplement save spinners and cursor
implement Port detector
introduced detector queue, added base dn detector
disable input fields when detectors are running
introduce spinners for fields that are being updated by detector
cache jq element objects
consolidate processing of detector results in generic / abstract base class
display notification if a detector discovered a problem
don't run base dn detector if a base is configured
reset detector queue on configuration switch
implement functionality check and update of status indicator
document ConfigModel
jsdoc for controller and main view
more documentation
implement the user filter tab view
so far the multiselects get initialized (not filled yet) and the mode can be switched.
mode is also restored.
reintroduce filter switch confirmation in admin XP mode
new detector for user object classes. so we also load user object classes if necessary and are able to save and show the setting.
multiselect trigger save actions now on close only
show spinners automatically, when a detector is running
20k limit for object classes preselection test
adjust wordings, fix grammar
add group (for users tab) detector
also includes wording fixes
error presentation moved from detectors to view, where it belongs
add info label to users page
missing wording changes
show effective LDAP filter in Assisted Mode
add user filter detector
implement count button for users and limit all count actions to 1001 for performance reasons
make port field a bit bigger. not perfect though.
do not detect port automatically
implement login filter tab view
only load features in assisted mode and don't enable assisted fields while in raw mode
add tooltips on login filter checkbox options for better understanding
permanently show filter on login tab
and also compile login filter in assisted mode
test/verify button on login attributes tab, with backend changes.
only run wizard requests if your an active tab. also run compile filter requests when switching to assisted mode
underline toggle filter links to stress that they are clickable
unity user and group tab functionality in common abstract class, add group filter tab view. only detectors and template adjustments left to have group tab implementation complete
add object class and group detector for groups as well as filter composer
show ldap filter permanently on groups tab
introduce input element that can deal better with many groups, will be used with > 40
fix disabling complex group chooser while detection is running
hide complex group chooser on config switch
fix few more issues with complex chooser
make complex group chooser available on Users tab as well
detect base dn improvements/changes:
- do not look for Base DN automatically, offer a button instead
- fix for alternative way to detect a base dn (if agent dn is not given)
- do not trigger filter composers on config switch
Changes with configuration chooser controls
- "New" was removed out of the configuration list
- and split into buttons "add" and "copy"
- delete button is also now an icon
add test button for Base DN
reimplement advanced tab. The save button is gone.
reimplement expert tab
remove unused methods
implement mail attribute detector
implement user display name attribute detection
implement member group association detector
replace text input with textarea for raw filter input
finish functionality check
auto-enable good configurations, as it was before
cleanup
move save confirmation handling to base class, reduces code duplication
enable tabs only if no running save processes are left.
move onConfigLoaded to base class, avoids code duplication
simplify, save LOCs
Test Configuration button to be dealt with in main view as it is a cross-tab element
require detectorQueue in constructor
cleanup
put bootstrap into a function and thus make it testable
get rid of old stuff
2015-04-09 09:47:49 +02:00
Morris Jobke
56f1ffe820
Merge pull request #14676 from owncloud/deleteorphanedshares
...
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
62936aa323
Merge pull request #15488 from owncloud/files-navigation-icons
...
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
Morris Jobke
91a90e25ae
fix for IE8
2015-04-08 21:05:31 +02:00
Jan-Christoph Borchardt
84c2fe85b7
add icons to files sidebar, fix shade, fix position of settings icon and text
2015-04-08 19:25:28 +02:00
Clark Tomlinson
fc2711e156
Merge pull request #15472 from owncloud/enc_backward_compatibility
...
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke
d01a2acbcf
Merge pull request #15469 from owncloud/fix/15463
...
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle
4ce5669419
read cipher from key header and always write a key header if a new private key is stored
2015-04-08 14:26:00 +02:00
Vincent Petry
69ba67ec0f
Merge pull request #15464 from owncloud/fixmasterunittests
...
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke
c3c50fb481
Fix language level incompatibilties
...
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.
Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry
4acf6747d2
Disable trashbin when testing orphaned shares deletion job
2015-04-08 13:04:06 +02:00
Thomas Müller
19834211b4
Merge pull request #15443 from owncloud/encryption-user-hook-tests
...
adding test for user hooks
2015-04-08 12:56:18 +02:00
Vincent Petry
f8cfc03f36
Replace originalStorage in tests with a proper teardown
...
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Vincent Petry
9c3893ce69
Added FIXME about registering jobs in apps.php
2015-04-08 12:09:42 +02:00
James Anslow
d53aa4a816
Fixing issue #15322 - showing Settings button next to gear icon
2015-04-08 11:57:33 +02:00
Vincent Petry
17b141337a
Delete orphaned shares in a background job
2015-04-08 10:47:55 +02:00
Morris Jobke
cefdcea021
[command] delete orphaned file cache entries
...
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
Bjoern Schiessle
215a9bcbc3
fix function call
2015-04-08 09:32:55 +02:00
Clark Tomlinson
4098f5f7fd
adding test for user hooks
2015-04-07 11:49:50 -04:00
Thomas Müller
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
Thomas Müller
54a3bdf1c5
fixing unit test execution related to trashbin
2015-04-07 13:30:31 +02:00
Clark Tomlinson
d637bffac6
adding user setup test and adding 4 tests to keymanager
2015-04-07 13:30:31 +02:00
Clark Tomlinson
28c8017928
adding recoverFileTest
2015-04-07 13:30:31 +02:00
Clark Tomlinson
c7c3caedf5
adding recovery tests
2015-04-07 13:30:31 +02:00