]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoMerge pull request #15182 from rullzer/fix-8231
Thomas Müller [Thu, 9 Apr 2015 22:05:11 +0000 (00:05 +0200)]
Merge pull request #15182 from rullzer/fix-8231

ajax/share.php should return correct list of suggestions

9 years agoMerge pull request #15492 from owncloud/ldap-wizard-overhaul
blizzz [Thu, 9 Apr 2015 21:52:53 +0000 (23:52 +0200)]
Merge pull request #15492 from owncloud/ldap-wizard-overhaul

LDAP Wizard Overhaul

9 years agoMerge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
Thomas Müller [Thu, 9 Apr 2015 21:37:02 +0000 (23:37 +0200)]
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares

only create a db entry for the user in case of a name conflict on group share

9 years agochange default value of ldap_tls to 0. It will be detected anyway, but starting with...
Arthur Schiwon [Thu, 9 Apr 2015 19:04:33 +0000 (21:04 +0200)]
change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability

9 years agocompile user and login filter on the first time automatically, if a suggestion was...
Arthur Schiwon [Thu, 9 Apr 2015 18:31:23 +0000 (20:31 +0200)]
compile user and login filter on the first time automatically, if a suggestion was provided

9 years agoMerge pull request #15512 from owncloud/autoclose-settings-menu
Vincent Petry [Thu, 9 Apr 2015 17:53:43 +0000 (19:53 +0200)]
Merge pull request #15512 from owncloud/autoclose-settings-menu

Don't stop event execution for menu item click

9 years agoMerge pull request #15511 from owncloud/fix-typos
Lukas Reschke [Thu, 9 Apr 2015 17:23:27 +0000 (19:23 +0200)]
Merge pull request #15511 from owncloud/fix-typos

Fix typos and some other adjustments

9 years agoMerge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
Morris Jobke [Thu, 9 Apr 2015 16:41:18 +0000 (18:41 +0200)]
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource

fixes #15326

9 years agoDon't stop event execution for menu item click
Morris Jobke [Thu, 9 Apr 2015 12:46:26 +0000 (14:46 +0200)]
Don't stop event execution for menu item click

* fixes #12326 - the settings menu is closed now, because the event is executed

9 years agoFix mock object to return proper type
Thomas Müller [Thu, 9 Apr 2015 16:30:45 +0000 (18:30 +0200)]
Fix mock object to return proper type

9 years agoMerge pull request #15282 from owncloud/keepsharerelationshipondelete
Vincent Petry [Thu, 9 Apr 2015 16:10:17 +0000 (18:10 +0200)]
Merge pull request #15282 from owncloud/keepsharerelationshipondelete

Keep shares when deleting shared folders

9 years agoFix mock object to return proper type
Thomas Müller [Thu, 9 Apr 2015 15:45:57 +0000 (17:45 +0200)]
Fix mock object to return proper type

9 years agoMerge pull request #14540 from owncloud/windows-setup-check
Lukas Reschke [Thu, 9 Apr 2015 14:38:11 +0000 (16:38 +0200)]
Merge pull request #14540 from owncloud/windows-setup-check

Disallow Windows Server in Server Check

9 years agoDisallow Windows Server in Server Check
Lukas Reschke [Thu, 26 Feb 2015 13:24:40 +0000 (14:24 +0100)]
Disallow Windows Server in Server Check

Will prevent users from use ownCloud on Windows Server :see_no_evil:

9 years agoMerge pull request #15501 from owncloud/better-output-format-console
Morris Jobke [Thu, 9 Apr 2015 13:46:36 +0000 (15:46 +0200)]
Merge pull request #15501 from owncloud/better-output-format-console

Add an option to get the output in plain, json or print_r syntax

9 years agofixes #15326
Jörn Friedrich Dreyer [Thu, 9 Apr 2015 13:37:00 +0000 (15:37 +0200)]
fixes #15326

9 years agoRemove trashbin storage wrapper when disabling it for tests
Vincent Petry [Thu, 9 Apr 2015 13:02:24 +0000 (15:02 +0200)]
Remove trashbin storage wrapper when disabling it for tests

