58f72309cc
Merge pull request #5736 from smueller18/patch-2
...
do not show hyphen in og:title if slogan does not exist
2017-07-18 09:04:47 +02:00
7fa02905aa
still remove the federated share even if we cant notify the remote
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:19:44 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
7cf3dc4e29
do not show hyphen in og:title if slogan does not exist
2017-07-14 15:26:44 +02:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
c46b158e10
update sharing test to new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
f3c25e177f
Merge pull request #5407 from nextcloud/5157-simple-logo
...
Simplified Nextcloud logo icon #2
2017-07-04 12:56:05 +02:00
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
3470d0a44e
Simplified Nextcloud logo icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-02 14:14:49 +02:00
928b6a376e
[tx-robot] updated from transifex
2017-06-29 00:08:26 +00:00
fd63577089
Improve wording of various error messages
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-21 14:51:59 -05:00
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
c9ef998f17
Merge pull request #5091 from nextcloud/shared-cache-during-init
...
dont die if we try to access the shared cache while setting up the shared storage
2017-06-19 13:47:59 +02:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
db14089d6c
Merge pull request #5375 from nextcloud/share-folder-for-remote-shares
...
Use the share_folder config for remote shares
2017-06-14 22:42:06 -05:00
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
2398d40d98
Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email
...
Allow to find local users by their email address
2017-06-14 18:03:24 -05:00
f28511cac6
Add unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:32:34 +02:00
4f98852f52
Make sure to only add system users once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:07:21 +02:00
ae693129db
Allow to find local users by their email address
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:07:47 +02:00
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
b5beaf7ef4
Use the share_folder config for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 14:30:25 +02:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
bb884c341f
[tx-robot] updated from transifex
2017-06-06 00:08:45 +00:00
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
e3e3e8edf2
[tx-robot] updated from transifex
2017-05-27 00:08:32 +00:00
a46d2f1d39
[tx-robot] updated from transifex
2017-05-25 00:08:04 +00:00
ed89034047
dont die if we try to access the shared cache while setting up the shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-24 13:56:09 +02:00
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
3ec9d91bd0
Split multi-author entries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
bc8fbc1a67
Bump app versions as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
fdfe8f7f15
Adjust version requirement
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
462f12611c
[tx-robot] updated from transifex
2017-05-22 00:08:23 +00:00
119e8474b6
fix for sharing
...
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
879e11e7d1
Merge pull request #4812 from nextcloud/move-sharing-to-migration
...
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00:00
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00:00
443cbdc739
[tx-robot] updated from transifex
2017-05-17 00:08:09 +00:00
c180ad1caa
Remove primary class from public link download button
2017-05-16 20:47:52 +02:00
91dfff5db4
Revert "fix permissions of mountpoints - take 2"
2017-05-15 12:43:25 -05:00
ad0d0b0916
Merge pull request #4685 from nextcloud/fix_4683
...
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
9b750c08ac
update comment to code
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
6e3a914f4a
[tx-robot] updated from transifex
2017-05-13 00:08:00 +00:00
51757716ec
Fix the share type of guest shares when migrating from ownCloud
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
643b4a4ec4
Move the file sharing app to migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
645f0aa96f
[tx-robot] updated from transifex
2017-05-12 00:07:46 +00:00
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
37b847ec48
[tx-robot] updated from transifex
2017-05-09 05:08:07 +00:00
6109afc14d
[tx-robot] updated from transifex
2017-05-08 00:07:37 +00:00
412d3e2e80
Fix SharedStorage Test
...
A moveable mount point (What a SharedStorage is) always has DELETE +
UPDATE permissions. Since you can either delete (unshare) or update
(rename) it.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:43:05 +02:00
4e4bc17ff5
Merge pull request #4545 from individual-it/access-control-3726
...
show error message when "files-drop" upload fails
2017-05-03 00:21:40 +02:00
24ff230f93
Merge pull request #4620 from nextcloud/preview-error-handling
...
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
23cc309606
Handle more error cases
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
9a366dbe2e
add missing translation and other small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
866e5d6d05
use configured lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
ab9a36e872
allow apps to set custom mount types
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
f2f2e7b6fb
some small refactoring and reformating
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:55 +05:45
79c760a10c
use jqXHR.fail() to check for failures
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:36 +05:45
17a31a51c6
Fix share indicator handling
...
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
133f3fdc9a
[tx-robot] updated from transifex
2017-04-25 00:07:30 +00:00
c5617f4e8a
Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
...
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
36f55b5867
Fix working icon placement on password save
...
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.
The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.
Fixes #4135
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
f5b900b654
Merge pull request #4412 from individual-it/master
...
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
faf55adb90
deleted forgotten code in test
...
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
810fb7ff2c
Merge pull request #4402 from nextcloud/fix-clickable-area
...
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
a0ada9aab4
Don't use deprecated getMock() anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
b469882595
Merge pull request #4212 from individual-it/master
...
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
16b8397765
Fix clickable area in share permissions menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:41:26 -05:00
4be923e459
Improve menu CSS
...
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
ad24b86013
Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
...
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
bf58d24b5c
remove accidently left over *f*it
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
88f02f27a3
JS tests for upload only function
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
cdb65eff34
refactor to make it easier to test
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
727688ebd9
Adjust existing bruteforce protection code
...
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
ec034757fa
Merge pull request #4337 from nextcloud/fix-adblock-share-icon
...
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
66835476b5
Add support for ratelimiting via annotations
...
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
06f8ea247b
Remove invalid route
...
Said file doesn't exist anymore and accessing it would just return a 500
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:05:44 +02:00
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
37145a275f
Fix AdBlock blocking share icon, ref #866
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
35188899e9
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
...
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
4d7c7b1816
[files_sharing] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
1729e4471f
Update comments to Nextcloud
...
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
81b1dc4930
share api expanded by tags ( #26583 )
...
* share api expanded by tags
* Modified files_sharing JS Unit tests
* modified tests. renamed request parameter. refactoring
* Update Share20OCS.php
Added missing function description
* Update Helper.php
Added missing function description
* Update Helper.php
implicit boolean conversion to !empty()
* Update Share20OCSTest.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
45a6e37699
Merge pull request #4293 from nextcloud/fix_4248
...
Do reload shared views
2017-04-11 11:53:01 -05:00
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
8c01e45d6b
Do reload shared views
...
Fixes #4248
The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 09:33:27 +02:00
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
676a4c781a
update capabilities
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
3795636b90
validate file name before uploading in upload only folder
...
fixes #4211
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-05 13:26:40 +05:45
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
0d5147bd49
add new password column to the share table in order to set passwords for share by mails
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
9098042c95
[tx-robot] updated from transifex
2017-04-01 00:08:09 +00:00
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
4821c00ea8
Merge pull request #4004 from nextcloud/backport-27172
...
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
ae3016959e
fix shared storage numeric id
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 14:05:18 +02:00
d9ebc2626f
[tx-robot] updated from transifex
2017-03-27 00:07:55 +00:00
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
4ea79a5bbe
[tx-robot] updated from transifex
2017-03-25 01:07:45 +00:00
48158c8bec
Combine additional files_sharing scripts
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
a5a29ee27a
Merge pull request #3953 from nextcloud/downstream-27027
...
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
869ba16273
do not remove the method and only keep the tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:10:43 -06:00
a12ec5ec77
set cache to failedcache when shared storage init fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:01:23 +01:00
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
...
The CacheWrapper will properly forward the call to the wrapped cache.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
39ac804899
[tx-robot] updated from transifex
2017-03-23 01:07:52 +00:00
d551b8e6fd
[tx-robot] updated from transifex
2017-03-22 21:14:04 +00:00
16a0bccefa
Merge pull request #3972 from nextcloud/merge-some-more-css
...
Merge some CSS files using our SCSS compiler
2017-03-22 08:46:10 +01:00
cae8702ab2
[tx-robot] updated from transifex
2017-03-22 01:07:53 +00:00
20a0a18fbd
Fix reshare with user activity message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
1084cdb613
fix path
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
5c7ad6d3ec
Merge some CSS files using our SCSS compiler
...
This saves around 4 requests on the average page load.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
7e95837097
Merge pull request #3955 from nextcloud/downstream-27113
...
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
Morris Jobke
Robin Appelman
Nextcloud bot
Stephan Müller
Roeland Jago Douma
Maxence Lange
Joas Schilling
Bjoern Schiessle
Marin Treselj
Jan-Christoph Borchardt
Daniel Hansson
Roeland Jago Douma
blizzz
Artur Neumann
Vincent Petry
Daniel Calviño Sánchez
Lukas Reschke
Michael Jobst