]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agosearch: fix color hex code
Jan-Christoph Borchardt [Tue, 15 Apr 2014 09:25:38 +0000 (11:25 +0200)]
search: fix color hex code

10 years agofix search box wrapping on very narrow screens
Jan-Christoph Borchardt [Wed, 9 Apr 2014 11:20:46 +0000 (13:20 +0200)]
fix search box wrapping on very narrow screens

10 years agosearch: change date color to grey for less distraction
Jan-Christoph Borchardt [Wed, 9 Apr 2014 10:58:14 +0000 (12:58 +0200)]
search: change date color to grey for less distraction

10 years agoincrease height of result for better clickability
Jan-Christoph Borchardt [Wed, 9 Apr 2014 10:55:10 +0000 (12:55 +0200)]
increase height of result for better clickability

10 years agomake search results work on mobile as well
Jan-Christoph Borchardt [Wed, 9 Apr 2014 10:51:32 +0000 (12:51 +0200)]
make search results work on mobile as well

10 years agoMerge pull request #7837 from owncloud/fix_7530
blizzz [Wed, 9 Apr 2014 10:27:17 +0000 (12:27 +0200)]
Merge pull request #7837 from owncloud/fix_7530

LDAP: fix determining objectclasses takes long

10 years agoadd comment to clearify when a skip in the foreach happens
Arthur Schiwon [Wed, 9 Apr 2014 10:25:48 +0000 (12:25 +0200)]
add comment to clearify when a skip in the foreach happens

10 years agoMerge pull request #8122 from owncloud/issue/8048
Joas Schilling [Wed, 9 Apr 2014 09:14:24 +0000 (11:14 +0200)]
Merge pull request #8122 from owncloud/issue/8048

Always define sendmail_is_available in settings/admin.php

10 years agoAlways define sendmail_is_available
Joas Schilling [Wed, 9 Apr 2014 08:18:46 +0000 (10:18 +0200)]
Always define sendmail_is_available

Fix #8048

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 9 Apr 2014 05:56:49 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8117 from owncloud/fix-hard-coded-uman-str
Thomas Müller [Tue, 8 Apr 2014 20:45:19 +0000 (22:45 +0200)]
Merge pull request #8117 from owncloud/fix-hard-coded-uman-str

Make hardcoded exception messages translatable

10 years agoMerge pull request #7643 from owncloud/chainable_response
Thomas Müller [Tue, 8 Apr 2014 20:42:43 +0000 (22:42 +0200)]
Merge pull request #7643 from owncloud/chainable_response

Chainable Response in AppFramework

10 years agoMerge pull request #8111 from owncloud/trash-disablesharing
Vincent Petry [Tue, 8 Apr 2014 19:00:44 +0000 (21:00 +0200)]
Merge pull request #8111 from owncloud/trash-disablesharing

Disable sharing in trashbin app

10 years agoMake hardcoded exception messages translatable
Volkan Gezer [Tue, 8 Apr 2014 18:07:25 +0000 (20:07 +0200)]
Make hardcoded exception messages translatable

10 years agoDisable sharing in trashbin app
Vincent Petry [Tue, 8 Apr 2014 15:13:59 +0000 (17:13 +0200)]
Disable sharing in trashbin app

10 years agoMerge pull request #8110 from owncloud/fix-failing-config-unit-test
Thomas Müller [Tue, 8 Apr 2014 14:26:35 +0000 (16:26 +0200)]
Merge pull request #8110 from owncloud/fix-failing-config-unit-test

class Test_Config is already declared

10 years agoclass Test_Config is already declared
Thomas Müller [Tue, 8 Apr 2014 12:15:33 +0000 (14:15 +0200)]
class Test_Config is already declared

10 years agoMerge pull request #8032 from owncloud/fs-backend-registration
Thomas Müller [Tue, 8 Apr 2014 09:27:02 +0000 (11:27 +0200)]
Merge pull request #8032 from owncloud/fs-backend-registration

Files External: allow dynamic backend registration

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 8 Apr 2014 05:57:51 +0000 (01:57 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8102 from owncloud/fix-appconfig-master
Thomas Müller [Tue, 8 Apr 2014 05:20:37 +0000 (07:20 +0200)]
Merge pull request #8102 from owncloud/fix-appconfig-master

Fix appconfig master

10 years agoMerge pull request #8089 from bantu/autotest-checkout-pathspec
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 19:10:11 +0000 (21:10 +0200)]
Merge pull request #8089 from bantu/autotest-checkout-pathspec

