]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoupdate share owner
Thomas Müller [Thu, 30 Jan 2014 13:47:00 +0000 (14:47 +0100)]
update share owner

10 years agostore the share owner in a data-attribute instead of a separate span
Thomas Müller [Thu, 30 Jan 2014 12:55:25 +0000 (13:55 +0100)]
store the share owner in a data-attribute instead of a separate span

10 years agoadding share owner information to the file list
Thomas Müller [Thu, 30 Jan 2014 10:18:46 +0000 (11:18 +0100)]
adding share owner information to the file list

10 years agoMerge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix
Jan-Christoph Borchardt [Thu, 20 Feb 2014 15:25:08 +0000 (16:25 +0100)]
Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix

remove fix for IE9 nav bar width

10 years agoMerge pull request #7290 from owncloud/issue/5463
icewind1991 [Thu, 20 Feb 2014 15:24:31 +0000 (16:24 +0100)]
Merge pull request #7290 from owncloud/issue/5463

Correctly redirect to settings page when not selecting cert file for upload

10 years agoMerge pull request #7205 from owncloud/fix_7153
blizzz [Thu, 20 Feb 2014 15:22:43 +0000 (16:22 +0100)]
Merge pull request #7205 from owncloud/fix_7153

LDAP: prevent other configuration from being deleted when deleting the f...

10 years agoMerge pull request #7319 from owncloud/remote-unneeded-if
Morris Jobke [Thu, 20 Feb 2014 14:30:51 +0000 (15:30 +0100)]
Merge pull request #7319 from owncloud/remote-unneeded-if

Remove no longer needed if statement

10 years agoMerge pull request #6999 from kofemann/mount-config
Lukas Reschke [Thu, 20 Feb 2014 14:15:00 +0000 (15:15 +0100)]
Merge pull request #6999 from kofemann/mount-config

mount: make location of mount.json configurable

10 years agoMerge pull request #6935 from owncloud/fix_urlGenerator
Björn Schießle [Thu, 20 Feb 2014 13:57:03 +0000 (14:57 +0100)]
Merge pull request #6935 from owncloud/fix_urlGenerator

Add missing slash in URLGenerator::getAbsoluteURL().

10 years agoMerge pull request #7289 from owncloud/fix-filetype-icons
Lukas Reschke [Thu, 20 Feb 2014 13:53:41 +0000 (14:53 +0100)]
Merge pull request #7289 from owncloud/fix-filetype-icons

Fix filetype icons

10 years agoRemove no longer needed if statement
Robin Appelman [Thu, 20 Feb 2014 13:51:23 +0000 (14:51 +0100)]
Remove no longer needed if statement

10 years agoMerge pull request #7315 from owncloud/Jakobud-core-css-logos
Jan-Christoph Borchardt [Thu, 20 Feb 2014 13:36:34 +0000 (14:36 +0100)]
Merge pull request #7315 from owncloud/Jakobud-core-css-logos

Jakobud core css logos

10 years agoMerge pull request #7036 from LeBlaaanc/patch-1
Thomas Müller [Thu, 20 Feb 2014 13:29:41 +0000 (14:29 +0100)]
Merge pull request #7036 from LeBlaaanc/patch-1

Removed '/'. Fixes #7035.

10 years agoMerge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Jörn Friedrich Dreyer [Thu, 20 Feb 2014 13:29:23 +0000 (14:29 +0100)]
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core

Conflicts:
core/css/styles.css

10 years agoMerge pull request #6519 from nhirokinet/master
Lukas Reschke [Thu, 20 Feb 2014 13:28:26 +0000 (14:28 +0100)]
Merge pull request #6519 from nhirokinet/master

Security Update: session fixation

10 years agoMerge pull request #7301 from owncloud/fix-fuckup
icewind1991 [Thu, 20 Feb 2014 12:40:12 +0000 (13:40 +0100)]
Merge pull request #7301 from owncloud/fix-fuckup

fix master - #7274 brokes it

