]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoapply @carlaschroder's changes from owncloud/documentation#594
Morris Jobke [Wed, 8 Oct 2014 21:01:46 +0000 (23:01 +0200)]
apply @carlaschroder's changes from owncloud/documentation#594

10 years agoClear enabled apps cache after loading authentication app
Vincent Petry [Thu, 9 Oct 2014 11:22:14 +0000 (13:22 +0200)]
Clear enabled apps cache after loading authentication app

Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.

Backport of 36d22825e0797eedd1c239a70bbb385fa8ac7042 from master

10 years agoAdd support for keys in the info.xml
Lukas Reschke [Thu, 9 Oct 2014 13:00:36 +0000 (15:00 +0200)]
Add support for keys in the info.xml

This allows to have links to different doc base URLs

10 years agoBackport of #10527
Arthur Schiwon [Tue, 19 Aug 2014 16:01:58 +0000 (18:01 +0200)]
Backport of #10527

properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526

abandon ongoing paged search before starting a new one

abandond paged search only if PHP supports them

init a new paged search on read operations to satisfy OpenLDAP

make scrutinizer happy, very minor changes

10 years agocheck if I can create a file at the location
Bjoern Schiessle [Wed, 8 Oct 2014 08:56:06 +0000 (10:56 +0200)]
check if I can create a file at the location

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:34:10 +0000 (22:34 -0400)]
Updated info.xml app description

Made description consistent with other apps

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:33:02 +0000 (22:33 -0400)]
Updated info.xml app description

Updated description

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:28:11 +0000 (22:28 -0400)]
Updated info.xml app description

Updated app description

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:15:33 +0000 (22:15 -0400)]
Updated info.xml app description

Backported to stable 7

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:14:07 +0000 (22:14 -0400)]
Updated info.xml app description

Updated documentation. Removed doc links as this has two packages, need to not hard link.

10 years agoUpdated info.xml app description
MTRichards [Thu, 9 Oct 2014 02:10:32 +0000 (22:10 -0400)]
Updated info.xml app description

Backporting to stable 7. Removed doc links as this is packaged in 2 different setups, links are different.

10 years agostyle fixes in config.sample.php
Morris Jobke [Wed, 8 Oct 2014 21:27:57 +0000 (23:27 +0200)]
style fixes in config.sample.php

10 years agoFixes in config.sample.php
Morris Jobke [Tue, 7 Oct 2014 12:14:19 +0000 (14:14 +0200)]
Fixes in config.sample.php

* owncloud -> ownCloud
* add default value
* proper comment style
* fix line wrapping and minor typo
* remove duplication
* add Vincents proposals
* drop master config switches while backporting

10 years agore-arrange the config options and sort them in a semantical way
Morris Jobke [Tue, 7 Oct 2014 08:04:54 +0000 (10:04 +0200)]
re-arrange the config options and sort them in a semantical way

Conflicts:
config/config.sample.php

10 years agounify style of config.sample.php
Morris Jobke [Tue, 7 Oct 2014 07:35:21 +0000 (09:35 +0200)]
unify style of config.sample.php

* use ' instead of " for config option
* place default parameters where useful into sample
* use proper comment block
* limit line size to 80 characters

10 years agoFix file size comparator return value
brumsoel [Tue, 7 Oct 2014 23:17:45 +0000 (01:17 +0200)]
Fix file size comparator return value

10 years agoMerge pull request #11375 from owncloud/fix_files_external_amazon_s3_stat_call
Vincent Petry [Wed, 8 Oct 2014 16:49:41 +0000 (18:49 +0200)]
Merge pull request #11375 from owncloud/fix_files_external_amazon_s3_stat_call

Fix files external amazon s3

10 years agoimproved visual feedback if user enabled recovery key
Bjoern Schiessle [Tue, 7 Oct 2014 10:52:01 +0000 (12:52 +0200)]
improved visual feedback if user enabled recovery key

10 years agoimproved visual feedback if recovery key password gets changed
Bjoern Schiessle [Tue, 7 Oct 2014 10:30:50 +0000 (12:30 +0200)]
improved visual feedback if recovery key password gets changed

10 years agoimproved visual feedback if recovery key gets enabled/disabled
Bjoern Schiessle [Tue, 7 Oct 2014 10:06:46 +0000 (12:06 +0200)]
improved visual feedback if recovery key gets enabled/disabled

10 years agomake sure that the notification gets shown again after a second try
Bjoern Schiessle [Tue, 7 Oct 2014 10:02:58 +0000 (12:02 +0200)]
make sure that the notification gets shown again after a second try