9 years agoMerge pull request #15235 from owncloud/remote-share-hint
Morris Jobke [Thu, 9 Apr 2015 12:54:57 +0000 (14:54 +0200)]
Merge pull request #15235 from owncloud/remote-share-hint

Hint for remote sharing syntax

9 years agoMerge pull request #13896 from owncloud/share-generatetarget-remove-exclude
Björn Schießle [Thu, 9 Apr 2015 12:51:15 +0000 (14:51 +0200)]
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude

Dont create exclude list for generating the share target

9 years agoescape filter for output
Arthur Schiwon [Thu, 9 Apr 2015 12:49:11 +0000 (14:49 +0200)]
escape filter for output

9 years agoMerge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
Thomas Müller [Thu, 9 Apr 2015 12:45:40 +0000 (14:45 +0200)]
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting

Check if the key exists, before trying to delete it

9 years agofix number and insert position when adding/copying a config
Arthur Schiwon [Thu, 9 Apr 2015 12:44:40 +0000 (14:44 +0200)]
fix number and insert position when adding/copying a config

9 years agochange handling in app:list
Joas Schilling [Thu, 9 Apr 2015 12:44:30 +0000 (14:44 +0200)]
change handling in app:list

9 years agoReplace print_r() with pretty json
Joas Schilling [Thu, 9 Apr 2015 12:42:44 +0000 (14:42 +0200)]
Replace print_r() with pretty json

9 years agoupdate back/continue buttons also on tab click
Arthur Schiwon [Thu, 9 Apr 2015 12:40:00 +0000 (14:40 +0200)]
update back/continue buttons also on tab click

9 years agoMerge pull request #15500 from owncloud/installation-hint
Morris Jobke [Thu, 9 Apr 2015 12:33:55 +0000 (14:33 +0200)]
Merge pull request #15500 from owncloud/installation-hint

add link to installation documentation to setup page

9 years agoMerge pull request #15507 from owncloud/remove-uneeded-file
Björn Schießle [Thu, 9 Apr 2015 12:32:53 +0000 (14:32 +0200)]
Merge pull request #15507 from owncloud/remove-uneeded-file

Remove unneeded file

9 years agoFix typos and some other adjustments
Lukas Reschke [Thu, 9 Apr 2015 12:06:55 +0000 (14:06 +0200)]
Fix typos and some other adjustments

9 years agocleanup
Arthur Schiwon [Thu, 9 Apr 2015 12:01:39 +0000 (14:01 +0200)]
cleanup

9 years agonewlines at end of file
Arthur Schiwon [Thu, 9 Apr 2015 12:00:34 +0000 (14:00 +0200)]
newlines at end of file

yes, IDE is now configured accordingly.

9 years agodoc
Arthur Schiwon [Thu, 9 Apr 2015 11:56:20 +0000 (13:56 +0200)]
doc

9 years agomove script and style inclusions into template
Arthur Schiwon [Thu, 9 Apr 2015 11:52:35 +0000 (13:52 +0200)]
move script and style inclusions into template

9 years agoRemove unneeded file
Lukas Reschke [Thu, 9 Apr 2015 11:29:51 +0000 (13:29 +0200)]
Remove unneeded file

9 years agoMerge pull request #15503 from owncloud/link-standard-subscription
Thomas Müller [Thu, 9 Apr 2015 11:15:09 +0000 (13:15 +0200)]
Merge pull request #15503 from owncloud/link-standard-subscription

Help section: fix commercial support link

9 years agorun functionality checks also when host field changes
Arthur Schiwon [Thu, 9 Apr 2015 10:36:53 +0000 (12:36 +0200)]
run functionality checks also when host field changes

9 years agoRemove unused $toRemove
Vincent Petry [Thu, 9 Apr 2015 10:34:19 +0000 (12:34 +0200)]
Remove unused $toRemove

9 years agohelp section: code style and wording fixes
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:33:18 +0000 (12:33 +0200)]
help section: code style and wording fixes

9 years agoCorrectly generate the doc link via go.php
Joas Schilling [Thu, 9 Apr 2015 10:30:18 +0000 (12:30 +0200)]
Correctly generate the doc link via go.php