10 years agoMerge pull request #7247 from owncloud/sharing_cleanup_step1
Björn Schießle [Thu, 20 Feb 2014 10:56:20 +0000 (11:56 +0100)]
Merge pull request #7247 from owncloud/sharing_cleanup_step1

clean up the sharing ajax calls, add mail notification class

10 years agoMerge pull request #6714 from owncloud/files-newfileinvalidcharsfix
Lukas Reschke [Thu, 20 Feb 2014 10:53:58 +0000 (11:53 +0100)]
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix

Added extra checks for invalid file chars in newfile.php and newfolder.php

10 years agoMerge pull request #7287 from owncloud/subdirectory-harden
Lukas Reschke [Thu, 20 Feb 2014 10:46:11 +0000 (11:46 +0100)]
Merge pull request #7287 from owncloud/subdirectory-harden

Hardening: Remove dangerous characters + Subdirectory Check

10 years agoMerge pull request #7255 from owncloud/fix-admin-remote
Lukas Reschke [Thu, 20 Feb 2014 10:16:43 +0000 (11:16 +0100)]
Merge pull request #7255 from owncloud/fix-admin-remote

An admin should not be able to add remote and public services on its own

10 years agomerge master
Jan-Christoph Borchardt [Thu, 20 Feb 2014 09:51:13 +0000 (10:51 +0100)]
merge master

10 years agofix filetype icons for gzip, tex, perl, csv, sh
Jan-Christoph Borchardt [Thu, 20 Feb 2014 09:34:40 +0000 (10:34 +0100)]
fix filetype icons for gzip, tex, perl, csv, sh

10 years agoMerge pull request #7295 from owncloud/optimize_images_kondou
Morris Jobke [Thu, 20 Feb 2014 09:35:14 +0000 (10:35 +0100)]
Merge pull request #7295 from owncloud/optimize_images_kondou

Optimize images

10 years agoRevert "Added extra checks for ext storage class"
Vincent Petry [Thu, 20 Feb 2014 09:01:49 +0000 (10:01 +0100)]
Revert "Added extra checks for ext storage class"

This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9.

Unit tests weren't ready, need further tweaking.

10 years agoMerge pull request #7284 from owncloud/ldap_filter_compilation
Lukas Reschke [Thu, 20 Feb 2014 08:55:02 +0000 (09:55 +0100)]
Merge pull request #7284 from owncloud/ldap_filter_compilation

LDAP: improve compilation of filters

10 years agoMerge pull request #7294 from owncloud/extstorage-configclass
Lukas Reschke [Thu, 20 Feb 2014 08:53:52 +0000 (09:53 +0100)]
Merge pull request #7294 from owncloud/extstorage-configclass

Added extra checks for ext storage class

10 years agofix master - #7274 brokes it
Morris Jobke [Thu, 20 Feb 2014 08:47:59 +0000 (09:47 +0100)]
fix master - #7274 brokes it

10 years agoOptimize some images
kondou [Wed, 19 Feb 2014 20:31:50 +0000 (21:31 +0100)]
Optimize some images

and strip metadata from png images with optipng in image_optimization.sh

10 years agoclean up the sharing ajax calls, add mail notification class
Bjoern Schiessle [Mon, 17 Feb 2014 17:26:52 +0000 (18:26 +0100)]
clean up the sharing ajax calls, add mail notification class

10 years agoAdded extra checks for ext storage class
Vincent Petry [Wed, 19 Feb 2014 18:08:28 +0000 (19:08 +0100)]
Added extra checks for ext storage class

10 years agoMerge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes
Lukas Reschke [Wed, 19 Feb 2014 17:57:59 +0000 (18:57 +0100)]
Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes

Fixed ext storage webdav path encoding

10 years agoFixed ext storage webdav path encoding
Vincent Petry [Fri, 31 Jan 2014 15:06:11 +0000 (16:06 +0100)]
Fixed ext storage webdav path encoding

- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
  support/return it
- Fixed touch() to return false if the server doesn't implement
  PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
  lighttpd's WebDAV