10 years agorestrict $div to local scope
michag86 [Tue, 7 Oct 2014 09:09:07 +0000 (11:09 +0200)]
restrict $div to local scope

10 years agovariable for found avatar div
michag86 [Tue, 7 Oct 2014 08:44:36 +0000 (10:44 +0200)]
variable for found avatar div

10 years agofix for issue #10483
michag86 [Mon, 6 Oct 2014 06:53:12 +0000 (08:53 +0200)]
fix for issue #10483

10 years agoMerge pull request #11457 from owncloud/stable7-fix-rename-position
Vincent Petry [Tue, 7 Oct 2014 14:00:41 +0000 (16:00 +0200)]
Merge pull request #11457 from owncloud/stable7-fix-rename-position

fix position of rename field, fix #10867

10 years agofix position of rename field, fix #10867
Jan-Christoph Borchardt [Tue, 7 Oct 2014 12:58:01 +0000 (14:58 +0200)]
fix position of rename field, fix #10867

10 years agoreduce bottom padding in filelist, fix perceived glitching, fix #11213
Jan-Christoph Borchardt [Tue, 7 Oct 2014 08:44:01 +0000 (10:44 +0200)]
reduce bottom padding in filelist, fix perceived glitching, fix #11213

10 years agoAdd CssImportFilter. More elegant fix for documents#348
Victor Dubiniuk [Mon, 6 Oct 2014 16:39:02 +0000 (19:39 +0300)]
Add CssImportFilter. More elegant fix for documents#348

10 years agofix position and style of sort indicator
Jan-Christoph Borchardt [Wed, 1 Oct 2014 13:21:28 +0000 (15:21 +0200)]
fix position and style of sort indicator

10 years agowe also encrypt/decrypt files in the versions folder for previews and if encryption...
Bjoern Schiessle [Thu, 2 Oct 2014 10:55:46 +0000 (12:55 +0200)]
we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled

10 years agoextract batchDelete(), better comments
Jörn Friedrich Dreyer [Mon, 6 Oct 2014 09:08:21 +0000 (11:08 +0200)]
extract batchDelete(), better comments

10 years agofiles_extern: remove empty Body and ContentLength in Amazon S3 mount
André Gaul [Mon, 18 Aug 2014 23:14:58 +0000 (01:14 +0200)]
files_extern: remove empty Body and ContentLength in Amazon S3 mount

fixes #10501

Conflicts:
apps/files_external/lib/amazons3.php

10 years agoMerge pull request #11299 from owncloud/barkport-10934
Lukas Reschke [Thu, 2 Oct 2014 08:38:15 +0000 (10:38 +0200)]
Merge pull request #11299 from owncloud/barkport-10934

[stable7] Don't complain about non-writable datadirs before we're installed

10 years agofix amazon s3 issues
Jörn Friedrich Dreyer [Mon, 29 Sep 2014 19:42:03 +0000 (21:42 +0200)]
fix amazon s3 issues

folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo

10 years agomake some storage tests explain what went wrong
Jörn Friedrich Dreyer [Wed, 1 Oct 2014 11:12:41 +0000 (13:12 +0200)]
make some storage tests explain what went wrong

10 years agostrict comparison
Jörn Friedrich Dreyer [Wed, 1 Oct 2014 11:14:08 +0000 (13:14 +0200)]
strict comparison

10 years agolog exceptions when listing files
Jörn Friedrich Dreyer [Mon, 29 Sep 2014 19:40:32 +0000 (21:40 +0200)]
log exceptions when listing files

10 years agoSkip test for unsuported feature for amazon s3
Robin Appelman [Fri, 1 Aug 2014 13:06:05 +0000 (15:06 +0200)]
Skip test for unsuported feature for amazon s3

10 years agoFix copy overwrite for amazon s3
Robin Appelman [Fri, 1 Aug 2014 13:05:43 +0000 (15:05 +0200)]
Fix copy overwrite for amazon s3

10 years agoFix amazon s3 rename overwrite
Robin Appelman [Fri, 1 Aug 2014 12:57:43 +0000 (14:57 +0200)]
Fix amazon s3 rename overwrite

10 years agoFix AmazonS3 rmdir on the root
Robin Appelman [Fri, 1 Aug 2014 12:20:00 +0000 (14:20 +0200)]
Fix AmazonS3 rmdir on the root

