]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoAdded closeCursor in SharedMount numeric id 1201/head
Vincent Petry [Tue, 30 Aug 2016 07:52:54 +0000 (09:52 +0200)]
Added closeCursor in SharedMount numeric id

8 years agoPrevent error with orphaned shares when updating user mount cache
Vincent Petry [Thu, 25 Aug 2016 16:06:13 +0000 (18:06 +0200)]
Prevent error with orphaned shares when updating user mount cache

8 years agoMerge pull request #1198 from nextcloud/php56-and-70-only
Lukas Reschke [Tue, 30 Aug 2016 17:11:16 +0000 (19:11 +0200)]
Merge pull request #1198 from nextcloud/php56-and-70-only

Exclude older PHP versions from .travis.yml

8 years agoMerge pull request #1087 from nextcloud/get-delay-twice
Lukas Reschke [Tue, 30 Aug 2016 16:43:01 +0000 (18:43 +0200)]
Merge pull request #1087 from nextcloud/get-delay-twice

dont get bruteforce delay twice

8 years agoProper branding 1198/head
Lukas Reschke [Tue, 30 Aug 2016 16:27:44 +0000 (18:27 +0200)]
Proper branding

8 years agoShow error if PHP version below 5.6 is used
Lukas Reschke [Tue, 30 Aug 2016 16:26:48 +0000 (18:26 +0200)]
Show error if PHP version below 5.6 is used

8 years agoExecute only tests for modern PHP versions
Lukas Reschke [Tue, 30 Aug 2016 16:26:06 +0000 (18:26 +0200)]
Execute only tests for modern PHP versions

8 years agoExclude older PHP versions from .travis.yml
Lukas Reschke [Tue, 30 Aug 2016 15:50:28 +0000 (17:50 +0200)]
Exclude older PHP versions from .travis.yml

8 years agoMerge pull request #1195 from nextcloud/heartbeat-short-circuit
Lukas Reschke [Tue, 30 Aug 2016 15:41:45 +0000 (17:41 +0200)]
Merge pull request #1195 from nextcloud/heartbeat-short-circuit

Short circuit processing of the heartbeat request

8 years agoShort circuit processing of the heartbeat request 1195/head
Robin Appelman [Tue, 30 Aug 2016 13:44:00 +0000 (15:44 +0200)]
Short circuit processing of the heartbeat request

8 years agoMerge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-values
Morris Jobke [Tue, 30 Aug 2016 12:46:36 +0000 (14:46 +0200)]
Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-values

Correctly handle multi-values when converting VCards to array

8 years agoMerge pull request #1187 from nextcloud/danysz-master
Joas Schilling [Tue, 30 Aug 2016 10:57:43 +0000 (12:57 +0200)]
Merge pull request #1187 from nextcloud/danysz-master

Update the mime types with the relevant types for "apple-iWorks"

8 years agoAdd a unit test for all the magic 1190/head
Joas Schilling [Tue, 30 Aug 2016 10:24:20 +0000 (12:24 +0200)]
Add a unit test for all the magic

8 years agoCorrectly handle multi-values when converting VCards to array
Joas Schilling [Tue, 30 Aug 2016 10:08:39 +0000 (12:08 +0200)]
Correctly handle multi-values when converting VCards to array

8 years agoMerge pull request #1089 from nextcloud/allow-to-prevent-previews
Roeland Jago Douma [Tue, 30 Aug 2016 09:33:48 +0000 (11:33 +0200)]
Merge pull request #1089 from nextcloud/allow-to-prevent-previews

Check if the file isReadable() before sending a (cached) preview

8 years agoMerge pull request #1138 from nextcloud/expiry-as-occ-command
Roeland Jago Douma [Tue, 30 Aug 2016 09:32:26 +0000 (11:32 +0200)]
Merge pull request #1138 from nextcloud/expiry-as-occ-command