10 years agoCorrectly redirect to settings page when not selecting cert file for upload
Joas Schilling [Wed, 19 Feb 2014 16:07:29 +0000 (17:07 +0100)]
Correctly redirect to settings page when not selecting cert file for upload

Fix #5463

10 years agoOptimize images
kondou [Wed, 19 Feb 2014 15:44:08 +0000 (16:44 +0100)]
Optimize images

10 years agocoding style: spaces around =>
Jan-Christoph Borchardt [Wed, 19 Feb 2014 15:28:29 +0000 (16:28 +0100)]
coding style: spaces around =>

10 years agofix lots of file type icons for archives, js, flash, ics, fonts, code, ...
Jan-Christoph Borchardt [Wed, 19 Feb 2014 15:27:38 +0000 (16:27 +0100)]
fix lots of file type icons for archives, js, flash, ics, fonts, code, ...

10 years agoHardening: Remove dangerous characters + Subdirectory Check
Lukas Reschke [Wed, 19 Feb 2014 14:38:00 +0000 (15:38 +0100)]
Hardening: Remove dangerous characters + Subdirectory Check

If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.

10 years agoMerge pull request #7195 from owncloud/files-selectall
Vincent Petry [Wed, 19 Feb 2014 13:33:24 +0000 (14:33 +0100)]
Merge pull request #7195 from owncloud/files-selectall

Do not send file list for select all on Download/delete

10 years agoLDAP: improve compilation of filters
Arthur Schiwon [Wed, 19 Feb 2014 12:13:01 +0000 (13:13 +0100)]
LDAP: improve compilation of filters

10 years agoMerge pull request #7275 from owncloud/3rdparty-fix
Thomas Müller [Wed, 19 Feb 2014 11:26:41 +0000 (12:26 +0100)]
Merge pull request #7275 from owncloud/3rdparty-fix

fix 3rdparty submodule

10 years agoMerge pull request #7278 from owncloud/issue/7277
Jan-Christoph Borchardt [Wed, 19 Feb 2014 11:20:47 +0000 (12:20 +0100)]
Merge pull request #7278 from owncloud/issue/7277

Add event parameter to keyup event

10 years agoMerge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_...
Jan-Christoph Borchardt [Wed, 19 Feb 2014 10:58:48 +0000 (11:58 +0100)]
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master

Concatenate string in SQL instead of PHP

10 years agoMerge pull request #7274 from owncloud/scrutinizer-patch-1
Morris Jobke [Wed, 19 Feb 2014 10:51:04 +0000 (11:51 +0100)]
Merge pull request #7274 from owncloud/scrutinizer-patch-1

Scrutinizer Auto-Fixes

10 years agofix wrong removes
Morris Jobke [Wed, 19 Feb 2014 10:50:17 +0000 (11:50 +0100)]
fix wrong removes

10 years agoMerge pull request #7260 from owncloud/watcher-policy
icewind1991 [Wed, 19 Feb 2014 10:17:27 +0000 (11:17 +0100)]
Merge pull request #7260 from owncloud/watcher-policy

Allow setting the frequency of which the file watcher checks for updates

10 years agoAdd event parameter to keyup event
Joas Schilling [Wed, 19 Feb 2014 09:25:52 +0000 (10:25 +0100)]
Add event parameter to keyup event

Fix issue #7277

10 years agofix 3rdparty submodule
Morris Jobke [Wed, 19 Feb 2014 09:02:44 +0000 (10:02 +0100)]
fix 3rdparty submodule

10 years agoadd unit tests for watcher policies
Robin Appelman [Wed, 19 Feb 2014 08:52:32 +0000 (09:52 +0100)]
add unit tests for watcher policies

10 years agoMerge pull request #7257 from owncloud/filelist-fileinfo
Vincent Petry [Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)]
Merge pull request #7257 from owncloud/filelist-fileinfo

use a FileInfo object of the directory when generting the filelist