9 years agolink to proper subsite for Commercial support
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:29:44 +0000 (12:29 +0200)]
link to proper subsite for Commercial support

9 years agoFix config usage
Joas Schilling [Thu, 9 Apr 2015 10:19:42 +0000 (12:19 +0200)]
Fix config usage

9 years agoMerge pull request #15499 from owncloud/admin-hints
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:12:53 +0000 (12:12 +0200)]
Merge pull request #15499 from owncloud/admin-hints

add admin documentation hints to Federated Cloud Sharing and cron

9 years agofix remote share info icon for IE8
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:11:42 +0000 (12:11 +0200)]
fix remote share info icon for IE8

9 years agoMerge pull request #15497 from owncloud/enforce-type-security
Lukas Reschke [Thu, 9 Apr 2015 10:08:27 +0000 (12:08 +0200)]
Merge pull request #15497 from owncloud/enforce-type-security

Enforce string as passed type

9 years agoadd admin documentation hints to Federated Cloud Sharing and cron
Jan-Christoph Borchardt [Thu, 9 Apr 2015 08:57:15 +0000 (10:57 +0200)]
add admin documentation hints to Federated Cloud Sharing and cron

9 years agoadjust tests
Arthur Schiwon [Thu, 9 Apr 2015 10:00:11 +0000 (12:00 +0200)]
adjust tests

9 years agoAdd an option to get the output in plain, json or print_r syntax
Joas Schilling [Thu, 9 Apr 2015 09:45:07 +0000 (11:45 +0200)]
Add an option to get the output in plain, json or print_r syntax

9 years agoadd link to installation documentation to setup page
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:27:24 +0000 (11:27 +0200)]
add link to installation documentation to setup page

9 years agoonly create a db entry for the user in case of a name conflict on group share
Bjoern Schiessle [Thu, 5 Feb 2015 13:00:05 +0000 (14:00 +0100)]
only create a db entry for the user in case of a name conflict on group share

9 years agofix position of SQLite warning
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:10:41 +0000 (11:10 +0200)]
fix position of SQLite warning

9 years agocode style fixes
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:09:15 +0000 (11:09 +0200)]
code style fixes

9 years agoFix PHPDoc
Lukas Reschke [Thu, 9 Apr 2015 08:54:53 +0000 (10:54 +0200)]
Fix PHPDoc

9 years agoFix code style
Lukas Reschke [Thu, 9 Apr 2015 08:46:46 +0000 (10:46 +0200)]
Fix code style

9 years agoEnforce string as passed type
Lukas Reschke [Thu, 9 Apr 2015 08:45:50 +0000 (10:45 +0200)]
Enforce string as passed type

9 years agoCheck if the key exists, before trying to delete it
Joas Schilling [Thu, 9 Apr 2015 08:28:02 +0000 (10:28 +0200)]
Check if the key exists, before trying to delete it

9 years agoKeep shares when deleting shared folders
Vincent Petry [Fri, 27 Mar 2015 16:33:26 +0000 (17:33 +0100)]
Keep shares when deleting shared folders

The share entries will be linked with the fileid while they are kept in
the trashbin.

In the future a background just will scrape orphaned shares and delete
them.

9 years agoadd more present info about remote shares, fix layout of inputs
Jan-Christoph Borchardt [Thu, 9 Apr 2015 08:16:29 +0000 (10:16 +0200)]
add more present info about remote shares, fix layout of inputs

9 years agoMerge pull request #15314 from owncloud/app-categories-15274
Lukas Reschke [Thu, 9 Apr 2015 08:07:32 +0000 (10:07 +0200)]
Merge pull request #15314 from owncloud/app-categories-15274

Add different trust levels to AppStore interface

9 years agoLDAP Wizard Overhaul
Arthur Schiwon [Tue, 3 Mar 2015 10:56:03 +0000 (11:56 +0100)]
LDAP Wizard Overhaul

wizard refactor

reimplement save spinners and cursor

implement Port detector

introduced detector queue, added base dn detector

disable input fields when detectors are running

introduce spinners for fields that are being updated by detector

cache jq element objects

consolidate processing of detector results in generic / abstract base class

display notification if a detector discovered a problem

don't run base dn detector if a base is configured