Add occ command to expire the trashbin (#25878)

8 years agoupdate to proper icons and run occ command to update JS file 1187/head
Morris Jobke [Tue, 30 Aug 2016 08:28:29 +0000 (10:28 +0200)]
update to proper icons and run occ command to update JS file

8 years agoUpdate the mime types with the relevant types for "apple-iWorks" (pages, numbers...
Daniel Szasz [Fri, 19 Aug 2016 04:29:51 +0000 (07:29 +0300)]
Update the mime types with the relevant types for "apple-iWorks" (pages, numbers, keynote). Now the files are treated like a file when are in "Single file" mode.

8 years agoMerge pull request #1178 from nextcloud/theming-spinner-animation
Joas Schilling [Tue, 30 Aug 2016 08:01:36 +0000 (10:01 +0200)]
Merge pull request #1178 from nextcloud/theming-spinner-animation

Theming: Show loading spinner while uploading files

8 years agoMerge pull request #988 from nextcloud/ocs_federation
Morris Jobke [Tue, 30 Aug 2016 06:49:05 +0000 (08:49 +0200)]
Merge pull request #988 from nextcloud/ocs_federation

Move OCSAuthAPI to AppFramework

8 years agoMerge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharing
Morris Jobke [Tue, 30 Aug 2016 06:45:44 +0000 (08:45 +0200)]
Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharing

Move federated sharing routes to the federatedfilesharing app

8 years agoMerge pull request #1160 from nextcloud/downstream-25823
Roeland Jago Douma [Tue, 30 Aug 2016 06:36:37 +0000 (08:36 +0200)]
Merge pull request #1160 from nextcloud/downstream-25823

Include "Product Name" in status.php printout

8 years agoMerge pull request #1172 from nextcloud/core_cleanup
Morris Jobke [Tue, 30 Aug 2016 06:32:55 +0000 (08:32 +0200)]
Merge pull request #1172 from nextcloud/core_cleanup

Core controller cleanup

8 years agoMerge pull request #891 from nextcloud/us_25810
Morris Jobke [Tue, 30 Aug 2016 06:22:34 +0000 (08:22 +0200)]
Merge pull request #891 from nextcloud/us_25810

[OC] Fix unmerged shares repair targetdecision

8 years agoTheming: Show loading spinner while uploading files 1178/head
Julius Haertl [Mon, 29 Aug 2016 15:42:43 +0000 (17:42 +0200)]
Theming: Show loading spinner while uploading files

8 years agoMerge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-html-comment
blizzz [Mon, 29 Aug 2016 22:14:08 +0000 (00:14 +0200)]
Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-html-comment

Prevent parse error on editing an HTML comment

8 years agoMerge pull request #1169 from nextcloud/2fa-single-provider
Lukas Reschke [Mon, 29 Aug 2016 19:54:18 +0000 (21:54 +0200)]
Merge pull request #1169 from nextcloud/2fa-single-provider

redirect to 2fa provider if there's only one active for the user

8 years agoAvatarController use proper JSONResponse 1172/head
Roeland Jago Douma [Mon, 29 Aug 2016 19:31:41 +0000 (21:31 +0200)]
AvatarController use proper JSONResponse

* Do not rely on DataResponse magic. We want JSON so use JSON
* Fix tests

8 years agoMinor cleanup in core Controllers
Roeland Jago Douma [Mon, 29 Aug 2016 19:17:16 +0000 (21:17 +0200)]
Minor cleanup in core Controllers

8 years agoMerge pull request #1170 from nextcloud/theming-fix-primary-button
Lukas Reschke [Mon, 29 Aug 2016 19:39:09 +0000 (21:39 +0200)]
Merge pull request #1170 from nextcloud/theming-fix-primary-button

Theming: fix primary button for bright colors

8 years agoUserController does not require Defaults
Roeland Jago Douma [Mon, 29 Aug 2016 19:14:50 +0000 (21:14 +0200)]
UserController does not require Defaults

8 years agoMerge pull request #1130 from nextcloud/shared-upload-quota
Roeland Jago Douma [Mon, 29 Aug 2016 18:37:07 +0000 (20:37 +0200)]
Merge pull request #1130 from nextcloud/shared-upload-quota

[uc] Fix uploading to shared folder with quota

8 years agoMerge pull request #1147 from nextcloud/files-hidden-files-summary
Roeland Jago Douma [Mon, 29 Aug 2016 18:36:07 +0000 (20:36 +0200)]
Merge pull request #1147 from nextcloud/files-hidden-files-summary

Display number of hidden files in files summary (#25870)

8 years agoMerge pull request #1146 from nextcloud/init-filesconfig
Roeland Jago Douma [Mon, 29 Aug 2016 18:35:56 +0000 (20:35 +0200)]
Merge pull request #1146 from nextcloud/init-filesconfig

Make sure file list files config always exists

8 years agoMerge pull request #1148 from nextcloud/files-scan-reconnect-database-before-each...
Roeland Jago Douma [Mon, 29 Aug 2016 18:25:59 +0000 (20:25 +0200)]
Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-each-user-master

Before a user is getting scanned the database connection is re-establ…

8 years agoMerge pull request #1145 from nextcloud/upstream-25794
Roeland Jago Douma [Mon, 29 Aug 2016 17:56:50 +0000 (19:56 +0200)]
Merge pull request #1145 from nextcloud/upstream-25794

DAV: Return data-fingerprint always when asked

8 years agoMerge pull request #1142 from nextcloud/fix-case-sensitive-settings
Roeland Jago Douma [Mon, 29 Aug 2016 17:56:35 +0000 (19:56 +0200)]
Merge pull request #1142 from nextcloud/fix-case-sensitive-settings

Fix issues where some user settings cannot be loaded when the user id…

8 years agoMerge pull request #1139 from nextcloud/clean-code-image
Roeland Jago Douma [Mon, 29 Aug 2016 17:56:16 +0000 (19:56 +0200)]
Merge pull request #1139 from nextcloud/clean-code-image

Some cleanup within OC_Image (#25875)

8 years agoMerge pull request #1115 from nextcloud/fix_146
Christoph Wurst [Mon, 29 Aug 2016 17:48:51 +0000 (19:48 +0200)]
Merge pull request #1115 from nextcloud/fix_146

Link 'Allow editing' => 'Allow upload and editing'

8 years agoTheming: fix primary button for bright colors 1170/head
Julius Haertl [Mon, 29 Aug 2016 17:07:27 +0000 (19:07 +0200)]
Theming: fix primary button for bright colors

8 years agoredirect to 2fa provider if there's only one active for the user 1169/head
Christoph Wurst [Mon, 29 Aug 2016 16:36:39 +0000 (18:36 +0200)]
redirect to 2fa provider if there's only one active for the user

8 years agoMerge pull request #1136 from nextcloud/fix-16041
Joas Schilling [Mon, 29 Aug 2016 13:57:33 +0000 (15:57 +0200)]
Merge pull request #1136 from nextcloud/fix-16041

Modified overflow in multiselector

8 years agoMerge pull request #1135 from nextcloud/choose-buttons
Joas Schilling [Mon, 29 Aug 2016 13:51:54 +0000 (15:51 +0200)]
Merge pull request #1135 from nextcloud/choose-buttons

Choose button remains disabled unless files are chosen

8 years agoMerge pull request #1134 from nextcloud/fix_redirection
Joas Schilling [Mon, 29 Aug 2016 13:49:25 +0000 (15:49 +0200)]
Merge pull request #1134 from nextcloud/fix_redirection

Fix redirection taking care of protocol and port

8 years agoMerge pull request #1133 from nextcloud/fix-numerous
Joas Schilling [Mon, 29 Aug 2016 13:48:36 +0000 (15:48 +0200)]
Merge pull request #1133 from nextcloud/fix-numerous

always return numeric storage id as int, also check type equality in …

8 years agoMerge pull request #1131 from nextcloud/add-padding
Joas Schilling [Mon, 29 Aug 2016 13:46:59 +0000 (15:46 +0200)]
Merge pull request #1131 from nextcloud/add-padding

Adds padding and max-width to the input for the sign up page. (#25959)

8 years agoMerge pull request #1128 from nextcloud/upstream-25922
Roeland Jago Douma [Mon, 29 Aug 2016 13:37:59 +0000 (15:37 +0200)]
Merge pull request #1128 from nextcloud/upstream-25922

Users page lazy multiselect group dropdowns

8 years agoMerge pull request #1117 from iamfool/master
Lukas Reschke [Mon, 29 Aug 2016 13:27:41 +0000 (15:27 +0200)]
Merge pull request #1117 from iamfool/master

Update Admin.php

8 years agouse correct OCP\Defaults 1160/head
Jörn Friedrich Dreyer [Wed, 17 Aug 2016 09:59:53 +0000 (11:59 +0200)]
use correct OCP\Defaults

8 years agoInclude "Product Name" in status.php printout
martin.mattel@diemattels.at [Wed, 17 Aug 2016 06:41:49 +0000 (08:41 +0200)]
Include "Product Name" in status.php printout

identifyer -> identifier

removed variable

8 years agoBefore a user is getting scanned the database connection is re-established 1148/head
Thomas Müller [Thu, 18 Aug 2016 12:18:02 +0000 (14:18 +0200)]
Before a user is getting scanned the database connection is re-established

8 years agoDisplay number of hidden files in files summary (#25870) 1147/head
Vincent Petry [Fri, 19 Aug 2016 14:44:58 +0000 (16:44 +0200)]
Display number of hidden files in files summary (#25870)

When dot files are hidden, the table summary and selection summary will
not show how many hidden files were included.

8 years agoMake sure file list files config always exists 1146/head
Vincent Petry [Mon, 22 Aug 2016 07:45:21 +0000 (09:45 +0200)]
Make sure file list files config always exists

Initialize files config with defaults in case none was passed

8 years ago[master] DAV: Return data-fingerprint always when asked (#25482) 1145/head
Markus Goetz [Sat, 13 Aug 2016 15:03:54 +0000 (17:03 +0200)]
[master] DAV: Return data-fingerprint always when asked (#25482)

For owncloud/client#5056
Users can configure arbitrary subfolders for syncing, therefore we should
always return it when asked for.
The sync client makes sure to not always ask for it to save bandwidth.

8 years agoFix issues where some user settings cannot be loaded when the user id differs in... 1142/head
Thomas Müller [Mon, 22 Aug 2016 18:25:20 +0000 (20:25 +0200)]
Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686)

8 years agoSome cleanup within OC_Image (#25875) 1139/head
Thomas Müller [Mon, 22 Aug 2016 18:56:59 +0000 (20:56 +0200)]
Some cleanup within OC_Image (#25875)

8 years agoAdd occ command to expire the trashbin (#25878) 1138/head
Thomas Müller [Tue, 23 Aug 2016 12:03:05 +0000 (14:03 +0200)]
Add occ command to expire the trashbin (#25878)

* Add occ command to expire the trashbin

* Fix versions folder in setup check

8 years agoModified overflow in multiselector 1136/head
Sergio Bertolín [Wed, 24 Aug 2016 16:06:14 +0000 (16:06 +0000)]
Modified overflow in multiselector

8 years agoChoose button remains disabled unless files are chosen 1135/head
Sujith Haridasan [Mon, 22 Aug 2016 12:21:47 +0000 (17:51 +0530)]
Choose button remains disabled unless files are chosen
from filepicker

This is will help user to understand that you can only
click choose button once the files are selected from the
file picker. This addresses the solution for issue 16106

Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
8 years agoFix redirection taking care of protocol and port 1134/head
Juan Pablo Villafáñez [Thu, 25 Aug 2016 12:27:58 +0000 (14:27 +0200)]
Fix redirection taking care of protocol and port

8 years agoalways return numeric storage id as int, also check type equality in test asserts 1133/head
Jörn Friedrich Dreyer [Mon, 22 Aug 2016 11:35:51 +0000 (13:35 +0200)]
always return numeric storage id as int, also check type equality in test asserts

8 years agoAdds padding and max-width to the input for the sign up page. (#25959) 1131/head
Raghu Nayyar [Mon, 29 Aug 2016 07:26:39 +0000 (09:26 +0200)]
Adds padding and max-width to the input for the sign up page. (#25959)

8 years agoPrevent parse error on editing an HTML comment 1132/head
Joas Schilling [Mon, 29 Aug 2016 12:18:34 +0000 (14:18 +0200)]
Prevent parse error on editing an HTML comment

8 years agoA shared storage is never a home storage - fixes #25582 1130/head
Thomas Müller [Mon, 1 Aug 2016 12:22:30 +0000 (14:22 +0200)]
A shared storage is never a home storage - fixes #25582

8 years agoAdded integration test
Sergio Bertolin [Tue, 26 Jul 2016 15:59:02 +0000 (15:59 +0000)]
Added integration test

8 years agodont get bruteforce delay twice 1087/head
Robin Appelman [Fri, 26 Aug 2016 13:10:03 +0000 (15:10 +0200)]
dont get bruteforce delay twice

8 years agoFix group sorting in user list group selection 1128/head
Vincent Petry [Wed, 24 Aug 2016 08:06:46 +0000 (10:06 +0200)]
Fix group sorting in user list group selection

8 years agoExtra non-available groups also in list
Vincent Petry [Wed, 24 Aug 2016 08:03:07 +0000 (10:03 +0200)]
Extra non-available groups also in list

8 years agoUsers page lazy multiselect group dropdowns
Vincent Petry [Tue, 23 Aug 2016 15:22:10 +0000 (17:22 +0200)]
Users page lazy multiselect group dropdowns

Instead of pre-rendering all multiselects with lots of group entries,
the current groups are now displayed as simple labels.
Behind the labels there is a pencil icon like for other fields.
When clicking the pencil icon, the dropdown will be spawned and will
open itself.
Upon closing of the dropdown, the label comes back with the updated
selection and the dropdown is destroyed.

8 years agoCheck if the file isReadable() before sending a (cached) preview 1089/head
Joas Schilling [Fri, 26 Aug 2016 13:51:18 +0000 (15:51 +0200)]
Check if the file isReadable() before sending a (cached) preview

8 years agoUpdate AdminTest.php 1117/head
iamfool [Mon, 29 Aug 2016 08:47:23 +0000 (01:47 -0700)]
Update AdminTest.php

8 years agoUpdate Admin.php
iamfool [Mon, 29 Aug 2016 01:02:45 +0000 (18:02 -0700)]
Update Admin.php

8 years agoLink 'Allow editing' => 'Allow upload and editing' 1115/head
Roeland Jago Douma [Sun, 28 Aug 2016 19:50:31 +0000 (21:50 +0200)]
Link 'Allow editing' => 'Allow upload and editing'

Fixes #146

8 years agoMove federated sharing routes to the federatedfilesharingapp 974/head
Roeland Jago Douma [Fri, 19 Aug 2016 10:01:13 +0000 (12:01 +0200)]
Move federated sharing routes to the federatedfilesharingapp

* Move routes to app
* Move routes over to the AppFramework
* Fix tests

There is plenty of stuff to fix properly here. But out of scope for now.

8 years agoMerge pull request #976 from nextcloud/downstream-25702
Lukas Reschke [Sun, 28 Aug 2016 13:06:27 +0000 (15:06 +0200)]
Merge pull request #976 from nextcloud/downstream-25702

Hide the LDAP password in the client side

8 years agoMerge pull request #847 from nextcloud/quota-mount-in-homefolder
Lukas Reschke [Sun, 28 Aug 2016 13:05:46 +0000 (15:05 +0200)]
Merge pull request #847 from nextcloud/quota-mount-in-homefolder

fix quota calculation when a filesystem is mounted in a user home

8 years agoUse function parameters 988/head
Roeland Jago Douma [Fri, 19 Aug 2016 19:41:55 +0000 (21:41 +0200)]
Use function parameters

8 years agoMove OCSAuthAPI to AppFramework
Roeland Jago Douma [Fri, 19 Aug 2016 12:25:59 +0000 (14:25 +0200)]
Move OCSAuthAPI to AppFramework

* Convert class
* Convert routes
* Convert tests

8 years agoMerge pull request #1093 from nextcloud/mail-fontstack
Raghu Nayyar [Sun, 28 Aug 2016 08:30:50 +0000 (10:30 +0200)]
Merge pull request #1093 from nextcloud/mail-fontstack

use proper font stack for email

8 years agoMerge pull request #1105 from nextcloud/usermenu-ordering
Raghu Nayyar [Sun, 28 Aug 2016 08:30:16 +0000 (10:30 +0200)]
Merge pull request #1105 from nextcloud/usermenu-ordering

fix ordering of user menu entries

8 years agoMerge pull request #1097 from nextcloud/2fa-cancel-login-styling
Jan-Christoph Borchardt [Sat, 27 Aug 2016 21:19:08 +0000 (23:19 +0200)]
Merge pull request #1097 from nextcloud/2fa-cancel-login-styling

Small design fixes for "Cancel login" link on the 2FA challenge page

8 years agoMerge pull request #1103 from nextcloud/improve-theming-performance
Jan-Christoph Borchardt [Sat, 27 Aug 2016 21:18:34 +0000 (23:18 +0200)]
Merge pull request #1103 from nextcloud/improve-theming-performance

Increase theming performance

8 years agoMerge pull request #1098 from nextcloud/2fa-challenge-styling
Jan-Christoph Borchardt [Sat, 27 Aug 2016 21:14:31 +0000 (23:14 +0200)]
Merge pull request #1098 from nextcloud/2fa-challenge-styling

2fa challenge styling

8 years agoMerge pull request #1054 from nextcloud/less-cache-hits
Lukas Reschke [Sat, 27 Aug 2016 20:44:29 +0000 (22:44 +0200)]
Merge pull request #1054 from nextcloud/less-cache-hits

Reduce the number of cache operations for dav operations

8 years agoMerge pull request #968 from Faldon/fixing_spinner_animation
Lukas Reschke [Sat, 27 Aug 2016 20:43:03 +0000 (22:43 +0200)]
Merge pull request #968 from Faldon/fixing_spinner_animation

Fixing infinite spinner animation

8 years agofix ordering of user menu entries 1105/head
Jan-Christoph Borchardt [Sat, 27 Aug 2016 20:35:02 +0000 (22:35 +0200)]
fix ordering of user menu entries

8 years agoMerge pull request #1058 from nextcloud/avatarController_cleanup
Lukas Reschke [Sat, 27 Aug 2016 20:25:34 +0000 (22:25 +0200)]
Merge pull request #1058 from nextcloud/avatarController_cleanup

Avatar controller cleanup

8 years agofix double semicolon 1097/head
Jan-Christoph Borchardt [Sat, 27 Aug 2016 20:13:58 +0000 (22:13 +0200)]
fix double semicolon

8 years agoUse temporary file as cache 1103/head
Lukas Reschke [Sat, 27 Aug 2016 19:38:41 +0000 (21:38 +0200)]
Use temporary file as cache

8 years agoIncrease theming performance
Lukas Reschke [Sat, 27 Aug 2016 10:38:15 +0000 (12:38 +0200)]
Increase theming performance

1. Set proper caching headers (`Pragma: cache`)
2. Resize image proportionally to a max size of 1920px
3. Store images with progressive mode

This resizes a previous 2.8 MB picture to 300kb and makes it rendering going down from 11 seconds to less than 1 here. And future requests won't have to download the file newly.

8 years agolist 2FA providers as buttons 1098/head
Christoph Wurst [Sat, 27 Aug 2016 10:27:05 +0000 (12:27 +0200)]
list 2FA providers as buttons

8 years agouse centered h2 for 2FA page headers
Christoph Wurst [Sat, 27 Aug 2016 09:33:15 +0000 (11:33 +0200)]
use centered h2 for 2FA page headers

8 years agofix 2fa challenge page wording
Christoph Wurst [Sat, 27 Aug 2016 09:10:36 +0000 (11:10 +0200)]
fix 2fa challenge page wording

8 years agoreorder 2fa challenge HTML
Christoph Wurst [Fri, 26 Aug 2016 21:20:00 +0000 (23:20 +0200)]
reorder 2fa challenge HTML

8 years agoMerge pull request #1091 from nextcloud/theming-title-preview
Lukas Reschke [Sat, 27 Aug 2016 09:10:00 +0000 (11:10 +0200)]
Merge pull request #1091 from nextcloud/theming-title-preview

Theming: Preview instance name in page title

8 years ago2fa cancel login styling
Christoph Wurst [Sat, 27 Aug 2016 09:03:39 +0000 (11:03 +0200)]
2fa cancel login styling

8 years agouse proper font stack for email 1093/head
Jan-Christoph Borchardt [Fri, 26 Aug 2016 20:59:24 +0000 (22:59 +0200)]
use proper font stack for email

8 years agoTheming: Preview for page title 1091/head
Julius Haertl [Fri, 26 Aug 2016 16:21:05 +0000 (18:21 +0200)]
Theming: Preview for page title

8 years agoMerge pull request #1088 from nextcloud/core_tags_cleanup
Lukas Reschke [Fri, 26 Aug 2016 15:55:30 +0000 (17:55 +0200)]
Merge pull request #1088 from nextcloud/core_tags_cleanup

Tag cleanup

8 years agoMerge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
Joas Schilling [Fri, 26 Aug 2016 14:03:05 +0000 (16:03 +0200)]
Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop

prevent infinite redirect loops if the there is no 2fa provider to pass