10 years agoScrutinizer Auto-Fixes
Scrutinizer Auto-Fixer [Wed, 19 Feb 2014 08:31:54 +0000 (09:31 +0100)]
Scrutinizer Auto-Fixes

This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend

10 years agoMerge pull request #7114 from owncloud/scrutinizer_documentation_patches
Thomas Müller [Wed, 19 Feb 2014 06:04:37 +0000 (07:04 +0100)]
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches

polish documentation based on scrutinizer patches

10 years agoMerge branch 'master' into scrutinizer_documentation_patches
Thomas Müller [Tue, 18 Feb 2014 17:31:33 +0000 (18:31 +0100)]
Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
lib/private/migration/content.php

10 years agoMerge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect
Tom Needham [Tue, 18 Feb 2014 17:26:56 +0000 (18:26 +0100)]
Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect

do not autocapitalize fields on mobile, fix user name input

10 years agoMerge pull request #7253 from owncloud/preferences-caching
icewind1991 [Tue, 18 Feb 2014 17:17:58 +0000 (18:17 +0100)]
Merge pull request #7253 from owncloud/preferences-caching

Add caching to OC\Preferences

10 years agoMerge pull request #6796 from owncloud/statementwrapper-bindparam
Thomas Müller [Tue, 18 Feb 2014 17:13:57 +0000 (18:13 +0100)]
Merge pull request #6796 from owncloud/statementwrapper-bindparam

Add bindParam to the database statement wrapper

10 years agoMerge pull request #7190 from owncloud/appconfig-legacy-apps
Thomas Müller [Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)]
Merge pull request #7190 from owncloud/appconfig-legacy-apps

Remove usage of legacy OC_Appconfig

10 years agoAdded file name check in webdav connector
Vincent Petry [Mon, 13 Jan 2014 12:14:05 +0000 (13:14 +0100)]
Added file name check in webdav connector

- added file name check for the put, rename and setNames() methods which
  throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
  unit tests

10 years agoAdded extra checks for invalid file chars in newfile.php and newfolder.php
Vincent Petry [Fri, 10 Jan 2014 15:14:37 +0000 (16:14 +0100)]
Added extra checks for invalid file chars in newfile.php and newfolder.php

- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters

10 years agoMerge pull request #6650 from owncloud/migration_unit_tests
Tom Needham [Tue, 18 Feb 2014 16:35:49 +0000 (17:35 +0100)]
Merge pull request #6650 from owncloud/migration_unit_tests

User migration fix, and basic unit test

10 years agoMerge pull request #7176 from owncloud/style
Lukas Reschke [Tue, 18 Feb 2014 16:30:26 +0000 (17:30 +0100)]
Merge pull request #7176 from owncloud/style

Some style fixes

10 years agoRemove unused variables
tomneedham [Tue, 18 Feb 2014 16:28:04 +0000 (16:28 +0000)]
Remove unused variables

10 years agoFix poor spelling
tomneedham [Tue, 18 Feb 2014 16:23:16 +0000 (16:23 +0000)]
Fix poor spelling

10 years agoAllow setting the frequency of which the file watcher checks for updates
Robin Appelman [Tue, 18 Feb 2014 15:31:40 +0000 (16:31 +0100)]
Allow setting the frequency of which the file watcher checks for updates

10 years agouse a FileInfo object of the directory when generting the filelist
Robin Appelman [Tue, 18 Feb 2014 14:39:35 +0000 (15:39 +0100)]
use a FileInfo object of the directory when generting the filelist

10 years agoremove some unneeded isset's
Robin Appelman [Tue, 18 Feb 2014 13:27:55 +0000 (14:27 +0100)]
remove some unneeded isset's

10 years agoFix some phpdoc
Robin Appelman [Tue, 18 Feb 2014 13:26:27 +0000 (14:26 +0100)]
Fix some phpdoc

10 years agoCheck whether the app is set
Lukas Reschke [Tue, 18 Feb 2014 13:12:49 +0000 (14:12 +0100)]
Check whether the app is set

