wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37324 commits 157 branches 562 tags 714 MiB
Commit graph

15449 commits

Author SHA1 Message Date
Robin Appelman
a359d0d7c7
remove test for removed code 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Lukas Reschke
1a591cea97 Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array 
Make sure ownCloud 8.2 activities also can get displayed
 2017-02-08 14:47:45 +01:00
Joas Schilling
54e39d4b93
Fix files sharing legacy as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-08 11:55:50 +01:00
Nextcloud bot
1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Joas Schilling
d79838ac9b
Add tests for getUser() 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-07 12:01:28 +01:00
Joas Schilling
881c7275a2
Add tests for getFile() 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-07 11:49:32 +01:00
Joas Schilling
c031c77e3c
Make sure ownCloud 8.2 activities also can get displayed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-07 11:30:23 +01:00
Nextcloud bot
5e4bbb394c
[tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Nextcloud bot
fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot
e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Marius Blüm
9ce8437b8b Merge pull request #3353 from nextcloud/mobile-view-files-fix 
Fix files mobile view
 2017-02-04 21:00:40 +01:00
Nextcloud bot
03bbda913d
[tx-robot] updated from transifex 2017-02-04 01:07:20 +00:00
Nextcloud bot
49bce91404
[tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Joas Schilling
d318e2b005
Fix Sharing app description 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-02 16:22:21 +01:00
Nextcloud bot
b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
John Molakvoæ (skjnldsv)
e0e5b32f94
Fix files mobile view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-01 18:39:27 +01:00
Nextcloud bot
1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
Morris Jobke
5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store 
Login credential store
 2017-01-30 19:30:04 -06:00
Nextcloud bot
9a13fac418
[tx-robot] updated from transifex 2017-01-31 01:07:05 +00:00
Morris Jobke
687e38c409 Merge pull request #2970 from nextcloud/notify-self-test 
Add self-test for files_external:notify
 2017-01-30 17:15:57 -06:00
Arthur Schiwon
9983e05121
LDAP's checkPassword should only catch when a user was not found, fixes #2431 
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-30 17:06:51 +01:00
blizzz
64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir 
Add proper default value for datadir
 2017-01-30 13:01:24 +01:00
Nextcloud bot
bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot
f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot
b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Morris Jobke
8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml 
Add navigation via info.xml (#26785)
 2017-01-27 11:25:26 -06:00
Robin Appelman
90c011379c
update autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:51:00 +01:00
Robin Appelman
d14ff70050
add unit tests for smb notify backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:44:45 +01:00
Robin Appelman
72eeb8fd22
add notify self test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:44:41 +01:00
Robin Appelman
c7536f7877
switch occ files_external:notify to new notify mechanism 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:44:37 +01:00
Robin Appelman
269747985e
Add a more powerful notify mechanism 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:44:33 +01:00
Robin Appelman
0aa211eefb
Add missing smb files 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-27 10:44:29 +01:00
Joas Schilling
27f8a832e4
Force to specify the name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-27 09:44:11 +01:00
Nextcloud bot
a5aeddc810
[tx-robot] updated from transifex 2017-01-27 01:07:18 +00:00
Morris Jobke
426c8e3be1 Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug 
fix shared-as-busy events for owner
 2017-01-26 17:30:51 -06:00
Lukas Reschke
dd0d469833 Merge pull request #3272 from nextcloud/fix_user_controller 
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
 2017-01-26 18:37:36 +01:00
Roeland Jago Douma
ce240a45e6 Merge pull request #3160 from nextcloud/streams52 
update icewind/streams to 0.5.2
 2017-01-26 14:55:37 +01:00
Robin Appelman
c9ecd64d36
update icewind/streams to 0.5.2 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-26 12:19:32 +01:00
Georg Ehrke
97d3020027
fix shared-as-busy events for owner 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-01-26 12:06:07 +01:00
Lukas Reschke
3afd3c3a3d Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth 
add brute force protection for public link authentication
 2017-01-26 12:05:16 +01:00
Bjoern Schiessle
3e6c40eeb4
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-26 11:31:08 +01:00
Morris Jobke
3a603ab8b4 Merge pull request #3264 from nextcloud/ldap-deny-long-dns 
Gracefully deny users or groups with too long DNs
 2017-01-26 01:15:43 -06:00
Morris Jobke
feab1e5b94 Merge pull request #3162 from nextcloud/ldap-ocs 
Part 1 of LDAP Backend OCS Api
 2017-01-25 22:45:34 -06:00
Nextcloud bot
05e3aa491a
[tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Morris Jobke
6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon 
Settings icon for LDAP and encryption
 2017-01-25 18:43:21 -06:00
Bjoern Schiessle
ed55b87b65
add brute force protection for public link authentication 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-25 18:17:08 +01:00
Arthur Schiwon
03ae7b654f
Gracefully deny users or groups with too long DNs 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-25 17:10:51 +01:00
Björn Schießle
ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api 
add data from the users profile to the provisioning api
 2017-01-25 15:44:36 +01:00
Björn Schießle
5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links 
allow editing single files shared as public link
 2017-01-25 15:35:57 +01:00
Joas Schilling
95ef625a9d
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-25 11:24:42 +01:00
Bjoern Schiessle
5086335643
unify endpoints form core and the the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-25 11:20:35 +01:00
Nextcloud bot
c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke
f9c3639607
add icon for encryption settings on personal page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-24 12:59:36 -06:00
Morris Jobke
e46410e856
Add icon to admin page sidebar for LDAP 
* follow up to nextcloud/server#3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-24 12:54:32 -06:00
Morris Jobke
e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons 
add icons to navigation of personal & admin settings
 2017-01-24 10:56:31 -06:00
Bjoern Schiessle
fee42647fb
add data from the users profile to the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-24 14:23:18 +01:00
Bjoern Schiessle
92d7dd4781
allow editing single files shared as public link 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-24 13:41:27 +01:00
Nextcloud bot
30e9d67ee9
[tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Morris Jobke
f19feccf9f Merge pull request #3209 from nextcloud/fix-theming-typo 
Fix typo in theming description
 2017-01-23 13:54:52 -06:00
Morris Jobke
9b0c6c0eff Merge pull request #3157 from nextcloud/fcloseafterkill 
[uc] Prevent PHP request to get killed when using fclose callback (#26775)
 2017-01-23 13:51:43 -06:00
Morris Jobke
30c32e0b16 Merge pull request #3220 from nextcloud/direct-link-open-sidebar 
open the sidebar when opening a permalink
 2017-01-23 12:57:52 -06:00
Morris Jobke
d80bc6c72b Merge pull request #2924 from nextcloud/flexbox-header 
Use flexbox for header and rearrange some elements
 2017-01-23 12:16:27 -06:00
Robin Appelman
0f698e2021
open the sidebar when opening a permalink 
Also works for search results

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-23 18:06:24 +01:00
Joas Schilling
4bb8731089
Fix typo in theming description 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-23 12:35:58 +01:00
Vincent Petry
0aaf209c66
Prevent PHP request to get killed when using fclose callback (#26775) 
* Prevent PHP request to get killed when using fclose callback

* Add ignore_user_abort everywhere where the time limit is set to 0

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-23 12:33:20 +01:00
Joas Schilling
5d486478d3 Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group 
Subadmin check on removing user from group
 2017-01-23 12:10:06 +01:00
Christoph Wurst
47c63e6a3e
fix public sharing buttons 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:08:10 +01:00
Christoph Wurst
a1f9425e65
fix log and app name 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:06:45 +01:00
Christoph Wurst
bfa50a4444
more cleanup 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:06:45 +01:00
Morris Jobke
16afaa783b Merge pull request #3118 from nextcloud/newFileMenu-css-guidelines 
Fit newFileMenu to css guidelines
 2017-01-22 20:39:16 -06:00
Nextcloud bot
8024f5a17f
[tx-robot] updated from transifex 2017-01-23 00:17:39 +00:00
John Molakvoæ
7eec5e0c27 Merge pull request #3190 from nextcloud/fix-sharing-popover 
Fix #3174
 2017-01-22 20:40:48 +01:00
John Molakvoæ (skjnldsv)
0fc0bcf6b3
Popover newFolder input fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv)
3d86275f1e
Popover positionning fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv)
961fcfa1fb
Popover positionning and classes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:08 -06:00
John Molakvoæ (skjnldsv)
418ebfbdf4
fit newFileMenu to css guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:08 -06:00
Morris Jobke
0d6e3ca86b Merge pull request #3187 from nextcloud/inputs-scss-optimisation 
Inputs.scss rewritting and optimisation
 2017-01-22 11:41:49 -06:00
John Molakvoæ (skjnldsv)
4c47b8e3a3
Fixed public share download button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:32:51 +01:00
John Molakvoæ (skjnldsv)
0a400c4259
Fixed sharing js 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:26:59 +01:00
John Molakvoæ (skjnldsv)
6a617fa721
Fixed public share header buttons 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:25:02 +01:00
John Molakvoæ (skjnldsv)
ba8a9a9cd2
Login and authenticate inputs fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:38:07 +01:00
Nextcloud bot
012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
John Molakvoæ (skjnldsv)
f40e5b73f7
Fix #3174 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:06:57 +01:00
Morris Jobke
d16051fa6f
fix test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-20 23:12:45 -06:00
Nextcloud bot
d0c6179ec1
[tx-robot] updated from transifex 2017-01-21 01:07:47 +00:00
Arthur Schiwon
91ed70f094
fix deletion for configIDs < s10 
Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-20 23:01:46 +01:00
Arthur Schiwon
9ca4065ef5
LDAP PUT command now supports setting multiple keys at once 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-20 22:01:08 +01:00
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