10 years agoRedirect only to absolute URL
Lukas Reschke [Mon, 29 Sep 2014 15:07:43 +0000 (17:07 +0200)]
Redirect only to absolute URL

We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.

10 years agoUse SVG previews for public sharing
Lukas Reschke [Tue, 30 Sep 2014 13:23:16 +0000 (15:23 +0200)]
Use SVG previews for public sharing

Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218

10 years agoAdd flock to config
Lukas Reschke [Thu, 25 Sep 2014 16:43:04 +0000 (18:43 +0200)]
Add flock to config

This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070

Testplan:

- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation

Only skip the main config

Otherwise read only additional configs might not be processed

Test on tmpdir

10 years agodon't clean up the test environment if a data provider was finished
Bjoern Schiessle [Wed, 13 Aug 2014 09:41:11 +0000 (11:41 +0200)]
don't clean up the test environment if a data provider was finished

10 years agoTry to create datadirectory to test whether the .htaccess works
Lukas Reschke [Fri, 26 Sep 2014 15:25:28 +0000 (17:25 +0200)]
Try to create datadirectory to test whether the .htaccess works

Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.

10 years agoDon't test for htaccess if we cant write into the datadir anyway
Robin Appelman [Thu, 18 Sep 2014 12:23:38 +0000 (14:23 +0200)]
Don't test for htaccess if we cant write into the datadir anyway

10 years agoCheck for writable datadir during setup
Robin Appelman [Thu, 18 Sep 2014 12:15:52 +0000 (14:15 +0200)]
Check for writable datadir during setup

10 years agoDon't complain about non-writable datadirs before we're installed
Robin Appelman [Mon, 8 Sep 2014 13:05:57 +0000 (15:05 +0200)]
Don't complain about non-writable datadirs before we're installed

Conflicts:
lib/private/util.php

10 years agoInject config into checkserver and cleanup tests
Robin Appelman [Mon, 8 Sep 2014 12:56:11 +0000 (14:56 +0200)]
Inject config into checkserver and cleanup tests

Conflicts:
lib/private/util.php

10 years agoClose the session for preview generation
Lukas Reschke [Mon, 29 Sep 2014 12:27:44 +0000 (14:27 +0200)]
Close the session for preview generation

Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.

10 years agodn needs to be fetched to be able to detect memberOf support
Arthur Schiwon [Fri, 26 Sep 2014 13:36:49 +0000 (15:36 +0200)]
dn needs to be fetched to be able to detect memberOf support

