Commit Graph

15561 Commits

Author SHA1 Message Date
Joas Schilling fef4462904
Make sure the file information is available when sending the email
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-20 12:52:56 +01:00
Morris Jobke a4ad8af6e3
Add proper default value for datadir
* better safe than sorry
* fixes #3091

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:49:41 -06:00
Nextcloud bot 48a3f2a8a2
[tx-robot] updated from transifex 2017-01-20 01:07:41 +00:00
Morris Jobke 8565011b8d Merge pull request #3144 from nextcloud/use-data-download-response
Use DataDownloadResponse
2017-01-19 15:36:31 -06:00
Joas Schilling 5812e99f1d
Fix app section tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 15:30:40 +01:00
Arthur Schiwon 1f7b08bd19
LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 15:19:20 +01:00
Arthur Schiwon f2c9d04eac
test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 12:48:50 +01:00
Arthur Schiwon 01d469dfea
add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 11:09:04 +01:00
Joas Schilling 17a7eaabcd
Add the icons for shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
Bjoern Schiessle 3882a8d648
some code cleanup while working on the file
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:46 +01:00
Bjoern Schiessle cd8104dfb0
add brute force protection to 'mount public link' operation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:46 +01:00
Arthur Schiwon 18a75bec0d
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
John Molakvoæ 2cfedb3623 Merge pull request #3150 from nextcloud/highlight-active-navigation
highlight active navigation entry better, fix #2096
2017-01-19 06:47:30 +01:00
Morris Jobke 3798f842c0
theme app navigation menu highlight color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-18 21:42:50 -06:00
Lukas Reschke 2d73a003d7 Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverage
2fa backup codes test coverage
2017-01-19 02:26:39 +01:00
Nextcloud bot f58f3d7aab
[tx-robot] updated from transifex 2017-01-19 01:08:09 +00:00
Arthur Schiwon a515de54e7
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
Arthur Schiwon 689df9a843
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
Christoph Wurst 65f303164f fix file ending
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 2f30a71b19 make sure files end with emtpy line
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 85e4febc24 ignore code we're unable to test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 3b4b49fa95 test activity provider
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 6f6eb5b301 increase GenericProvider's test coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Lukas Reschke be3ec7ffb7
Use DataDownloadResponse
1. As documented
2. No need to show this inline, downloading has security advantages

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-18 17:00:09 +01:00
Lukas Reschke 29d2ca5991 Merge pull request #3078 from nextcloud/2fa-backup-codes-entropy
Increase 2fa backup codes entropy
2017-01-18 16:08:59 +01:00
Joas Schilling 5d1f7e5a7b
Allow subadmins to add people to groups via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:34:38 +01:00
Joas Schilling d80a4453af
Make sure subadmins can not delete users from their last subadmin group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:56:24 +01:00
Joas Schilling ae77067a07
No need to check the subadmin again
The user needs to be a subadmin of the group,
otherwise they are not allowed to remove anyone from the group

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:43:52 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Morris Jobke 08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem
Escape the name for the jquery selector
2017-01-17 18:40:11 -06:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
Christoph Wurst 3295fe2eb7
add title to backup codes print page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 10:32:28 +01:00
Christoph Wurst e111015afa
print and close the new tab, not the current one when printing backup codes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 10:32:28 +01:00
Christoph Wurst 3ee5c7ea4e
minor version bump
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:17:56 +01:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Christoph Wurst 6726c98bbd
use constant and clean up unit test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 13:14:15 +01:00
Björn Schießle 6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name
generate correct path for owner and use the display name instead of t…
2017-01-16 12:29:16 +01:00
Christoph Wurst 3b76699c9c
Increase 2fa backup codes entropy
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 11:24:03 +01:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Joas Schilling d26b902a13
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Bjoern Schiessle 27357569b6
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Nextcloud bot 09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
Christoph Wurst 140555b786
always allow remembered login
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f84eb89fc
fix constructor params in failing test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f74ecd94a
use login hook credentials as fallback
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst e4abb9cb6e
migrate 'password::sessioncredentials' extern storage auth to credential store
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Rodrigo Almeida 4f3da2bee4
Update mobile.css 2017-01-11 09:12:08 +01:00
Bjoern Schiessle fcda3a20f4
create new encryption keys on password reset and backup the old one
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Morris Jobke b727edf17e Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
Make sure the used event type and the setting/filter are the same
2017-01-10 14:28:30 +01:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Joas Schilling a70a081fff
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:28:55 +01:00
Morris Jobke 97a63ad689 Merge pull request #2982 from nextcloud/better-notification-links
Set the link of the notification on render instead of creation
2017-01-10 10:27:01 +01:00
Roeland Jago Douma b847dfcee9 Merge pull request #2925 from nextcloud/remove-close-wrapper
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
Joas Schilling b29149402c
Fix update notification tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
Joas Schilling bb84db02cb
Cleanup comment tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
Joas Schilling 315645ada3
Only add the link when the user can follow it.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
Joas Schilling acbf0d151f
Set the link of the notification on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +01:00
Joas Schilling e675c2a66c
Set the comment link on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Roeland Jago Douma 6347d97c7f Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
Only allow admins to delete tags
2017-01-06 16:17:09 +01:00
Robin Appelman 5774d3e82c
replace close:// streamwrapper with CallBackWrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
Morris Jobke 460ef39b18 Merge pull request #2676 from nextcloud/smb-2.0.0
Update icewind/smb to 2.0.0
2017-01-05 17:07:12 +01:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Robin Appelman 8429687788
Update icewind/smb to 2.0.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 09:16:03 +01:00
Thomas Müller d5d726fc24
Fix generation of birthday, deathdate and anniversary in case where no year is set - which is allowed as per https://tools.ietf.org/html/rfc6350#section-6.2.5 (#26756)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 09:00:33 +01:00
Bjoern Schiessle 0c11209d33
allow to access mail shares even if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Nextcloud bot acad4ba93e
[tx-robot] updated from transifex 2017-01-03 01:07:46 +00:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Morris Jobke 47d7d26bda
remove unused parameters and add viewBox
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-02 15:32:16 +01:00
Roeland Jago Douma db3c918adb
Fix legacy caldav endpoints
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Lukas Reschke 3c34b8577c
Add test execution against legacy DAV backend
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 5c50df72b7
[tx-robot] updated from transifex 2017-01-01 01:07:30 +00:00
Nextcloud bot 02eb0f7fa4
[tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Roeland Jago Douma 2f235d9693 Merge pull request #2894 from nextcloud/provisioning_api_middleware_tests
Adds provisioning middleware tests
2016-12-30 20:35:30 +01:00
Roeland Jago Douma e13affa29d
Adds provisioning middleware tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-30 14:12:10 +01:00
Nextcloud bot fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Roeland Jago Douma 3256a1c792
Add files_external webdav apache tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-29 12:47:48 +01:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Nextcloud bot bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Arthur Schiwon 754760fdbe
mention property to follow same style
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 17:01:58 +01:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Lukas Reschke 56c016946d Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch
[downstream] Fix maindetailsview favorite star patch
2016-12-23 16:36:53 +01:00
Christoph Wurst cfada468e6
OC.Uploader does not have a 'state' method, therefore the
dead code can be removed

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-23 15:38:48 +01:00
Roeland Jago Douma 6f96af0fce Merge pull request #2819 from nextcloud/trash-ext-link-uselinkowner
Fallback to share link owner when no owner found
2016-12-23 14:36:34 +01:00
Roeland Jago Douma 886341aca4 Merge pull request #2816 from nextcloud/changing_how_favorites_are_serialized
Return explicit values instead of boolean from sabre (#26654)
2016-12-23 14:36:05 +01:00
Lukas Reschke c5cc0d87a8 Merge pull request #2833 from nextcloud/downstream-26750
Introduce group display name support (#26750)
2016-12-23 13:57:59 +01:00
Vincent Petry 504a1f0d57
Testing app switch to force-enable test user backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:38:04 +01:00
Lukas Reschke 91c87d3a7a Merge pull request #2820 from nextcloud/testing-md5home
Testing md5home (#26854)
2016-12-23 12:22:15 +01:00
Arthur Schiwon b4d779977a
fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
Vincent Petry 14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Morris Jobke 0886788507 Merge pull request #2815 from nextcloud/fix-plural-files
Just use moment to comupte the time left for the upload - translation…
2016-12-22 15:30:22 +01:00
Morris Jobke bb8b647bd6 Merge pull request #2633 from nextcloud/2fa-activities
two-factor activities
2016-12-22 14:47:15 +01:00
Morris Jobke 6789685c4e Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Remove config change hook that deletes link shares (#26612)
2016-12-22 14:45:20 +01:00
Thomas Müller aa8755bd4b
Add navigation via info.xml (#26785)
* Read navigation information from info.xml

* Load files navigation elements from info.xml

* Add comment about ignoring the exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:34:41 +01:00
Vincent Petry b32e252fb0
Testing md5home (#26854)
* Allow clearing default user backends in config.php

When specifying "user_backends" in config.php, a new option "default"
when set to false will prevent the default user backend to be
registered. The default one is the database backend.
This makes it possible to select exclusive user backends from apps.

* Testing app provides test user backend for alternative homes

The backend provide md5 result to getHome()

* Only md5 the user home when it's not the admin

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 11:03:42 +01:00
Morris Jobke 1588dd0ee0 Merge pull request #2802 from nextcloud/trash-improvements
let the owner restore files if they where moved out of a shared folder
2016-12-22 11:00:25 +01:00
Vincent Petry 34d466b2f6
Fallback to share link owner when no owner found
When creating link shares from external storage, the filesystem cannot
find an owner in some scenarios (ex: system-wide mounts). In such
cases, fall back to using the current user's trashbin which happens to
also be the user who created the link share.

Fixes an issue where this scenario made deletion impossible due to
missing user information.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:48:32 +01:00
Joas Schilling 8f664a00e1 Merge pull request #2803 from nextcloud/hide-notification-for-updates
Hide update notification if notification center is enabled
2016-12-22 10:39:15 +01:00
Sergio Bertolín 928f113361
Return explicit values instead of boolean from sabre (#26654)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:10:29 +01:00
Morris Jobke f88d615445 Merge pull request #2808 from alantygel/patch-1
Translation string corrected > 1 user
2016-12-22 10:04:35 +01:00
Thomas Müller 2bf4661e40
Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:01:58 +01:00
Nextcloud bot 0b64e96c9b
[tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Alan Tygel efff51c7a8 Translation string corrected > 1 user 2016-12-21 16:34:24 -03:00
Bjoern Schiessle a1d6f3068a
make code more robust
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 18:02:19 +01:00
Bjoern Schiessle 60810b44bc
check for class name in case class is not loaded
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:50 +01:00
Bjoern Schiessle 0e4eeab3c1
add a copy to the owners trash bin if another user moves a file out of a shared folder
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:47 +01:00
Morris Jobke d498d0982e
Hide update notification if notification center is enabled
* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-21 15:44:06 +01:00
Lukas Reschke 591b60d11c Merge pull request #2758 from nextcloud/only-one-dav-backend
Register only one dav backend
2016-12-21 13:03:48 +01:00
Nextcloud bot fe9a38d5b5
[tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Lukas Reschke f0bb62f2fe Merge pull request #2273 from nextcloud/fix_invalid_calendar
Add DAV repair step to fix calendar data
2016-12-20 23:09:27 +01:00
Lukas Reschke 1c80307537
Add SMB tests and execute files_external tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 22:05:33 +01:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling e53d0c0d69
Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-20 09:32:47 +01:00
Arthur Schiwon 7887566cff
remove frequent, unimportant log message
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-19 23:36:11 +01:00
Vincent Petry 000ba6484f
When grouping shares, sort by stime then id (#26777)
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Lukas Reschke 450373fd18
Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:55 +01:00
Michael Jobst a7526b9837
Style modifications of favorite star on main detail view (#26658)
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:09 +01:00
Vincent Petry 9473ab5c19
Remove config change hook that deletes link shares (#26612)
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.

A future cleanup could be done through a background job.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Thomas Müller 04cf77120c
Fix error when $view is null when being passed into some plugins
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:53:13 +01:00
Thomas Müller 6345748a70
Fix "Call to a member function getUID() on null"
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:18 +01:00
Thomas Müller b19aad88fb
No challenge within federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Thomas Müller 4a823188a9
Allow registration of federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
Thomas Citharel dcbf434841
Register only one dav auth backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
Christoph Wurst 3f4ba2d15d
fix typo
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 15:01:23 +01:00
Lukas Reschke 34fb313466 Merge pull request #2689 from andreas-p/fix-remote-conflict
Fix showConflict
2016-12-19 14:34:56 +01:00
Christoph Wurst 5bad93472d
catch specific BadMethodCallException
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 12:01:32 +01:00
Christoph Wurst ed4017dfb4
fix minor issues
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:48 +01:00
Christoph Wurst 9300312046
push activity when backup codes are generated
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Christoph Wurst 7ae9442f3d
Publish, parse and filter 2FA activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
pflug c7fc010215 Fix showConflict
use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
2016-12-19 08:11:04 +01:00
Roeland Jago Douma f86f4eb98d Merge pull request #2504 from nextcloud/downstream-ldap-15
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Lukas Reschke 00b4dedef5 Merge pull request #2550 from nextcloud/smb-notify-rename
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke 511056dd3f Merge pull request #1678 from nextcloud/smb-stat-root
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Roeland Jago Douma 82d76fbe96
Fix TodoTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-16 11:50:50 +01:00
Roeland Jago Douma 4fdefef7e8 Merge pull request #2625 from nextcloud/fix-todo-filter
Fix the Todos filter
2016-12-16 08:20:00 +01:00
Lukas Reschke 5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Morris Jobke 237791e315 Merge pull request #2674 from nextcloud/lookup-server-connector-12
mark nc12 as supported for the lookup_server_connector
2016-12-14 12:31:27 -06:00
Roeland Jago Douma 67f65677a1 Merge pull request #2665 from nextcloud/remove-db-class-and-interface
Remove IDb interface which was deprecated for 3 years already
2016-12-14 19:05:41 +01:00
Robin Appelman fc3b2f1139
mark nc12 as supporter
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 11:58:57 -06:00
Lukas Reschke 8a00638425
Don't set Content-Disposition header if one already exists
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-14 17:35:27 +01:00
Robin Appelman 5d0897b8d7
use unmasked permissions in shared scanner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Joas Schilling bc3da3a8f5
Remove IDb interface which was deprecated for 3 years already
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 11:42:16 +01:00
Roeland Jago Douma cd1929382f Merge pull request #2654 from nextcloud/increase-master-version
Update app versions and requirements
2016-12-14 11:20:58 +01:00
Roeland Jago Douma 9e353f6289
Fix overwriting parameter
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Lukas Reschke edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Robin Appelman bbe24d29ca
reuse cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Lukas Reschke e49088315e Merge pull request #2615 from nextcloud/daita-sharecontroller
Download a file in a subfolder in a sharedlink is not working
2016-12-12 18:28:06 +01:00
Maxence Lange 43374292b1 update phpdoc
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Lukas Reschke 6cd421e603 Merge pull request #2620 from nextcloud/theming-externalfiles
Show theming icons on external storage folders
2016-12-12 16:04:48 +01:00
Joas Schilling 89ba394c89
Fix the Todos filter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-12 15:26:28 +01:00
Bjoern Schiessle 91303469e0
improve wording of admin settings to enable search on the public address book
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-12 13:55:12 +01:00
Julius Haertl b12db1b494
Show theming icons on external storage folders
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-12 12:18:38 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Maxence Lange 9ef8d25e46 Download a file in a subfolder in a sharedlink is not working
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Nextcloud bot ea7a69f198
[tx-robot] updated from transifex 2016-12-11 01:07:18 +00:00
Lukas Reschke 4456fa57e0 Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars
Do not add invites into read-only calendars
2016-12-10 12:22:15 +01:00
Nextcloud bot 7cb99e74db
[tx-robot] updated from transifex 2016-12-10 01:07:15 +00:00
Björn Schießle d10be51d40 Merge pull request #2588 from nextcloud/theming-check-empty
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
Joas Schilling de8908bf29 Merge pull request #2584 from nextcloud/theming-filter-fix
Add fallback to FILTER_LANCZOS for icon resizing
2016-12-09 14:53:34 +01:00
Julius Haertl 5fbadee95f
Check if image files for theming are empty
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
Julius Haertl 366f14d7db
Add fallback to FILTER_LANCZOS for icon resizing
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 11:53:27 +01:00
Joas Schilling 474720ff1c
Overwrite the schedule target calendar with the personal one and create it if missing
Otherwise this leads to problems like events being added to the birthday calendar,
if that one is the first calendar which was created for the user. See:
https://github.com/nextcloud/server/pull/2274

Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-09 09:34:25 +01:00
Nextcloud bot 88d90066ba
[tx-robot] updated from transifex 2016-12-09 01:07:18 +00:00
Roeland Jago Douma 158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width
Fix popover width
2016-12-08 13:49:56 +01:00
Nextcloud bot 74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Robin Appelman b5401adc00
Fix order of parameters when getting notified of smb renames
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-07 16:25:10 +01:00
John Molakvoæ (skjnldsv) 2eca4e65b3
Fix popover margin and width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-07 10:50:54 +01:00
Nextcloud bot ea801d7d7c
[tx-robot] updated from transifex 2016-12-07 01:07:46 +00:00
blizzz c776aa9282 Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder
fix change permission on mail shares of folders
2016-12-06 22:53:46 +01:00
Arthur Schiwon 7e2b866fd7
fix type in jsdoc
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 18:08:13 +01:00
Joas Schilling b8e9d255d3
Only allow admins to delete tags
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-06 16:30:21 +01:00
Roeland Jago Douma 5326985c71 Merge pull request #2519 from nextcloud/404-versions-download
Show nice error page for not available versions
2016-12-06 12:01:30 +01:00
Nextcloud bot 2a647f4d3a
[tx-robot] updated from transifex 2016-12-06 01:07:19 +00:00
Morris Jobke aac3024878 Merge pull request #2505 from nextcloud/sudo-mode-provisioning-api
Require sudo mode on the provisioning API
2016-12-05 22:29:29 +01:00
Morris Jobke f03cd2c685
Show nice error page for not available versions
* fixes #1464

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-05 22:15:59 +01:00
Morris Jobke 8fdfb41b93 Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-top
Move lately used tags to the top
2016-12-05 16:10:33 +01:00
Morris Jobke 7ce5303374 Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet
Add an activity when managing favorites
2016-12-05 15:44:24 +01:00
Robin Appelman af9b3e3889
fix conflict dialog styling in firefox
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-05 14:20:54 +01:00
Joas Schilling bea85adc08
Require sudo mode on the provisioning API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-05 11:55:21 +01:00
Arthur Schiwon 0c8e4b91d3
adjust: sanitizeDN resides in Helper
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:36:20 +01:00
Juan Pablo Villafáñez efa1077872
Extract lowercase conversion out of the loop
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:47 +01:00
Arthur Schiwon 6496b95564
range support for LDAP read operations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:16 +01:00
Nextcloud bot dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
John Molakvoæ 3234d4b36c Merge pull request #2497 from nextcloud/theming-icon-fixes
Fixing issues with themed icons
2016-12-04 16:09:12 +01:00
Julius Haertl fd6670ae72
Fix transparency of icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:37 +01:00
Julius Haertl f423bdcb81
Fix background border radius
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:36 +01:00
Julius Haertl 797e761492
Move sizing to renderAppIcon method
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:29 +01:00
Joas Schilling 1a802d3383
Add tests for favorite action
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:54:34 +01:00
Joas Schilling 7c1b288b57
Add some generic tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:41:14 +01:00
Joas Schilling 8baf986d3b
Add an activity when managing favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:16:49 +01:00
Nextcloud bot 3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
Nextcloud bot 181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Lukas Reschke 1131338562 Merge pull request #2486 from nextcloud/shared-storage-mask
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
Morris Jobke 2bc931dd10 Merge pull request #2437 from nextcloud/update-notification-icons
Use an icon for the update notifications
2016-12-02 20:05:50 +01:00
John Molakvoæ 535655e23c Merge pull request #2483 from nextcloud/fix-unshare-icon-c
Fix share tab view
2016-12-02 19:49:32 +01:00
John Molakvoæ (skjnldsv) 14219c1082
Fix loader position and visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
John Molakvoæ (skjnldsv) ef04bea5fb
Fix popover arrow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
Morris Jobke 717f1d380c Merge pull request #2475 from nextcloud/fix-filename-local-link
fix width of filename in sidebar to accommodate local link
2016-12-02 18:04:57 +01:00
Morris Jobke df12824a5b Merge pull request #2479 from nextcloud/icon-for-empty-versions
add icon if no versions are available
2016-12-02 18:03:50 +01:00
Robin Appelman 02ee4f958c
apply permissions mask for shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
John Molakvoæ (skjnldsv) 8a12f0bc8f
Fix unshare delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
Lukas Reschke bd2a8e768e Merge pull request #2471 from nextcloud/harden_files_drop
Harden files drop
2016-12-02 17:43:04 +01:00
Morris Jobke 48dddf82eb
properly calculate the width of the name in the sidebar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 16:08:41 +01:00
Morris Jobke db56df1893 Merge pull request #2469 from nextcloud/fix-loading-icon-background
Remove white background from loading icon
2016-12-02 15:53:38 +01:00
Bjoern Schiessle edb116ae93
add icon if no versions are available
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-02 15:45:11 +01:00
Jan-Christoph Borchardt ac527769c5 fix width of filename in sidebar to accommodate local link
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-02 14:49:19 +01:00
Morris Jobke b6184b0bc2
Increase width of new menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 14:29:15 +01:00
Jan-Christoph Borchardt 40a11f12c0 fix vertical sizing change of popover in new folder flow
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-02 13:22:48 +01:00
Roeland Jago Douma 1f387ad1e6
Add unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-02 13:06:13 +01:00
Roeland Jago Douma 363963577c
Harden files drop
* Fail on MKCOL
* Only take filename ignore directories
* No need to parse query parameters

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-02 13:03:56 +01:00
Morris Jobke 4bb1154f50
Fix input field for new folder - fixes #2245
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:53:24 +01:00
Morris Jobke 0853f0e7a8
Remove white background from loading icon
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:39:12 +01:00
Joas Schilling 5ba13dd0e4
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-02 09:37:08 +01:00
Nextcloud bot 1b5ff9f5c7
[tx-robot] updated from transifex 2016-12-02 01:07:35 +00:00
Morris Jobke ac1bf3c2b7 Merge pull request #2432 from nextcloud/activity-mail-language
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
Christoph Wurst ea45b22053 Merge pull request #2444 from nextcloud/detect-also-a-400-status
Catch status code 400
2016-12-01 21:25:54 +01:00
Roeland Jago Douma 61d61e794c Merge pull request #2435 from nextcloud/sidebar-preview-non-preview
allow registering sidebar preview handlers for mimetypes that dont co…
2016-12-01 21:14:10 +01:00
Lukas Reschke 9704b4df52
Catch status code 400
In case the server returns a statuscode 400 we should also gracefully return to the home directory.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-01 19:13:28 +01:00
Robin Appelman a4900bf23f
allow registering sidebar preview handlers for mimetypes that dont come with server side previews
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-01 15:43:17 +01:00
Bjoern Schiessle a4e2dc3033
fix mouse pointer
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-01 15:37:08 +01:00
Joas Schilling 1aefbed55f
Highlight the app name in the notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01:00
Joas Schilling 917cac5436
Use the settings icon for the update notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01:00
Roeland Jago Douma b89aafc241
We should always show permanent actions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-01 15:16:06 +01:00
Lukas Reschke a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Robin Appelman d7dd399bbd Merge pull request #2422 from nextcloud/text-preview-debug
remove js debug statements in sidebar text preview generator
2016-11-30 15:39:59 +01:00
Nextcloud bot f075c22c72
[tx-robot] updated from transifex 2016-11-30 14:18:08 +00:00
Robin Appelman 7fc118e8ea
remove js debug statements in sidebar text preview generator
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-30 14:54:54 +01:00
Roeland Jago Douma f15ea9ec05 Merge pull request #2406 from nextcloud/move-dav-activities-to-new-api
Move dav activities to new api
2016-11-30 14:01:58 +01:00
Joas Schilling b4d76b16b4
Add tests for the base provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 12:04:19 +01:00
Joas Schilling 2854e2f413
Move generic tests into namespace
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 11:41:38 +01:00
Joas Schilling ad10c5c4b4
Deduplicate the provider code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 11:39:38 +01:00
Morris Jobke 86168c8ea7 Merge pull request #1446 from nextcloud/fix-mail-design
Fix mail design
2016-11-30 11:31:43 +01:00
Joas Schilling de1cb1ec32
Add unit tests for ISetting instances
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 10:52:16 +01:00
Joas Schilling 56f45e4960
Add tests for the filters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 10:47:55 +01:00
Lukas Reschke 6458b5adb5 Merge pull request #2414 from nextcloud/version_previews
Fix empty version previews
2016-11-30 10:03:17 +01:00
Roeland Jago Douma 05b86faccc
Display link share icon when toggling share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 09:35:38 +01:00
Joas Schilling 09e5e38591
Add an icon when the file is shared by mail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Joas Schilling 1aa874e4e3
Also get infos about email shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Joas Schilling 15ca00c66e
Make sure the app is loaded in dav
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Roeland Jago Douma cd52b98ec7 Merge pull request #2409 from nextcloud/fix-1470
log exception about user not present on LDAP on login only if logleve…
2016-11-30 09:02:34 +01:00
Roeland Jago Douma 869ae38bea Merge pull request #2105 from nextcloud/focus-tags-input-on-toggle
Focus the input after clicking the "Tags" label
2016-11-30 08:57:00 +01:00
Nextcloud bot 41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Morris Jobke 01867b42d4 Update sharedbymail template
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 01:07:00 +01:00
Felix Epp 6aa79cacfd Fix mail header logo [fixes #1326]
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-30 01:06:47 +01:00
Roeland Jago Douma 66a77a8857
Fix js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-29 20:48:03 +01:00
Roeland Jago Douma 4dcd0474d5
Show mimeicon when versions don't have a preview
Fixes #2413

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-29 20:35:57 +01:00
Nextcloud bot 0fb912e724
[tx-robot] updated from transifex 2016-11-29 17:57:47 +00:00
Lukas Reschke 9680201644 Merge pull request #2410 from nextcloud/fix-mobile-text
Fix missing text for downloads on mobile
2016-11-29 18:49:21 +01:00
Nextcloud bot a84dacc16f
[tx-robot] updated from transifex 2016-11-29 17:03:24 +00:00
Morris Jobke db84c1c872
Fix missing text for downloads on mobile
* fixes #2362

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-29 17:06:09 +01:00
Arthur Schiwon 1e5344ffe9
log exception about user not present on LDAP on login only if loglevel is set to debug
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-11-29 17:05:55 +01:00
Joas Schilling 4c0263b78a
Move event and todo parsing to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 16:27:12 +01:00
Joas Schilling 8d87e39146
Deduplicate icon assignment
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 16:08:58 +01:00
Joas Schilling ddc82b4ca2
Move calendar activity parsing to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:47:43 +01:00
Joas Schilling a16fd3991a
Move CalDAV activity settings to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:06:54 +01:00
Joas Schilling 253a75e5ae
Move CalDAV activity filters to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-29 15:04:08 +01:00
John Molakvoæ (skjnldsv) bd18349f46
Fix mobile view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 13:47:37 +01:00
John Molakvoæ (skjnldsv) a984f4b430
Fix #2384
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 07:06:41 +01:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Roeland Jago Douma 8a9343a709 Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications
Add an icon to the federated sharing notification
2016-11-28 21:00:27 +01:00
blizzz cd9d1f589f Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications
Rich strings and icons for mention notifications
2016-11-28 18:13:54 +01:00
Joas Schilling b31d621840
Add an icon to the federated sharing notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-28 17:23:42 +01:00
Morris Jobke 587f28ad42 Merge pull request #2378 from nextcloud/fix-preview-image_src
Fix image_src link
2016-11-28 17:03:25 +01:00
Lukas Reschke 9def8225c0
Fix image_src link
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
Morris Jobke a12d2e67e7 Merge pull request #2335 from nextcloud/grouping-for-activities
Bring back grouping for activities
2016-11-28 16:18:02 +01:00
Bjoern Schiessle e5c31b72e1
bring back permissions for mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-28 11:24:05 +01:00
Björn Schießle 46b4891bd7 Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api
Move ShareByMail activities to new API
2016-11-28 11:09:47 +01:00
Nextcloud bot ca7b9e5490
[tx-robot] updated from transifex 2016-11-28 09:51:57 +00:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Joas Schilling 7e6f829d54 Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect
[Minor] Fix link to external storage settings on error notification
2016-11-27 09:02:26 +01:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Felix A. Epp c911a876bf Fix link to external storage settings on error notification
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-26 10:15:42 +01:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Joas Schilling da9468522b
Add an event merger and use it for the files activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:36:11 +01:00
Joas Schilling 5ba2b1c193
Working towards groups
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:19:55 +01:00
Joas Schilling f067d0ee66
Correctly match the subjects to the parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:45:40 +01:00
Joas Schilling 9f915e061c
Remove old test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:40 +01:00
Joas Schilling 719b1905d7
Get user name from contacts if available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:06 +01:00
Roeland Jago Douma 72f9920a58
Add Identityproof tests
* Add tests for Key
* Add tests for Manager
* Add tests for Signer
* Removed URLGenerator from Signer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 21:50:19 +01:00
Roeland Jago Douma 6f5316e443
Add DAV repair step to fix calendar data
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 20:31:01 +01:00
Morris Jobke 8f14ffd734 Merge pull request #2306 from nextcloud/dont-log-user-password
Don't log the user password in case something goes wrong
2016-11-24 17:08:25 +01:00
Joas Schilling 5c2ec58440
Move ShareByMail activities to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 16:15:51 +01:00
Jan-Christoph Borchardt e75dede590 fix some outdated naming
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
Joas Schilling df0eeb8089
Don't log the user password in case something goes wrong
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 13:58:03 +01:00
Lukas Reschke f4cf125a4a Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section
Fix some language issues in the federation admin panel
2016-11-24 10:13:57 +01:00
Joas Schilling fbd574cc82
Fix some language issues in the federation admin panel
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 09:34:06 +01:00
Joas Schilling 1c564fd554 Fix placeholder typo in public link activity
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Lukas Reschke 4c5e7d270a
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
root 861c8572c0
restore ldap_password_pr
Signed-off-by: Roger Szabo <roger.szabo@web.de>

remove notification part

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizzz comments

Signed-off-by: Roger Szabo <roger.szabo@web.de>

morris comment

Signed-off-by: Roger Szabo <roger.szabo@web.de>

improved error message for changing password

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizz comments 20161013

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Adjust HintException usage

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>
2016-11-23 19:02:48 +01:00
Morris Jobke 59db9fada2 Merge pull request #2281 from nextcloud/fix-translation
Fix language typo
2016-11-23 17:53:21 +01:00
Lukas Reschke 5473475fa7 Merge pull request #2232 from nextcloud/imagescale-fix
Workaround for PHP bug when calling imagescale
2016-11-23 17:45:59 +01:00
Joas Schilling 14f01dbe33
Fix language typo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke 6d92550772 Merge pull request #2278 from nextcloud/filelist-share-visible
make the share icon in the filelist visible again
2016-11-23 16:40:10 +01:00
Morris Jobke 6281607d7a
improved style of shared entry
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 15:25:48 +01:00
Lukas Reschke aa30c4cd80 Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key
init Session/privateKeys on Master Key
2016-11-23 15:19:24 +01:00
Morris Jobke 25f519c855 Merge pull request #2266 from nextcloud/avatar_image
VCARDS don't hold binary data
2016-11-23 14:49:32 +01:00
Robin Appelman 3bb3296c53
make the share icon in the filelist visible again
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-23 14:44:53 +01:00
Lukas Reschke 2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
Roeland Jago Douma e9f98fd5a9
VCARDS don't hold binary data
* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-23 13:30:32 +01:00
Bjoern Schiessle 8a401ee156
check if session is initialized
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +01:00
Lukas Reschke f692ea34f1 Merge pull request #2263 from nextcloud/remove91_migration
Remove migration steps in app dav
2016-11-23 12:18:06 +01:00
Joas Schilling d2489ebee4
Adjust tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:31:35 +01:00
Joas Schilling bfecdd4422
Use the comment icon for the notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:44 +01:00
Joas Schilling 56cfd0a6e4
Set the rich object string for comment notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:41 +01:00
Joas Schilling a36d26950e
Only do stuff when its a remote-share activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
Thomas Müller 181af830fd
Remove 9.1 migration steps in app dav (#25654) 2016-11-22 20:17:05 +01:00
Joas Schilling e9336dddd5
Specify the parameters on public download
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
Lukas Reschke f4470b6861 Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again
Use the display name for files activities again
2016-11-22 18:25:52 +01:00
Lukas Reschke 717fd9fdd6 Merge pull request #2229 from nextcloud/select2-fix-bis
Select2 fix bis
2016-11-22 17:50:53 +01:00
Morris Jobke f6e7269628
document new variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
Joas Schilling e1feb72583
Use the display name for files activities again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 16:39:29 +01:00
Maxence Lange 558a934842 init Session/privateKeys on Master Key
I can't find another way to init the session ...
2016-11-22 13:19:42 -01:00
Roeland Jago Douma 9619f49ba4
Fix undefined systemtags stuff
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-22 14:59:51 +01:00
Julius Haertl 6c4664bc82
Workaround for PHP bug when calling imagescale
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-22 12:12:59 +01:00
Joas Schilling b8732a1a53 Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api
Update systemtags activity to new API
2016-11-22 11:05:06 +01:00
John Molakvoæ 6bcb6e08be
Fix systemtagsfilelist unwanted margin and clean aera a bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-22 10:49:24 +01:00
Roeland Jago Douma 08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
Morris Jobke a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke d0c3c5cee3 Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests
fix PropPatch requests on calendars
2016-11-21 22:54:17 +01:00
Georg Ehrke 3a8c4230be
fix PropPatch requests on calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2016-11-21 22:10:51 +01:00
Lukas Reschke ccf3e4255a
Remove debug code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke 7b3855a375
Add config switch
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke c49b0d3834
Remove unused variable
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
Lukas Reschke dac980115f
Add retry job
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma 15c075eba8
Fix lookup url
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma c20c7f31da
Push json to the lookupserver
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma f7f70028d1
Search on lookup server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
Lukas Reschke fb91bf6a5b
Add a signer class for signing
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Bjoern Schiessle 069023416c
lookup server connector
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle b23a4ca96b
push public user data to the lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle 3a880879ce
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle 8f33d9d1c0
update system address book if the user change the personal settings
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:57 +01:00
John Molakvoæ (skjnldsv) b75ef0f8b3
Fix popover layout fix for files and global
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Joas Schilling 041dd937cf
Update test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 16:51:50 +01:00
Morris Jobke 332eaec4c0 Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions
Password confirmation for some actions
2016-11-18 15:42:30 +01:00