reset detector queue on configuration switch

implement functionality check and update of status indicator

document ConfigModel

jsdoc for controller and main view

more documentation

implement the user filter tab view

so far the multiselects get initialized (not filled yet) and the mode can be switched.

mode is also restored.

reintroduce filter switch confirmation in admin XP mode

new detector for user object classes. so we also load user object classes if necessary and are able to save and show the setting.

multiselect trigger save actions now on close only

show spinners automatically, when a detector is running

20k limit for object classes preselection test

adjust wordings, fix grammar

add group (for users tab) detector

also includes wording fixes

error presentation moved from detectors to view, where it belongs

add info label to users page

missing wording changes

show effective LDAP filter in Assisted Mode

add user filter detector

implement count button for users and limit all count actions to 1001 for performance reasons

make port field a bit bigger. not perfect though.

do not detect port automatically

implement login filter tab view

only load features in assisted mode and don't enable assisted fields while in raw mode

add tooltips on login filter checkbox options for better understanding

permanently show filter on login tab

and also compile login filter in assisted mode

test/verify button on login attributes tab, with backend changes.

only run wizard requests if your an active tab. also run compile filter requests when switching to assisted mode

underline toggle filter links to stress that they are clickable

unity user and group tab functionality in common abstract class, add group filter tab view. only detectors and template adjustments left to have group tab implementation complete

add object class and group detector for groups as well as filter composer

show ldap filter permanently on groups tab

introduce input element that can deal better with many groups, will be used with > 40

fix disabling complex group chooser while detection is running

hide complex group chooser on config switch

fix few more issues with complex chooser

make complex group chooser available on Users tab as well

detect base dn improvements/changes:

- do not look for Base DN automatically, offer a button instead
- fix for alternative way to detect a base dn (if agent dn is not given)
- do not trigger filter composers on config switch

Changes with configuration chooser controls

- "New" was removed out of the configuration list
- and split into buttons "add" and "copy"
- delete button is also now an icon

add test button for Base DN

reimplement advanced tab. The save button is gone.

reimplement expert tab

remove unused methods

implement mail attribute detector

implement user display name attribute detection

implement member group association detector

replace text input with textarea for raw filter input

finish functionality check

auto-enable good configurations, as it was before

cleanup

move save confirmation handling to base class, reduces code duplication

enable tabs only if no running save processes are left.

move onConfigLoaded to base class, avoids code duplication

simplify, save LOCs

Test Configuration button to be dealt with in main view as it is a cross-tab element

require detectorQueue in constructor

cleanup

put bootstrap into a function and thus make it testable

get rid of old stuff

9 years agoMerge pull request #14676 from owncloud/deleteorphanedshares
Morris Jobke [Wed, 8 Apr 2015 22:18:53 +0000 (00:18 +0200)]
Merge pull request #14676 from owncloud/deleteorphanedshares

Delete orphaned shares in a background job

9 years agoMerge pull request #15196 from owncloud/limit-file-activities-to-favorites
Morris Jobke [Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)]
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites

Limit file activities to favorites

9 years agoMerge pull request #15448 from owncloud/occ-check-server-env-master
Morris Jobke [Wed, 8 Apr 2015 22:07:08 +0000 (00:07 +0200)]
Merge pull request #15448 from owncloud/occ-check-server-env-master

Adding check command to validate server environment

9 years agoMerge pull request #15483 from owncloud/maintenance-refresh
Thomas Müller [Wed, 8 Apr 2015 20:46:35 +0000 (22:46 +0200)]
Merge pull request #15483 from owncloud/maintenance-refresh

Fix maintenance refresh interval

9 years agoAdd JS unit test for sorting
Lukas Reschke [Wed, 8 Apr 2015 20:08:37 +0000 (22:08 +0200)]
Add JS unit test for sorting

9 years agoMerge pull request #15490 from owncloud/remove-debug-logging
Morris Jobke [Wed, 8 Apr 2015 19:42:47 +0000 (21:42 +0200)]
Merge pull request #15490 from owncloud/remove-debug-logging

remove unessesary logging of methods instantiation