Use git checkout on directory as some files may not be in git resulting ...

10 years agousing array_key_exists() instead of isset() - required because in case the value...
Thomas Müller [Mon, 7 Apr 2014 19:05:48 +0000 (21:05 +0200)]
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false

10 years agofixing undefined exception classes
Thomas Müller [Mon, 7 Apr 2014 18:57:08 +0000 (20:57 +0200)]
fixing undefined exception classes

10 years agounit test testSetAppValueIfSetToNull() added
Thomas Müller [Mon, 7 Apr 2014 18:56:43 +0000 (20:56 +0200)]
unit test testSetAppValueIfSetToNull() added

10 years agoMerge pull request #8065 from owncloud/avatar-highdpi
Thomas Müller [Mon, 7 Apr 2014 18:36:15 +0000 (20:36 +0200)]
Merge pull request #8065 from owncloud/avatar-highdpi

use high resolution avatars on highdpi screens

10 years agounit tests for dynamic backend registration
Thomas Müller [Mon, 7 Apr 2014 18:18:57 +0000 (20:18 +0200)]
unit tests for dynamic backend registration

10 years agoMerge pull request #8091 from owncloud/jshint-globals-oc-t-n
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 18:06:28 +0000 (20:06 +0200)]
Merge pull request #8091 from owncloud/jshint-globals-oc-t-n

adding ownCloud globals to jshintrc: OC, t, n

10 years agoignore underscore.js in scrutinizer.yml
Thomas Müller [Mon, 7 Apr 2014 15:11:30 +0000 (17:11 +0200)]
ignore underscore.js in scrutinizer.yml

10 years agoMerge branch 'master' into jshint-globals-oc-t-n
Thomas Müller [Mon, 7 Apr 2014 15:10:45 +0000 (17:10 +0200)]
Merge branch 'master' into jshint-globals-oc-t-n

Conflicts:
.jshintrc

10 years agoMerge pull request #8088 from owncloud/fix-personal.js
Thomas Müller [Mon, 7 Apr 2014 14:59:32 +0000 (16:59 +0200)]
Merge pull request #8088 from owncloud/fix-personal.js

reduce code duplication, fix parse error, prevent page reload on hitting...

10 years agoMerge pull request #7599 from owncloud/public-pathinfo
icewind1991 [Mon, 7 Apr 2014 12:53:44 +0000 (14:53 +0200)]
Merge pull request #7599 from owncloud/public-pathinfo

Allow using pathinfo based public.php paths

10 years agoadding ownCloud globals to jshintrc: OC, t, n
Thomas Müller [Mon, 7 Apr 2014 12:31:43 +0000 (14:31 +0200)]
adding ownCloud globals to jshintrc: OC, t, n

10 years agoMerge pull request #8083 from owncloud/fix-link-to-sync
Thomas Müller [Mon, 7 Apr 2014 12:38:47 +0000 (14:38 +0200)]
Merge pull request #8083 from owncloud/fix-link-to-sync

Remove wrong whitespace from URL and use HTTPS

10 years agoMerge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
Thomas Müller [Mon, 7 Apr 2014 12:38:00 +0000 (14:38 +0200)]
Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js

Fix copy conflict dialog translation

10 years agoUse git checkout on directory as some files may not be in git resulting in, e.g.:
Andreas Fischer [Mon, 7 Apr 2014 12:06:20 +0000 (14:06 +0200)]
Use git checkout on directory as some files may not be in git resulting in, e.g.:

error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git.
error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.

10 years agoadding underscore.js
Thomas Müller [Mon, 7 Apr 2014 12:05:58 +0000 (14:05 +0200)]
adding underscore.js

10 years agoreduce code duplication, fix parse error, prevent page reload on hitting enter while...
Thomas Müller [Mon, 7 Apr 2014 12:04:16 +0000 (14:04 +0200)]
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085

10 years agoMerge pull request #6221 from leo-b/ldap_get_all_groups
blizzz [Mon, 7 Apr 2014 11:00:32 +0000 (13:00 +0200)]
Merge pull request #6221 from leo-b/ldap_get_all_groups

fix updateGroups background job for ldap servers with > 1000 groups

10 years agotranslations for oc-dialogs reside in code
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 09:58:32 +0000 (11:58 +0200)]
translations for oc-dialogs reside in code