10 years agoCheck whether the Key is set
Lukas Reschke [Tue, 18 Feb 2014 11:47:05 +0000 (12:47 +0100)]
Check whether the Key is set

10 years agoAn admin should not be able to add remote and public services on its own. This should...
Lukas Reschke [Tue, 18 Feb 2014 11:32:57 +0000 (12:32 +0100)]
An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.

10 years agoAdd caching to OC\Preferences
Robin Appelman [Tue, 18 Feb 2014 10:20:16 +0000 (11:20 +0100)]
Add caching to OC\Preferences

10 years agodo not autocapitalize fields on mobile, fix user name input. Also disable autocorrect...
Jan-Christoph Borchardt [Tue, 18 Feb 2014 09:58:00 +0000 (10:58 +0100)]
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete

10 years agoMerge pull request #7243 from owncloud/core-sessionlifetimedefault
Thomas Müller [Tue, 18 Feb 2014 09:30:25 +0000 (10:30 +0100)]
Merge pull request #7243 from owncloud/core-sessionlifetimedefault

Now using PHP session lifetime as default value for the JS config

10 years agoMerge pull request #7239 from owncloud/cbr-filetype-icon
Thomas Müller [Tue, 18 Feb 2014 09:23:54 +0000 (10:23 +0100)]
Merge pull request #7239 from owncloud/cbr-filetype-icon

add cbr/cbz file type icon, fix #6953

10 years agoNow using PHP session lifetime as default value for the JS config
Vincent Petry [Mon, 17 Feb 2014 20:32:40 +0000 (21:32 +0100)]
Now using PHP session lifetime as default value for the JS config

This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.

10 years agoMerge pull request #7235 from DavidVentura/master
Jan-Christoph Borchardt [Mon, 17 Feb 2014 20:16:39 +0000 (21:16 +0100)]
Merge pull request #7235 from DavidVentura/master

small change for compatibility

10 years agoMerge pull request #7240 from owncloud/mimetype-fallback
icewind1991 [Mon, 17 Feb 2014 20:06:15 +0000 (21:06 +0100)]
Merge pull request #7240 from owncloud/mimetype-fallback

use file icon as fallback instead of application icon, fix #7237

10 years agoMerge pull request #7211 from mattcaron/master
Vincent Petry [Mon, 17 Feb 2014 19:59:29 +0000 (20:59 +0100)]
Merge pull request #7211 from mattcaron/master

Fit shared videos to viewer, just like images. Issue #1648

10 years agoMerge pull request #7231 from owncloud/proper-content-type
Jörn Friedrich Dreyer [Mon, 17 Feb 2014 19:58:52 +0000 (20:58 +0100)]
Merge pull request #7231 from owncloud/proper-content-type

Use the proper content-type

10 years agouse file icon as fallback instead of application icon, fix #7237
Jan-Christoph Borchardt [Mon, 17 Feb 2014 19:58:33 +0000 (20:58 +0100)]
use file icon as fallback instead of application icon, fix #7237

10 years agoMerge pull request #7233 from owncloud/fix_5567
Jörn Friedrich Dreyer [Mon, 17 Feb 2014 19:57:56 +0000 (20:57 +0100)]
Merge pull request #7233 from owncloud/fix_5567

LDAP: improve wizard strings, fixes #5567

10 years agoadd cbr/cbz file type icon, fix #6953
Jan-Christoph Borchardt [Mon, 17 Feb 2014 19:48:32 +0000 (20:48 +0100)]
add cbr/cbz file type icon, fix #6953

10 years agoConsolidate two sections, per code review. Issue #1648
Matthew Caron [Mon, 17 Feb 2014 17:57:32 +0000 (12:57 -0500)]
Consolidate two sections, per code review. Issue #1648

10 years agoTrashbin select all now doesn't send file list
Vincent Petry [Mon, 17 Feb 2014 17:26:29 +0000 (18:26 +0100)]
Trashbin select all now doesn't send file list

- Fixed "delete" and "restore" actions to not send the file list when
  all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
  value based on the current dir