10 years agoClear up confusion of log_rotate_size config value
Dan Bartram [Sat, 27 Sep 2014 12:27:42 +0000 (13:27 +0100)]
Clear up confusion of log_rotate_size config value

Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`.

To keep the easily readable example value, it has been moved into the comment header for the config item.

10 years agoincrease version v7.0.3alpha1
Frank Karlitschek [Sun, 28 Sep 2014 11:19:53 +0000 (13:19 +0200)]
increase version

10 years agoMerge pull request #11363 from owncloud/sharing_group_shares_stable7
Björn Schießle [Wed, 1 Oct 2014 21:35:33 +0000 (23:35 +0200)]
Merge pull request #11363 from owncloud/sharing_group_shares_stable7

Sharing group shares stable7

10 years agocatch and log exception in OC_Helper::cleanTmp()
Thomas Müller [Fri, 26 Sep 2014 07:17:47 +0000 (09:17 +0200)]
catch and log exception in OC_Helper::cleanTmp()

10 years agosome small fixed, suggested by scrutinizer
Bjoern Schiessle [Mon, 29 Sep 2014 09:23:18 +0000 (11:23 +0200)]
some small fixed, suggested by scrutinizer

10 years agothrow a exception if we can't handle the provided path
Bjoern Schiessle [Mon, 29 Sep 2014 09:13:01 +0000 (11:13 +0200)]
throw a exception if we can't handle the provided path

10 years agoon unshare only unshare childrens if there is no other parent available
Bjoern Schiessle [Fri, 26 Sep 2014 14:58:47 +0000 (16:58 +0200)]
on unshare only unshare childrens if there is no other parent available

10 years agoonly create a new share entry, if the user needs a different target name than the...
Bjoern Schiessle [Fri, 26 Sep 2014 11:19:15 +0000 (13:19 +0200)]
only create a new share entry, if the user needs a different target name than the group share

10 years agofor group shares we don't need a extra db entry of groupTarget equals itemTarget
Bjoern Schiessle [Fri, 26 Sep 2014 11:10:31 +0000 (13:10 +0200)]
for group shares we don't need a extra db entry of groupTarget equals itemTarget

10 years agofor group shares only the parent has the up-to-date permission. Make sure that we...
Bjoern Schiessle [Fri, 26 Sep 2014 11:01:54 +0000 (13:01 +0200)]
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self

10 years agocall \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks...
Bjoern Schiessle [Thu, 25 Sep 2014 11:45:23 +0000 (13:45 +0200)]
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible

10 years agoalways select permissions, used in getItems()
Bjoern Schiessle [Thu, 25 Sep 2014 10:35:11 +0000 (12:35 +0200)]
always select permissions, used in getItems()

10 years agosome small fixes
Bjoern Schiessle [Thu, 25 Sep 2014 09:29:57 +0000 (11:29 +0200)]
some small fixes

10 years agoclear share table after each test run
Bjoern Schiessle [Mon, 22 Sep 2014 16:13:40 +0000 (18:13 +0200)]
clear share table after each test run

10 years agoonly add a new row if it isn't a unique share, otherwise update the existing row
Bjoern Schiessle [Thu, 18 Sep 2014 12:46:11 +0000 (14:46 +0200)]
only add a new row if it isn't a unique share, otherwise update the existing row

10 years agofix unit tests
Bjoern Schiessle [Tue, 26 Aug 2014 22:31:49 +0000 (00:31 +0200)]
fix unit tests

10 years agomark exclude list as deprecated. It neither used by the files app nor by the
Bjoern Schiessle [Tue, 26 Aug 2014 22:31:39 +0000 (00:31 +0200)]
mark exclude list as deprecated. It neither used by the files app nor by the
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.

10 years agofix add user to group to work with grouped shares
Bjoern Schiessle [Tue, 26 Aug 2014 22:30:13 +0000 (00:30 +0200)]
fix add user to group to work with grouped shares

10 years agogenerateTarget() will always find a unique target
Bjoern Schiessle [Fri, 22 Aug 2014 13:59:44 +0000 (15:59 +0200)]
generateTarget() will always find a unique target

10 years agounit tests for grouping of shares pointing to the same source
Bjoern Schiessle [Fri, 1 Aug 2014 14:24:19 +0000 (16:24 +0200)]
unit tests for grouping of shares pointing to the same source

10 years agogroup shares and combine permissions
Bjoern Schiessle [Thu, 31 Jul 2014 09:55:59 +0000 (11:55 +0200)]
group shares and combine permissions

10 years agoMerge pull request #11364 from owncloud/fix_unit_test_oc7
Lukas Reschke [Wed, 1 Oct 2014 13:07:16 +0000 (15:07 +0200)]
Merge pull request #11364 from owncloud/fix_unit_test_oc7

make sure that the users file system is initialized before we emit the post hook

10 years agomake sure that we re-load the file system after the quota was set
Bjoern Schiessle [Wed, 1 Oct 2014 07:42:50 +0000 (09:42 +0200)]
make sure that we re-load the file system after the quota was set

10 years agomake sure that the users file system is initialized before we emit the post hook
Bjoern Schiessle [Tue, 30 Sep 2014 11:14:04 +0000 (13:14 +0200)]
make sure that the users file system is initialized before we emit the post hook

10 years agoPrevent monkey clicking on labels
Vincent Petry [Fri, 26 Sep 2014 15:06:16 +0000 (17:06 +0200)]
Prevent monkey clicking on labels

Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.

10 years agoAdd ID to markup to have the checkboxes in the right position
Lukas Reschke [Fri, 26 Sep 2014 11:42:47 +0000 (13:42 +0200)]
Add ID to markup to have the checkboxes in the right position

10 years agoAdded spinners in share dropdown
Vincent Petry [Thu, 25 Sep 2014 17:46:30 +0000 (19:46 +0200)]
Added spinners in share dropdown

Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password

10 years agofor whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname...
Jan-Christoph Borchardt [Fri, 26 Sep 2014 13:38:35 +0000 (15:38 +0200)]
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar

10 years agoFix dav permissions for folders without create permissions
Robin Appelman [Wed, 24 Sep 2014 15:50:33 +0000 (17:50 +0200)]
Fix dav permissions for folders without create permissions

10 years agoExpose creatable permissions trough fileinfo
Robin Appelman [Wed, 24 Sep 2014 15:49:52 +0000 (17:49 +0200)]
Expose creatable permissions trough fileinfo

10 years agoDon't keep the full info of all children in memory
Robin Appelman [Wed, 24 Sep 2014 13:44:56 +0000 (15:44 +0200)]
Don't keep the full info of all children in memory

10 years agoClarify possible preview providers for type Office
Lukas Reschke [Wed, 24 Sep 2014 19:16:14 +0000 (21:16 +0200)]
Clarify possible preview providers for type Office

a

Conflicts:
lib/private/preview.php

10 years agoMerge pull request #11245 from owncloud/backport-11211
Morris Jobke [Wed, 24 Sep 2014 21:57:23 +0000 (23:57 +0200)]
Merge pull request #11245 from owncloud/backport-11211

Add a configuration switch for enabled preview mimetypes

10 years agoShow a proper error message when trying to scan the filesystem for a non existing...
Robin Appelman [Wed, 24 Sep 2014 13:48:54 +0000 (15:48 +0200)]
Show a proper error message when trying to scan the filesystem for a non existing user

10 years agoUpdating 3rdparty - contains updated tar archive and getid3
Thomas Müller [Wed, 24 Sep 2014 12:30:00 +0000 (14:30 +0200)]
Updating 3rdparty - contains updated tar archive and getid3

10 years agofix filepicker home icon being partly hidden, fix #10169
Jan-Christoph Borchardt [Tue, 23 Sep 2014 12:28:51 +0000 (14:28 +0200)]
fix filepicker home icon being partly hidden, fix #10169

10 years agoCheck for blacklisted characters
Lukas Reschke [Tue, 23 Sep 2014 17:30:32 +0000 (19:30 +0200)]
Check for blacklisted characters

Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))

10 years agoMoved WebDAV and internet checks to client side JS
Vincent Petry [Mon, 3 Feb 2014 11:48:17 +0000 (12:48 +0100)]
Moved WebDAV and internet checks to client side JS

- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server

Backport of e65ceb08fc4a56d0fb9e4be5d51ba04168cbb59a from master

10 years agoMerge branch 'stable7' into backport-11211
Lukas Reschke [Tue, 23 Sep 2014 12:48:16 +0000 (14:48 +0200)]
Merge branch 'stable7' into backport-11211

Conflicts:
config/config.sample.php

10 years agoPrevious commit was not based on master, retry. Removed broken tar cutter, double...
Remco Brenninkmeijer [Mon, 4 Aug 2014 12:10:09 +0000 (14:10 +0200)]
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.

10 years agousing flush() here is pointless as we render the layout into a memory buffer and...
Thomas Müller [Fri, 8 Aug 2014 13:44:11 +0000 (15:44 +0200)]
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later

10 years agoremove post setup check
Thomas Müller [Mon, 22 Sep 2014 17:43:55 +0000 (19:43 +0200)]
remove post setup check

Backport of 21412559df9461ae7395d8abe1a4c6850dadfad3 from master

10 years agoFix share key finding algorithm in various cases
Vincent Petry [Wed, 17 Sep 2014 16:50:29 +0000 (18:50 +0200)]
Fix share key finding algorithm in various cases

Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin

Backport of 1e631754d78e98d74ba0d3fb477d5eb815e9dfb3 from master

10 years agoUse non-empty defaults
Victor Dubiniuk [Mon, 22 Sep 2014 20:27:41 +0000 (23:27 +0300)]
Use non-empty defaults

10 years agoDo only follow HTTP and HTTPS redirects
Lukas Reschke [Thu, 11 Sep 2014 17:21:56 +0000 (19:21 +0200)]
Do only follow HTTP and HTTPS redirects

We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests

Conflicts:
apps/files/ajax/newfile.php
lib/private/files/storage/dav.php
lib/private/server.php
lib/private/util.php
lib/public/iservercontainer.php

10 years agoAppend port to trusted domain in case it's not 80 or 443
Lukas Reschke [Mon, 8 Sep 2014 14:15:31 +0000 (16:15 +0200)]
Append port to trusted domain in case it's not 80 or 443

Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059

Backport of 2590a4dc85cb23311a9000770bf506c3953d0b04 from master

10 years agofirst check if a private key exists, if not it is always a recovery szenario
Bjoern Schiessle [Mon, 22 Sep 2014 13:04:55 +0000 (15:04 +0200)]
first check if a private key exists, if not it is always a recovery szenario

10 years agoAdd a configuration switch for enabled preview mimetypes
Lukas Reschke [Tue, 23 Sep 2014 08:42:45 +0000 (10:42 +0200)]
Add a configuration switch for enabled preview mimetypes

Backport of https://github.com/owncloud/core/pull/11211 to stable7