6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
1a711b1e73
Merge pull request #5956 from nextcloud/proper-update-notification-layout
...
Improve update notification layout and show non-default update server
2017-08-02 16:26:57 +02:00
fbfd371493
Merge pull request #5923 from nextcloud/expire-federation-jobs
...
Expire federation jobs
2017-08-02 16:15:28 +02:00
4ca4b270e7
Close all the cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:35:14 +02:00
81c54ea515
Use automatic injection whenever possible
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:34:51 +02:00
9391d8fc60
Improve update notification layout and show non-default update server
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 13:56:36 +02:00
7f2e9d10a3
Show correct status in update notification
...
Sometimes it could be the case that after a channel change the last updated
timestamp is reset, but the check for updates is not yet completed. In this
case the update notification showed "You are up to date" and the date was
"1970-01-01 00:00:00". With this fix the state is properly shown.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 10:45:26 +02:00
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-01 18:09:07 +01:00
f93a82b8b0
Remove explicit type hints for Controller
...
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
578e4f9903
Filter magic dot object when swift directory
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-01 14:57:33 +02:00
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
a20934227c
Remove undocumented config
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:59:10 +02:00
c23c05d4f6
Fix versions app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:57:08 +02:00
231bb47ae6
Fix file size comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
d703744d4a
Fix comparisions in the trashbin app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
80febeae21
Fix comparisons in the sharing app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
7a62fbd205
Fix comparisons in the files external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
e30287cf81
Fix comparisons in the files app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
45e2c415d4
Fix comparison in the ldap app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
1e2de86c3a
Fix comparisons in the versions app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
89238164e1
Fix comparisons in the dav app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:55:07 +02:00
0ebdf871e0
Fix comparisons in encryption app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +02:00
c8452803ef
Merge pull request #5897 from nextcloud/add-share-mail-for-user-share
...
Send an email once a file/folder is shared with a user
2017-08-01 13:27:15 +02:00
bc54e6ff7c
Use ITimeFactory
...
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 11:23:40 +02:00
3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
80c08e8fd0
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
9c9cb1a6db
cleanup constructors
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
06b9e58081
expire requestSharedSecret job after 30 days
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
51d85eb2f8
expire getShareadSecret job after 30 days
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:51 +02:00
2fae696d35
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
61a6adff14
Fix sabre test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
ede15f0988
Fix L10N::t
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
fd465d4e49
[files_external] Fix phpdoc
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
fc369dd86e
[DAV] Fix URLUtil::splitPath usage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
f57a3aa81b
[DAV][CalDAV] Fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
201bbb962c
Fix Comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
19b039e6e0
[files_external] fix commands
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
b7c8e9ed88
[files_external] Fix phpdoc
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
dfd8125aeb
Replace wrong PHPDocs
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
d321e9792e
Add |null to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
e1f52fc901
Stricter phan config fixes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
f71dc7523f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
f53db38c03
Change id to class in the main share template
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-31 12:19:19 +02:00
7b2c08a31a
Merge pull request #5905 from nextcloud/ocp-config
...
Use IConfig instead of static OCP\Config
2017-07-31 10:54:40 +02:00
baee0b4bcc
Merge pull request #5913 from nextcloud/fix-anchor-name
...
Fix anchor name for federated sharing settings
2017-07-31 08:51:23 +02:00
a309fa7d6b
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-31 08:19:54 +02:00
97d06a7698
[tx-robot] updated from transifex
2017-07-31 00:08:02 +00:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
fae327799b
Fix anchor name for federated sharing settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:21:25 +02:00
baa6db3539
[tx-robot] updated from transifex
2017-07-28 00:08:05 +00:00
dc58206ded
Merge pull request #5852 from nextcloud/preview_trash_cleanup
...
Preview trash cleanup
2017-07-27 17:24:47 +02:00
c27498db71
Use IConfig instead of static OCP\Config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-27 13:43:18 +02:00
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
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
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
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
89a7b007f2
Fix comments
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 08:57:58 +02:00
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
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
e785b849c7
Merge pull request #5835 from nextcloud/cleanup_testing_app
...
Cleanup testing app
2017-07-24 15:03:15 +02:00
c775d5e497
Merge pull request #5514 from nextcloud/assembly-stream-seek
...
refactor chunked assembly stream
2017-07-24 15:00:03 +02:00
7f6a72b65d
Move over locking controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:44:03 +02:00
10efec246d
Move over Config
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:43:00 +02:00
d1993c32e5
Move Application to AppInfo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:42:58 +02:00
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
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
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
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
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
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
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
25439919f8
fix phpdoc return types (no code change)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:12 +02:00
9b2f171cbd
do not attempt to recognise cert issue by using LDAPTLS_REQCERT
...
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:11 +02:00
89b747d066
refactor chunked assembly stream
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 12:49:39 +02:00
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
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
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
407a500745
Merge pull request #5803 from nextcloud/fix-public-links
...
fix preview for public links
2017-07-21 09:34:36 +02:00
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
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
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
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
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
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
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
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
26c42d3d30
[tx-robot] updated from transifex
2017-07-20 00:08:04 +00:00
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
d5e3428af5
Merge pull request #5776 from nextcloud/install-phan
...
Run phan over code base
2017-07-19 13:45:31 +02:00
d8ec399454
Run phan over code base
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
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
e2298e0a71
Allow overwriting of IOS theming values
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 08:22:45 +02:00
0ee83ac56b
[tx-robot] updated from transifex
2017-07-19 00:08:22 +00:00
984933e586
Only use readable chars in Share Tokens
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 15:44:34 +02:00
1ac6eae7d5
Merge pull request #5739 from nextcloud/comradekingu-patch-4
...
Spelling: Bigversal and LDAP
2017-07-18 09:09:46 +02:00
Morris Jobke
Roeland Jago Douma
Joas Schilling
Nextcloud bot
Julius Härtl
Lukas Reschke
Robin Appelman
Roeland Jago Douma
Bjoern Schiessle
Marin Treselj
Arthur Schiwon