10 years agosmall change for compatibility
David [Mon, 17 Feb 2014 16:27:07 +0000 (13:27 -0300)]
small change for compatibility

10 years agoLDAP: improve wizard strings, fixes #5567
Arthur Schiwon [Mon, 17 Feb 2014 16:19:48 +0000 (17:19 +0100)]
LDAP: improve wizard strings, fixes #5567

10 years agoUse the proper content-type
Lukas Reschke [Mon, 17 Feb 2014 15:45:22 +0000 (16:45 +0100)]
Use the proper content-type

We should use the proper content-type `application/xml` instead of the default `text/html` here.

Backport requested.

10 years agoMerge pull request #7132 from owncloud/issue/6920
Jan-Christoph Borchardt [Mon, 17 Feb 2014 14:01:03 +0000 (15:01 +0100)]
Merge pull request #7132 from owncloud/issue/6920

Do not select input for all text input fields

10 years agoMerge pull request #6892 from owncloud/issuetemplate-enhancements
Lukas Reschke [Mon, 17 Feb 2014 13:59:00 +0000 (14:59 +0100)]
Merge pull request #6892 from owncloud/issuetemplate-enhancements

Issue template enhancements

10 years agoRemoved quota question
Vincent Petry [Mon, 17 Feb 2014 13:34:15 +0000 (14:34 +0100)]
Removed quota question

10 years agoMerge branch 'master' into migration_unit_tests
tomneedham [Mon, 17 Feb 2014 11:03:57 +0000 (11:03 +0000)]
Merge branch 'master' into migration_unit_tests

10 years agoFinish basic testing of user export
tomneedham [Mon, 17 Feb 2014 10:58:27 +0000 (10:58 +0000)]
Finish basic testing of user export

10 years agoMerge pull request #7155 from owncloud/enc_improved_error_handling
Björn Schießle [Mon, 17 Feb 2014 10:13:44 +0000 (11:13 +0100)]
Merge pull request #7155 from owncloud/enc_improved_error_handling

[encryption] improved error handling

10 years agodon't block login forever if we are stuck in the middle of the initial encryption
Bjoern Schiessle [Tue, 11 Feb 2014 11:44:06 +0000 (12:44 +0100)]
don't block login forever if we are stuck in the middle of the initial encryption

10 years agocatch errors during decryption
Bjoern Schiessle [Mon, 10 Feb 2014 16:23:54 +0000 (17:23 +0100)]
catch errors during decryption

10 years agocatch errors during initial encryption
Bjoern Schiessle [Mon, 10 Feb 2014 15:43:04 +0000 (16:43 +0100)]
catch errors during initial encryption

10 years agoMerge pull request #7156 from owncloud/backgroundjob-public
Thomas Müller [Fri, 14 Feb 2014 22:11:10 +0000 (23:11 +0100)]
Merge pull request #7156 from owncloud/backgroundjob-public

Add the background job list to the public server container

10 years agoMerge branch 'master' into scrutinizer_documentation_patches
Thomas Müller [Fri, 14 Feb 2014 22:03:27 +0000 (23:03 +0100)]
Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
lib/private/appconfig.php

10 years agoMerge pull request #7207 from owncloud/fileinfo-serializable
Morris Jobke [Fri, 14 Feb 2014 21:11:54 +0000 (22:11 +0100)]
Merge pull request #7207 from owncloud/fileinfo-serializable

Remove the JsonSerializable interface from \OC\Files\FileInfo

10 years agoFit shared videos to viewer, just like images. Issue #1648
Matthew Caron [Fri, 14 Feb 2014 21:09:19 +0000 (16:09 -0500)]
Fit shared videos to viewer, just like images. Issue #1648

10 years agoMerge pull request #7204 from owncloud/groupexists-duplicate
Thomas Müller [Fri, 14 Feb 2014 20:53:03 +0000 (21:53 +0100)]
Merge pull request #7204 from owncloud/groupexists-duplicate

Remove duplicate call to groupExists