9 years agoReference `$(this)` instead
Lukas Reschke [Wed, 8 Apr 2015 19:26:12 +0000 (21:26 +0200)]
Reference `$(this)` instead

9 years agoFix wording
Lukas Reschke [Wed, 8 Apr 2015 19:24:03 +0000 (21:24 +0200)]
Fix wording

9 years agoMerge pull request #14120 from owncloud/dav-statcache
Morris Jobke [Wed, 8 Apr 2015 19:09:28 +0000 (21:09 +0200)]
Merge pull request #14120 from owncloud/dav-statcache

Stat cache for DAV storage, improves s2s performance a little bit

9 years agoMerge pull request #15488 from owncloud/files-navigation-icons
Morris Jobke [Wed, 8 Apr 2015 19:06:03 +0000 (21:06 +0200)]
Merge pull request #15488 from owncloud/files-navigation-icons

add icons to Files sidebar

9 years agofix for IE8
Morris Jobke [Wed, 8 Apr 2015 19:05:31 +0000 (21:05 +0200)]
fix for IE8

9 years agoremove unessesary logging of methods instantiation
Clark Tomlinson [Wed, 8 Apr 2015 18:46:01 +0000 (14:46 -0400)]
remove unessesary logging of methods instantiation

9 years agoadd icons to files sidebar, fix shade, fix position of settings icon and text
Jan-Christoph Borchardt [Wed, 8 Apr 2015 17:25:28 +0000 (19:25 +0200)]
add icons to files sidebar, fix shade, fix position of settings icon and text

9 years agoMerge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
Vincent Petry [Wed, 8 Apr 2015 16:50:40 +0000 (18:50 +0200)]
Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled

don't throw exception if a file gets uploaded and encryption is disabled

9 years agoFix maintenance refresh interval
Morris Jobke [Wed, 8 Apr 2015 16:02:00 +0000 (18:02 +0200)]
Fix maintenance refresh interval

* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php

9 years agodon't throw exception if a file gets uploaded and encryption is disabled
Bjoern Schiessle [Wed, 8 Apr 2015 14:41:20 +0000 (16:41 +0200)]
don't throw exception if a file gets uploaded and encryption is disabled

9 years agoMerge pull request #15472 from owncloud/enc_backward_compatibility
Clark Tomlinson [Wed, 8 Apr 2015 13:38:27 +0000 (09:38 -0400)]
Merge pull request #15472 from owncloud/enc_backward_compatibility

make private key handling backward compatible

9 years agoMerge pull request #14987 from rullzer/ocs_password_fix2
Morris Jobke [Wed, 8 Apr 2015 12:44:17 +0000 (14:44 +0200)]
Merge pull request #14987 from rullzer/ocs_password_fix2

OCS Fixes to allow setting of password without removing additional settings

9 years agoMerge pull request #15469 from owncloud/fix/15463
Lukas Reschke [Wed, 8 Apr 2015 12:30:56 +0000 (14:30 +0200)]
Merge pull request #15469 from owncloud/fix/15463

Fix language level incompatibilties

9 years agoread cipher from key header and always write a key header if a new private key is...
Bjoern Schiessle [Wed, 8 Apr 2015 12:19:11 +0000 (14:19 +0200)]
read cipher from key header and always write a key header if a new private key is stored

9 years agoMerge pull request #15464 from owncloud/fixmasterunittests
Vincent Petry [Wed, 8 Apr 2015 12:24:42 +0000 (14:24 +0200)]
Merge pull request #15464 from owncloud/fixmasterunittests

Replace originalStorage in tests with a proper teardown

9 years agoFix language level incompatibilties
Lukas Reschke [Wed, 8 Apr 2015 11:55:10 +0000 (13:55 +0200)]
Fix language level incompatibilties

Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.

Fixed https://github.com/owncloud/core/issues/15463

9 years agoMerge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
Vincent Petry [Wed, 8 Apr 2015 11:29:49 +0000 (13:29 +0200)]
Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance

Disable OCS api when in maintenance mode

9 years agoDisable trashbin when testing orphaned shares deletion job
Vincent Petry [Wed, 8 Apr 2015 11:04:06 +0000 (13:04 +0200)]
Disable trashbin when testing orphaned shares deletion job