10 years agoFix copy conflict dialog translation
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 09:46:47 +0000 (11:46 +0200)]
Fix copy conflict dialog translation

10 years agoMerge pull request #8017 from Raydiation/master
blizzz [Mon, 7 Apr 2014 08:19:18 +0000 (10:19 +0200)]
Merge pull request #8017 from Raydiation/master

Remove dependency on container, removing service locator antipattern

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 7 Apr 2014 05:56:11 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8064 from owncloud/remove-not-existing-functions
Lukas Reschke [Sun, 6 Apr 2014 20:24:30 +0000 (22:24 +0200)]
Merge pull request #8064 from owncloud/remove-not-existing-functions

Removed two unused functions

10 years agoSwitch to HTTPS
Lukas Reschke [Sun, 6 Apr 2014 20:06:38 +0000 (22:06 +0200)]
Switch to HTTPS

10 years agoRemove wrong whitespace from URL and use HTTPS
Lukas Reschke [Sun, 6 Apr 2014 20:04:14 +0000 (22:04 +0200)]
Remove wrong whitespace from URL and use HTTPS

The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`)

Additionally I switched the link to HTTPS.

10 years agoUpdate README.md
Volkan Gezer [Sun, 6 Apr 2014 12:01:02 +0000 (14:01 +0200)]
Update README.md

Update to the correct link (version 6.0)

10 years agoUpdate README.md
Volkan Gezer [Sun, 6 Apr 2014 11:58:44 +0000 (13:58 +0200)]
Update README.md

10 years agoUpdate README.md
Volkan Gezer [Sun, 6 Apr 2014 11:58:06 +0000 (13:58 +0200)]
Update README.md

Change version.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 6 Apr 2014 05:56:11 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8072 from owncloud/slideshow-buttons
jbtbnl [Sat, 5 Apr 2014 23:17:43 +0000 (01:17 +0200)]
Merge pull request #8072 from owncloud/slideshow-buttons

Fix slideshow buttons being invisible

10 years agoFix slideshow buttons being invisible
Robin Appelman [Sat, 5 Apr 2014 22:16:14 +0000 (00:16 +0200)]
Fix slideshow buttons being invisible

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 5 Apr 2014 05:56:08 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8061 from owncloud/remove-uneeded-file
Tom Needham [Fri, 4 Apr 2014 23:13:33 +0000 (00:13 +0100)]
Merge pull request #8061 from owncloud/remove-uneeded-file

Remove uneeded file

10 years agouse high resolution avatars on highdpi screens
Robin Appelman [Fri, 4 Apr 2014 21:35:32 +0000 (23:35 +0200)]
use high resolution avatars on highdpi screens

10 years agoMerge pull request #8062 from owncloud/remove-echo
Jörn Friedrich Dreyer [Fri, 4 Apr 2014 21:17:13 +0000 (23:17 +0200)]
Merge pull request #8062 from owncloud/remove-echo

Replace echo with `p` or `print_unescaped`

10 years agoDelete auth.css
Lukas Reschke [Fri, 4 Apr 2014 20:38:26 +0000 (22:38 +0200)]
Delete auth.css

10 years agoDelete oauth.css
Lukas Reschke [Fri, 4 Apr 2014 20:38:16 +0000 (22:38 +0200)]
Delete oauth.css

10 years agoRemoved two unused functions
Lukas Reschke [Fri, 4 Apr 2014 20:27:05 +0000 (22:27 +0200)]
Removed two unused functions

These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.

10 years agoReplace echo with `p` or `print_unescaped`
Lukas Reschke [Fri, 4 Apr 2014 20:23:23 +0000 (22:23 +0200)]
Replace echo with `p` or `print_unescaped`

Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it  I've adjusted it.

10 years agoRemove uneeded file
Lukas Reschke [Fri, 4 Apr 2014 20:14:51 +0000 (22:14 +0200)]
Remove uneeded file

This file seems not to be actually used anywhere.

10 years agoMerge pull request #8058 from owncloud/preview-highdpi
Vincent Petry [Fri, 4 Apr 2014 16:45:49 +0000 (18:45 +0200)]
Merge pull request #8058 from owncloud/preview-highdpi

Show higher resolution previews for high dpi screens

10 years agoMerge pull request #8055 from owncloud/getfileinfo-exists
icewind1991 [Fri, 4 Apr 2014 16:07:29 +0000 (18:07 +0200)]
Merge pull request #8055 from owncloud/getfileinfo-exists

dont scan not existing files in View->getFileInfo

10 years agoMerge pull request #8039 from owncloud/chunking-removeexpireinhaskey
Vincent Petry [Fri, 4 Apr 2014 15:18:54 +0000 (17:18 +0200)]
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey

Do not expire chunks while checking for their existence

10 years agoShow higher resolution previews for high dpi screens
Robin Appelman [Fri, 4 Apr 2014 15:10:46 +0000 (17:10 +0200)]
Show higher resolution previews for high dpi screens

10 years agodont scan not existing files in View->getFileInfo
Robin Appelman [Fri, 4 Apr 2014 13:10:07 +0000 (15:10 +0200)]
dont scan not existing files in View->getFileInfo

10 years agoMerge pull request #8047 from owncloud/jshint-line-length-120
Vincent Petry [Fri, 4 Apr 2014 10:00:01 +0000 (12:00 +0200)]
Merge pull request #8047 from owncloud/jshint-line-length-120

extending javascript line length to 120

10 years agoextending javascript line length to 120
Thomas Müller [Fri, 4 Apr 2014 08:36:19 +0000 (10:36 +0200)]
extending javascript line length to 120
adding xit to globals

10 years agoMerge pull request #8015 from owncloud/storageinfo-reuse
Vincent Petry [Fri, 4 Apr 2014 08:18:02 +0000 (10:18 +0200)]
Merge pull request #8015 from owncloud/storageinfo-reuse

Allow reusing FileInfo for getStorageInfo

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 4 Apr 2014 05:57:01 +0000 (01:57 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #6968 from owncloud/files-ajaxload
Morris Jobke [Thu, 3 Apr 2014 20:02:05 +0000 (22:02 +0200)]
Merge pull request #6968 from owncloud/files-ajaxload

Ajaxify files list for files + trashbin + public page

10 years agoDo not expire chunks while checking for their existence
Vincent Petry [Thu, 3 Apr 2014 19:12:35 +0000 (21:12 +0200)]
Do not expire chunks while checking for their existence

The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.

10 years agoExclude javascript specs from code analysis
Thomas Müller [Thu, 3 Apr 2014 18:05:40 +0000 (20:05 +0200)]
Exclude javascript specs from code analysis

10 years agoMerge pull request #7476 from owncloud/type-hinting
Thomas Müller [Thu, 3 Apr 2014 18:02:27 +0000 (20:02 +0200)]
Merge pull request #7476 from owncloud/type-hinting

Type hinting

10 years agoremove duplicate method checkDependencies()
Thomas Müller [Thu, 3 Apr 2014 15:17:44 +0000 (17:17 +0200)]
remove duplicate method checkDependencies()

10 years agouse command -v to detect if smbclient exists
Thomas Müller [Thu, 3 Apr 2014 15:09:40 +0000 (17:09 +0200)]
use command -v to detect if smbclient exists

10 years agoCorrectly set svg for crumb divider
Vincent Petry [Thu, 3 Apr 2014 15:08:06 +0000 (17:08 +0200)]
Correctly set svg for crumb divider

10 years agoMerge branch 'master' into fs-backend-registration
Thomas Müller [Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)]
Merge branch 'master' into fs-backend-registration

Conflicts:
apps/files_external/templates/settings.php

10 years agoFixed dirInfo check for non existing dir in files ajax call
Vincent Petry [Thu, 3 Apr 2014 15:04:13 +0000 (17:04 +0200)]
Fixed dirInfo check for non existing dir in files ajax call

10 years agoUpdate backends and their configurations
Thomas Müller [Thu, 3 Apr 2014 14:57:26 +0000 (16:57 +0200)]
Update backends and their configurations

10 years agoFixed mime type attribute access in file overwrite dialog
Vincent Petry [Thu, 3 Apr 2014 14:55:01 +0000 (16:55 +0200)]
Fixed mime type attribute access in file overwrite dialog

10 years agoRemoved redundant free space and upload limit in public page
Vincent Petry [Thu, 3 Apr 2014 14:50:21 +0000 (16:50 +0200)]
Removed redundant free space and upload limit in public page

10 years agoMoved dependency checks to end of class files
Philipp Kapfer [Fri, 2 Aug 2013 13:44:56 +0000 (15:44 +0200)]
Moved dependency checks to end of class files
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends

Conflicts:
apps/files_external/lib/google.php
apps/files_external/lib/swift.php
apps/files_external/templates/settings.php

10 years agoAdded cURL dependency for Amazon S3, Dropbox and SWIFT
Philipp Kapfer [Sat, 1 Jun 2013 09:28:02 +0000 (11:28 +0200)]
Added cURL dependency for Amazon S3, Dropbox and SWIFT

Conflicts:
apps/files_external/lib/amazons3.php
apps/files_external/lib/swift.php

10 years agoMerge pull request #7969 from Xenopathic/files_external_fix
Vincent Petry [Thu, 3 Apr 2014 14:31:58 +0000 (16:31 +0200)]
Merge pull request #7969 from Xenopathic/files_external_fix

Fix error log spam

10 years agoChanged dependency check messages from warnings to notes
Philipp Kapfer [Thu, 30 May 2013 15:37:47 +0000 (17:37 +0200)]
Changed dependency check messages from warnings to notes
Added check for duplicate dependency check messages to display only the first

10 years agoAdded cURL dependency check to Google Drive and WebDAV backend
Philipp Kapfer [Sat, 25 May 2013 15:10:20 +0000 (17:10 +0200)]
Added cURL dependency check to Google Drive and WebDAV backend
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing

Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php

10 years agoModified app to dynamically register backends instead of hard-coding them
Philipp Kapfer [Fri, 8 Mar 2013 17:15:20 +0000 (18:15 +0100)]
Modified app to dynamically register backends instead of hard-coding them
Moved dependency check to the individual backends instead of the config

Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php

10 years agoMerge pull request #7970 from owncloud/webdav-upload-hash
Thomas Müller [Thu, 3 Apr 2014 14:09:44 +0000 (16:09 +0200)]
Merge pull request #7970 from owncloud/webdav-upload-hash

Fix uploading files containing a # in the path for webdav

10 years agoFix error log spam
Robin McCorkell [Mon, 31 Mar 2014 14:16:33 +0000 (15:16 +0100)]
Fix error log spam

Regression from e002b7242cb19a0e028d325cd64b57e67dc48108

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 3 Apr 2014 05:56:12 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8014 from owncloud/uploadsize-reuse
icewind1991 [Wed, 2 Apr 2014 16:40:34 +0000 (18:40 +0200)]
Merge pull request #8014 from owncloud/uploadsize-reuse

Reuse known free space in the files app

10 years agoMerge pull request #7978 from owncloud/enc_cleanup
Vincent Petry [Wed, 2 Apr 2014 16:23:33 +0000 (18:23 +0200)]
Merge pull request #7978 from owncloud/enc_cleanup

there is no need to re-calculate the shares after a touch

10 years agoRemove dependency on container, removing service locator antipattern
Bernhard Posselt [Wed, 2 Apr 2014 15:54:33 +0000 (17:54 +0200)]
Remove dependency on container, removing service locator antipattern

10 years agoAllow reusing FileInfo for getStorageInfo
Robin Appelman [Wed, 2 Apr 2014 15:10:57 +0000 (17:10 +0200)]
Allow reusing FileInfo for getStorageInfo

10 years agoReuse known free space in the files app
Robin Appelman [Wed, 2 Apr 2014 14:53:45 +0000 (16:53 +0200)]
Reuse known free space in the files app

10 years agoFiles, trashbin, public apps use ajax/JSON for the file list
Vincent Petry [Mon, 28 Oct 2013 19:22:06 +0000 (20:22 +0100)]
Files, trashbin, public apps use ajax/JSON for the file list

Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app

10 years agoMerge pull request #7995 from owncloud/fix-h3-styles
Morris Jobke [Wed, 2 Apr 2014 12:45:58 +0000 (14:45 +0200)]
Merge pull request #7995 from owncloud/fix-h3-styles

fix h3 style, move out from settings to apps CSS

10 years agoMerge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
Vincent Petry [Wed, 2 Apr 2014 12:10:09 +0000 (14:10 +0200)]
Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib

Upgraded phpseclib to version 0.3.6 (SFTP ext storage)

10 years agoMerge pull request #8006 from wakeup/master
Morris Jobke [Wed, 2 Apr 2014 11:21:53 +0000 (13:21 +0200)]
Merge pull request #8006 from wakeup/master

Fix admin-dir_permissions redirection when cannot write warning is shown.

10 years agoMerge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
Morris Jobke [Wed, 2 Apr 2014 11:20:51 +0000 (13:20 +0200)]
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled

always encrypt files to owner