Commit Graph

16395 Commits

Author SHA1 Message Date
Morris Jobke dc58206ded Merge pull request #5852 from nextcloud/preview_trash_cleanup
Preview trash cleanup
2017-07-27 17:24:47 +02:00
Nextcloud bot 65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Joas Schilling 28290d8691 Allow to enable the external storage app via the web ui
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-26 14:30:21 +02:00
Nextcloud bot da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Lukas Reschke 3faef644a1 Merge pull request #5864 from nextcloud/legacy_user
Remove legacy OC_User_Backend and OC_User_Interface
2017-07-25 17:15:11 +02:00
Morris Jobke 89a7b007f2 Fix comments
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 08:57:58 +02:00
Nextcloud bot 11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 20:42:55 +02:00
Morris Jobke e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app
Cleanup testing app
2017-07-24 15:03:15 +02:00
Morris Jobke c775d5e497 Merge pull request #5514 from nextcloud/assembly-stream-seek
refactor chunked assembly stream
2017-07-24 15:00:03 +02:00
Roeland Jago Douma 7f6a72b65d
Move over locking controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:44:03 +02:00
Roeland Jago Douma 10efec246d
Move over Config
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:43:00 +02:00
Roeland Jago Douma d1993c32e5
Move Application to AppInfo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:42:58 +02:00
Roeland Jago Douma 6d4731024a
Some app fixes of phpstorm inspections
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
Roeland Jago Douma 549845aa73
Delete trash using node API to trigger preview deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:14:12 +02:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Morris Jobke b6c67f585e Merge pull request #5827 from nextcloud/improve-public-share-header
Add filename and sharer in public page
2017-07-22 10:59:33 +02:00
Nextcloud bot ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Morris Jobke 50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling
Improve error handling for accepting federated shares
2017-07-21 22:54:14 +02:00
Morris Jobke b2b4691e48 Add filename and sharer in public page
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 18:55:37 +02:00
Robin Appelman 89b747d066
refactor chunked assembly stream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 12:49:39 +02:00
Roeland Jago Douma 86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
still remove the federated share even if we cant notify the remote
2017-07-21 12:45:01 +02:00
Bjoern Schiessle 8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:09:13 +02:00
Bjoern Schiessle e78040d250
improved error handling
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:07:32 +02:00
Morris Jobke 407a500745 Merge pull request #5803 from nextcloud/fix-public-links
fix preview for public links
2017-07-21 09:34:36 +02:00
Morris Jobke 3d9fd4d0d1 Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker
Add Phan plugin to check for SQL injections
2017-07-21 09:25:24 +02:00
Nextcloud bot 964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Lukas Reschke 3d2600b039
Add Phan plugin to check for SQL injections
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 22:48:13 +02:00
Björn Schießle c0e9b374f1 Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload
Add recovery key on public upload
2017-07-20 14:07:57 +02:00
Bjoern Schiessle 473824fa06
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
Bjoern Schiessle 20a6b22db6
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:14 +02:00
Bjoern Schiessle ae8a3ce085
fix preview for public links
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:24:52 +02:00
Joas Schilling 0b3266531b
Fix copy and paste error on activity descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-20 09:31:14 +02:00
Nextcloud bot 26c42d3d30
[tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Joas Schilling 3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens
Only use readable chars in Share Tokens
2017-07-19 16:40:18 +02:00
Roeland Jago Douma d5e3428af5 Merge pull request #5776 from nextcloud/install-phan
Run phan over code base
2017-07-19 13:45:31 +02:00
Lukas Reschke d8ec399454
Run phan over code base
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Morris Jobke e48ca730fe Add Android and iOS URLs to theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:20:47 +02:00
Roeland Jago Douma e2298e0a71
Allow overwriting of IOS theming values
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 08:22:45 +02:00
Nextcloud bot 0ee83ac56b
[tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Joas Schilling 984933e586
Only use readable chars in Share Tokens
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 15:44:34 +02:00
Roeland Jago Douma 1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4
Spelling: Bigversal and LDAP
2017-07-18 09:09:46 +02:00
Morris Jobke 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
Roeland Jago Douma 4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1
Spelling: Shortening and binding
2017-07-18 08:52:09 +02:00
Morris Jobke 99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2
Spelling: command-line, Consider narrowing
2017-07-18 08:49:48 +02:00
Morris Jobke 7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6
Spelling: sent, an invitation, - successful
2017-07-18 08:49:06 +02:00
Morris Jobke 79cf7d610f Merge pull request #5740 from nextcloud/comradekingu-patch-5
Spelling: log out, : Bigversal
2017-07-18 08:48:08 +02:00
Nextcloud bot b1b843e572
[tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Roeland Jago Douma 1956ea0e13 Merge pull request #5743 from nextcloud/comradekingu-patch-7
Spelling: - your
2017-07-17 14:42:13 +02:00