9 years agoMerge pull request #15443 from owncloud/encryption-user-hook-tests
Thomas Müller [Wed, 8 Apr 2015 10:56:18 +0000 (12:56 +0200)]
Merge pull request #15443 from owncloud/encryption-user-hook-tests

adding test for user hooks

9 years agoDisable OCS api when in maintenance mode
Joas Schilling [Wed, 8 Apr 2015 10:51:20 +0000 (12:51 +0200)]
Disable OCS api when in maintenance mode

9 years agoReplace originalStorage in tests with a proper teardown
Vincent Petry [Wed, 8 Apr 2015 10:03:55 +0000 (12:03 +0200)]
Replace originalStorage in tests with a proper teardown

The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.

9 years agoMerge pull request #15333 from owncloud/copy-cross-device
Morris Jobke [Wed, 8 Apr 2015 10:35:15 +0000 (12:35 +0200)]
Merge pull request #15333 from owncloud/copy-cross-device

fix copying folder across devices

9 years agoAdded FIXME about registering jobs in apps.php
Vincent Petry [Wed, 8 Apr 2015 10:09:42 +0000 (12:09 +0200)]
Added FIXME about registering jobs in apps.php

9 years agoFixing issue #15322 - showing Settings button next to gear icon
James Anslow [Thu, 2 Apr 2015 20:19:25 +0000 (21:19 +0100)]
Fixing issue #15322 - showing Settings button next to gear icon

9 years agoMerge pull request #15453 from owncloud/enc2_fix
Morris Jobke [Wed, 8 Apr 2015 09:10:00 +0000 (11:10 +0200)]
Merge pull request #15453 from owncloud/enc2_fix

fix function call

9 years agoDelete orphaned shares in a background job
Vincent Petry [Tue, 3 Mar 2015 16:29:12 +0000 (17:29 +0100)]
Delete orphaned shares in a background job

9 years agofix function call
Bjoern Schiessle [Wed, 8 Apr 2015 07:29:35 +0000 (09:29 +0200)]
fix function call

9 years agoAdding check command to validate server environment - fixes #15429
Thomas Müller [Tue, 7 Apr 2015 22:19:23 +0000 (00:19 +0200)]
Adding check command to validate server environment - fixes #15429

9 years agoMerge pull request #14879 from oparoz/fix-preview-caching
Morris Jobke [Tue, 7 Apr 2015 16:16:24 +0000 (18:16 +0200)]
Merge pull request #14879 from oparoz/fix-preview-caching

Introducing the maximum size preview

9 years agoadding test for user hooks
Clark Tomlinson [Tue, 7 Apr 2015 15:49:45 +0000 (11:49 -0400)]
adding test for user hooks

9 years agoMerge pull request #15441 from owncloud/fix-file-headers-master
Morris Jobke [Tue, 7 Apr 2015 15:15:17 +0000 (17:15 +0200)]
Merge pull request #15441 from owncloud/fix-file-headers-master

fixing license headers - encryption code related

9 years agofixing license headers - encryption code related
Thomas Müller [Tue, 7 Apr 2015 15:02:49 +0000 (17:02 +0200)]
fixing license headers - encryption code related

9 years agoMerge pull request #14472 from owncloud/feature/wipencryptionapp
Thomas Müller [Tue, 7 Apr 2015 14:46:45 +0000 (16:46 +0200)]
Merge pull request #14472 from owncloud/feature/wipencryptionapp

encryption 2.0 app

9 years ago Introducing the maximum size preview
Olivier Paroz [Tue, 7 Apr 2015 14:45:16 +0000 (16:45 +0200)]
 Introducing the maximum size preview
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.

One of the fixes required for #12465

9 years agofixing unit test - expected value change due to different size being stored in cache...
Thomas Müller [Tue, 7 Apr 2015 12:30:01 +0000 (14:30 +0200)]
fixing unit test - expected value change due to different size being stored in cache table

9 years agoMerge pull request #15431 from owncloud/displayname-width
Morris Jobke [Tue, 7 Apr 2015 12:24:01 +0000 (14:24 +0200)]
Merge pull request #15431 from owncloud/displayname-width

widen displayName input field