[Pkg-owncloud-commits] [owncloud] annotated tag v6.0.0alpha2 created (now 02f39c0)

David Prévot taffit at alioth.debian.org
Fri Nov 8 23:17:03 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a change to annotated tag v6.0.0alpha2
in repository owncloud.

        at  02f39c0   (tag)
   tagging  d9972fae62493cb68a9ba1cb47752ec4009029ec (commit)
  replaces  v5.0.0RC3
 tagged by  Frank Karlitschek
        on  Wed Oct 16 10:57:01 2013 +0200

- Log -----------------------------------------------------------------
6.0.0alpha2

Alessandro Cosentino (4):
      small typo in the comments
      text centered horizontally and vertically in emptycontent div
      rename emptyfolder to emptycontent
      followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation

Alexander Bogdanov (1):
      Fixing owncloud/core#4301

Andreas Fischer (63):
      phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
      PHPUnit: Allow developers to use their own custom phpunit.xml file.
      PHPUnit: Add tests/phpunit.xml to gitignore.
      gitignore: Fix typo + adjust comment format.
      gitignore: Make paths relative to repository root.
      Merge pull request #3947 from runky/patch-1
      Merge pull request #4156 from owncloud/fix_oc_image_reference
      Add verbose to autotest phpunit, so we see skipped and incomplete tests.
      Merge pull request #3887 from owncloud/apc_user_cache
      app migrate: Use = instead of LIKE as described in the comment above.
      Merge pull request #4246 from owncloud/speedup-autotest-master
      Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
      Check expected type after JSON decode instead of checking what is not expected.
      Do not repeat definition of $target.
      Do not repeat JSON success code.
      Adjust JSON code to stable5.
      Use multiple lines for the JSON data array.
      Do not pass numeric strings to strtotime() when formatting dates.
      Changing elseif statement to what the PEAR coding guidelines say.
      Add datetime test for numeric string.
      Merge pull request #4393 from owncloud/fix_4326
      Fix spacing of all touched lines.
      Add trailing comma for all touched array lines.
      Use boolean casting for bitwise and result.
      Do not use realpath() on includes.
      Also remove other unnecessary realpath() calls.
      Use __DIR__ instead of dirname(__FILE__).
      Merge pull request #4472 from owncloud/remove-disconnect
      Test whether an expired user share is still accessible.
      Test whether a still-valid user share is still accessible.
      Try to make Oracle happy by also specifying seconds.
      Make dates test class properties.
      Do not repeat shareUserOneTestFileWithUserTwo() code.
      Expiration tests for sharing with groups.
      Coding style: { for methods start are supposed to be on the same line.
      Add comment explaining how $dateInFuture was picked.
      Create instance of Doctrine\Common\EventManager() in OC_DB.
      Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.
      Add database tests for INSERT/SELECT date format.
      Compare objects directly. Also use $expected and $actual.
      Calculate dateInPast and dateInFuture.
      Tests whether expired/valid link share is still accessible.
      Perform expiration date checking before returning share data for token.
      Use update() instead of put().
      Only update the etag. Do not re-submit any other unchanged data.
      Do not convert boolean to integer in tests. put() already does this.
      Move bool to int conversion to buildParts(), so it also happens for update().
      Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
      Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
      Merge pull request #4856 from owncloud/fix-link-expiration
      Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
      phpunit.xml: Port code coverage excludes from autotest to dist.
      Merge pull request #4966 from owncloud/text_preview_blacklist
      Also replace ApacheBackend with Authentication\IApacheBackend in user.
      Move backend finding into its own method.
      Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
      Test_User_Backend::getUser() does not return an array, it returns a string.
      Use parent:: in Test_User_Database::getUser().
      Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
      Adjust return value tests for checkPassword() to what OC_User_Example says.
      Use strict comparison === instead of ==.
      Merge pull request #5032 from owncloud/fixing-5006-master
      Fix logout link HTML.

Andreas Schönebeck (1):
      Filter display of blacklisted files

AndreasErgenzinger (3):
      merge translations with those from theme
      merge translations with those from theme
      additional safety checks

Arthur Schiwon (101):
      Offer download of whole shared dir only if it does not exceed zip input limit
      fix foldersize check to validate zip input size
      remove remaining br-tags that do not belong here
      LDAP: fancy version for release, no code change
      LDAP: compatibility with Novell eDirectory UUID
      LDAP: specify appid when selecting from appconfig
      LDAP: remove unnecessary func call, was a leftover from earlier refactor
      LDAP: check first whether group exists in this backend before doing other operations
      LDAP: check whether user exists for before trying to determine displayname
      LDAP: avoid irritating log output
      LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup.
      LDAP: fix wrong return value
      Users: use DisplayName in the Display Name col when appending users
      Files External: show display names instead of internal user names in Settings UI
      Fix lost ETag on Cache Upgrade
      Performance: prepare queries only once
      Upgrade FileCache on ownCloud upgrade for all users with files
      Remove Debug output
      Change LIMIT in DB query respectively remove where not necessary
      Port OC_Property Table Index
      Adjust to Icewind's fix
      Add PHPDoc
      Only prepare an SQL statement once.
      Cache: Do not overwrite ETag when file did not change
      Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
      Share Dialog: show Displayname instead of internal name
      Whitespaces
      Key must use less then 767 bytes long
      port 22c8194cc8fde88957dbc8c6d9e253fac3c637bb
      Typo, fixes #2690
      PostreSQL compatibility, fixes #2666
      allow Storages to join MountPoint initialization
      Make FileCache upgrade more robust, fixes #2650
      LDAP: reset user/group-config association only after exists-check, may performance in some cases
      Fix retrieval of users with multiple backends
      LDAP: remove restriction from group names to be in line with core behaviour again
      LDAP: cachekey in set method needs to match with that one from get
      LDAP: do not reset UUID attribute setting when guid is detected
      LDAP: Coypright info
      LDAP: prepare settings for internal username attribute and clearing user mappings
      LDAP: add settings for UUID override
      LDAP: implement r+w for new settings
      LDAP: better variable name
      LDAP: implement UUID and internal username override
      LDAP: Implement clear mappings functionality
      LDAP: fix display of numerical display names
      Merge branch 'master' into ldap_configurable_username_n_uuid
      LDAP: fix handling when LDAP Host is offline
      LDAP: fix possible recursion
      LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
      LDAP: fix setting value of checkbox after loading configuration
      LDAP: sqlite compatibility for emptyiing tables
      Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
      Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location
      LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
      Users page: username instead of login name as col header to avoid confusion with other backends
      LDAP: even better check for emptiness, fixes #3815
      non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.
      Add message about completed update
      LDAP: fix background job, resolves #3528
      LDAP: right align labels on settings page
      LDAP: move small info text strings into tooltips
      LDAP: slightly smaller input fields
      LDAP: Show Host name in configuration drop down
      LDAP: Update Host in configuration chooser on Save
      LDAP: only connect to LDAP once on login
      LDAP: use memcache if available
      return only existing users in group
      no assoc index here, makes tests pass again
      LDAP: fix wrong hook name
      Sharing: only determine path root if owner is available
      consolidate validity check for users in group class
      LDAP: case insensitive replace for more robustness
      Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
      Use Group methods for searching, fixes #4201
      Always check variable type before using readdir to avoid surprises
      more is_resource checks before readdir
      User: move checkPassword from User to Manager to not break API
      === not ==
      Fix return value from User object to User ID
      Fix doc
      Adjust Tests and satisfy them
      manager checkPassword now returns User object, adjust internal user class accordingly.
      Missing Test for the previous commit
      Resolve merge conflict
      LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
      LDAP: move is_resource check to ldap wrapper to make it mockable
      LDAP: establish wrapper interface to allow proper mocking
      LDAP: add phpdoc
      LDAP: use wrapper,  not direct function call
      LDAP: don't check var type when you can specify the type in the parameter list
      Whitespaces
      LDAP: make Access be a dependency to the user and group backend instead of inheriting it.
      LDAP: get rid of some PHP Warnings
      LDAP: simple tests for the user backend
      LDAP: coding style
      LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors
      added user_ldap tests via public api calls
      give test file a proper name
      remove outdated (thus failing) and anyway insufficient group tests - for now
      LDAP: allow different UUID attributes for groups and users

Axel Roenn (4):
      On an auth failure the uid and the IP address should be logged to the standard log file.
      Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now.
      Added the config option to log ip addresses , default false
      changed the argument to false for getValue , reformated else statement

Bart Visscher (260):
      Add doctrine-common and doctrine-dbal
      Basic support for Doctrine\DBAL
      Use Doctrine for schema changes
      Don't test the schema export for now, first decide which format we are going to use
      Add MDB2 compatible database schema writer
      Remove other database implementations from OC_DB
      Merge branch 'master' into doctrine
      Change to use 3rdparty version
      Merge branch 'master' into doctrine
      Codestyle cleanup
      Change PDO Exceptions to Doctrine Exceptions
      Remove MDB2 sqlite3 driver
      Just use rawurlencode in files list template
      Merge branch 'master' into doctrine
      Fix mssql connection parameters and correct driver for pgsql
      Merge branch 'master' into doctrine
      Point 3rdparty submodule to the doctrine branch
      Change var_dumps to exceptions
      Use the correct property for connection object
      Rewrite query for numRows function for SELECT queries
      Fix handling of empty defaults in schema
      Quote index columns that need it
      Also fix sequences in schemachange
      integer length 1 is not only used for boolean values
      Merge pull request #2585 from mrtorrent/fix_install_app_version_check
      Merge pull request #2707 from owncloud/remove_brainfucked_method
      Merge pull request #2706 from owncloud/random_is_random_and_not_time
      Merge pull request #2708 from owncloud/dont_expose_installatio
      Merge pull request #2611 from owncloud/filename-width
      Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common
      Use count SQL to check for user existance
      Merge pull request #2750 from Kondou-ger/fix_2693
      Use the MDB2 function to get the count result
      Merge pull request #2738 from Kondou-ger/fix_alert_issues
      Remove wrong limit parameter from count query in compatibility function
      Merge pull request #2610 from owncloud/vcategories_purge_multi
      Merge pull request #2759 from owncloud/fix-2718
      Merge pull request #1974 from owncloud/use-rawurlencode
      Merge pull request #2279 from owncloud/refactor_upload_js
      Add mimetype filter to getDirectoryContent function
      Suppress the notice from the nullbyte check
      Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
      Merge pull request #2887 from owncloud/l10n-caching
      Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
      Don't use empty session.cookie_path, otherwise we get multiple cookies
      Cleaner isWebDAVWorking reason, otherwise people overlook the reason
      No need to strip slashes, json_decode handles that for us
      Fix displaying spinner on delete
      Merge pull request #3024 from owncloud/file-delete-action
      Test if we want a 3rdparty style/script before checking the 3rdparty root
      Merge pull request #3020 from owncloud/cleaner-webdav-reason
      Merge pull request #3019 from owncloud/fix-3004
      Merge pull request #3082 from owncloud/ldap_confcache_opt
      Merge pull request #3094 from owncloud/log-ajax
      Merge branch 'master' into doctrine
      Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
      Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
      Simplify app css locating for layout pages
      Simplify app js locating for layout pages
      Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen
      Merge pull request #2955 from owncloud/displaynames-numeric
      Merge pull request #3028 from owncloud/simplyfy-resource-locating
      Merge pull request #3026 from owncloud/cli-no-session
      Merge pull request #3002 from owncloud/priorize_common_languages
      web_server_restart needs to be true to display the hint
      Add check for Magic Quotes
      Merge pull request #2491 from riso/xsendfile_fix_zip
      Merge pull request #2972 from AndreasErgenzinger/master
      Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages
      Merge pull request #3222 from owncloud/fix-3218
      Merge pull request #3229 from owncloud/fix_3210
      Merge pull request #3230 from owncloud/fix_ldap_cachekey
      Use supplied tablename
      Move start of the maintenance mode to the ajax call
      Connect watcher failure function to the failure signal
      Also check for needed upgrade in the Sabre Maintenance connector
      Merge pull request #3120 from owncloud/ocs_properties
      Merge pull request #2813 from owncloud/improve-lib-check
      Convert OC_Config to object interface
      Fix returns of values in OCP\Config
      Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
      Merge pull request #3272 from owncloud/legacy-autoloader
      Remove include for loading legacy class
      camelCase class properties
      Implement OC\Log as proxy to OC_Log
      Fix OC\Log with OC_Log in wrong namespace
      Remove include for loading legacy class
      Code style
      Use the constants from OC_Log
      Remove default return hint
      Add classes replaced by the public api to the code checker
      Merge branch 'master' into doctrine
      Merge branch 'doctrine' of git://github.com/owncloud/core into doctrine
      Merge branch 'master' into doctrine
      Fix not null with empty default
      Skip Test_Archive_TAR in php 5.5 for now
      Fixes connecting to Oracle without port set
      UNIX_TIMESTAMP replace for Oracle
      OCI doesn't have a queryString
      Use Doctrines Oracle sequence suffix
      Fix tableExists test function for Oracle
      Quote tablenames
      Fix table change tests for OCI
      Doctrine only returns false
      numRows doesn't work with Oracle
      Always quote db identifiers in OC_DB_MDB2SchemaReader
      Change nullable of filecache.etag and permissions.user
      Use Doctrine platform to add limit and offset to query
      View test needs a dummy user
      Oracle doesn't know & as bitwise AND
      Merge branch 'master' into convert-oc_config
      Make the object drive the logging backend
      Fix stupid namespace separator
      Fix review points
      Use file_exists to fix the unittests
      Revert "Can't determine if debug mode is defined until we read the config"
      Set debugMode after reading the config file
      Fix usage of non existent consts
      Skip Test_Archive_TAR in php 5.5 for now
      Remove deadcode
      Move DoctrineStatementWrapper to its own file
      Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
      Merge pull request #3865 from owncloud/fix_test_for_oracle
      Oracle doesn't know & as bitwise AND
      Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
      Allow setting defaults and requirements for the api route
      Use raw PathInfo for matching urls
      Going from text to clob is not something we do.
      Check if the app is enabled and the app path is found before trying to load the script file
      update to !==
      Merge pull request #1044 from owncloud/fix_extra_slash
      Merge pull request #3268 from owncloud/convert-oc_log
      Merge pull request #3635 from owncloud/storage-wrapper
      Merge pull request #3688 from roha4000/fix_upload_max_filesize
      Merge pull request #2914 from Kondou-ger/label_overlapping_value
      Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
      Split database specific install/setup code to their own class
      Convert database setup code to objects
      Change database creation to use array to select db setup class
      Use db setup class for option validation
      Remove unsued parameter
      Fix OCI setupDatabase parameter
      Fix found errors
      Fix review items
      Merge pull request #3888 from owncloud/ocs_api_fixes
      Merge branch 'master' into convert-oc_config
      Make buildNotExistingFileName testable and write unittests
      Fix renaming using parenthesis
      Merge pull request #3948 from owncloud/fixing-3934-master
      Move error handlers from OC_Log to OC\Log\ErrorHandler
      Add comment to column definition
      Only change integer type when the length is set
      Merge branch 'master' into convert-oc_config
      Add constructor documentation
      Check if logger is set, also no need to return true
      stupid namespace
      Merge branch 'master' into doctrine
      Merge pull request #3962 from owncloud/move-error-handlers
      Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
      Use autoloader for Patchwork/PHP/Shim/Normalizer
      Cleanup error generation in base.php
      Early errors (in base.php) don't have session available
      Display the exception error backtrace preformatted
      Tweaks to the MDB2SchemaReader
      Merge pull request #2221 from owncloud/doctrine
      Add OC_Image to public api
      Add OC_L10N to public api
      Correct casing of OC_User and pass through the params to getUsers
      Result of && if not the part
      Merge pull request #3880 from owncloud/code-checker
      Merge pull request #4092 from owncloud/base-better-errors
      Merge pull request #4131 from owncloud/scanner-split
      Split locating JS and CSS files to their own class
      Move template functions to there own file
      Move basic template functions to their own class
      Change to use !== and ===
      Change exit calls to throwing an exception
      DRY use OC_Template::printErrorPage
      In debug mode uncaught exceptions should display a nice page
      Only display call trace in debug mode
      Only close db connection when disconnecting, keep the connection object
      Create DB Connection wrapper and DB\Adapter* classes
      Move db prefix handling to Connection wrapper
      Move lastInsertId to adapter classes
      Move prepared query cache handling to Connection wrapper
      Move limit/offset handling to Connection wrapper
      Move query statement fixup handling to Connection wrapper
      Move insertIfNotExist to Connection wrapper
      Simplify OC_DB transaction functions
      Use $connection for schema changes
      Cleanup: remove code for multiple database backends
      Group database connection and schema function
      Move building error string to connection
      Correct namespace of OC_ classes
      Fix errors from unit tests
      Fixed review issues
      Revert "fix failing master branch - Test_Config::testWriteData"
      ignore config read failures
      Add documentation to OC\DB\adapter class
      Merge pull request #3392 from owncloud/googledrive
      Fix lastInsertId for OCI8 adapter
      Fix group id naming fid->gid
      Add ACPu memory cache
      Merge pull request #4093 from owncloud/storage-test-cleanup
      Make DB connection available to use for dependency injection
      Change OC_DB_Schema to use DI for db connection object
      Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager
      Use console.php entry point for file scanning from console
      Use function to create schema manager
      Simplify OC_DB transaction functions
      Merge pull request #4283 from owncloud/add_ocimage_unittest
      Merge pull request #4291 from owncloud/schema
      Style fixes
      Move query processing after the check for prepared statement cache
      Fix stupid bug
      More style fixes
      Remove disconnect function from OC_DB
      Compare result are already true/false
      Merge pull request #4486 from owncloud/ldap_adjust_cache
      Merge pull request #4483 from owncloud/compare-true-false
      Merge pull request #4292 from owncloud/add_appconfig_unittest
      Merge pull request #3891 from owncloud/fix_loadAppScriptFile
      Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
      Very simple log rotation
      Review fixes
      Add description to log rotate class
      Check for installed state before registering the logrotate background job
      Only enable logrotate when configured. Also rotate size is settable.
      Use more object oriented way for console commands
      Change Files Scan command to use OC\User\Manager
      Cleanup and more style fixes
      Use the namespaced variation of the classname.
      Merge pull request #4704 from owncloud/rename-lostpassword-controller
      Merge pull request #4788 from owncloud/fixin-irods-session-master
      Use appinfo/register_command.php to add commands to the console command
      Check all installed apps for console commands
      Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
      Merge pull request #4745 from owncloud/split_personal-user_passwordchange
      Convert OC_Preference to object interface
      Add missing static
      Add missing return true statements to legacy preferences functions
      Fix insert/update/delete helper functions for oracle
      update inherit docs comment
      Add copyright, remove starting blank line
      Merge pull request #4908 from owncloud/fix_css_selector
      Merge pull request #4684 from owncloud/improved-console
      Add UserSession to server container
      Add DBConnection to server container
      Add Navigation class to server container
      Add Config container class to server container
      Fix the apps enabling/disabling in settings
      Add missing implements and fix parameters in IConfig
      Merge pull request #4623 from owncloud/convert-oc_preferences
      Merge pull request #5068 from owncloud/improved_request
      Add L10N interface to server container
      OC_Defaults is only used in error reporting
      Add Helper and URLGenerator interfaces to server container
      passesCSRFCheck added to OCP\IRequest
      Remove the exception catch, this should be handled by a higher layer
      Merge pull request #4796 from owncloud/config-no-catch

Bastien Ho (2):
      Fix inexisting trashbin's sub-folders
      duplicate verification

Bernhard Posselt (84):
      added app stylings to core
      small fixes
      also make bottom border grey on first level hover
      Update share.js
      Merge pull request #2236 from owncloud/fix-migration
      Merge pull request #2184 from tripflex/master
      Merge pull request #1786 from owncloud/shared-folder-etags
      Merge pull request #2218 from owncloud/fix-mounting-all
      Merge pull request #2183 from owncloud/fix-shared-statuses-again
      Merge pull request #2277 from owncloud/fix_sharing_hooks
      Merge pull request #2318 from owncloud/unkown-freespace
      Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files
      Merge pull request #2383 from owncloud/error-handling-upgrade
      Merge pull request #2380 from henningoschwald/76bb5221c7a1b71f0d617c55e844c51e889a2c70
      added %webroot% instead of relative path
      Merge pull request #2363 from owncloud/uploadsize
      Merge pull request #2434 from owncloud/userlist_no_dupes
      Merge pull request #2433 from owncloud/db_primary_keys
      Merge pull request #2440 from owncloud/js_version_parameter
      Merge pull request #2451 from owncloud/fix_npe_master
      Merge pull request #2244 from owncloud/fixing-windows-datadir-master
      added app stylings to core
      small fixes
      also make bottom border grey on first level hover
      added %webroot% instead of relative path
      merged
      Merge pull request #2446 from owncloud/fixing-safe-mode-check-master
      Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
      Merge pull request #2568 from itheiss/master
      Merge pull request #2448 from owncloud/userlist_available_groups
      Merge pull request #2597 from kabum/lesslog
      Merge pull request #2584 from mrtorrent/fix_instanceid_format
      Merge pull request #2516 from kabum/master
      Merge pull request #2622 from Kondou-ger/add_missing_backticks
      Merge pull request #2620 from eMerzh/add_query_logs
      Merge pull request #2651 from owncloud/print_unescaped-u
      Merge pull request #2694 from owncloud/fix_2690
      Merge pull request #2800 from owncloud/fixing-2743-master
      Merge pull request #2798 from owncloud/fixing-2789-master
      Merge pull request #2764 from owncloud/remove-limit-from-count-query
      added yet another test for the verion compare check due to mail
      used oc version 5.0.3
      Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
      Merge pull request #2754 from owncloud/cookie-path
      Merge pull request #2697 from owncloud/button-css-fixes
      added correct check for gd and check for php-intl
      Merge pull request #2801 from OpenLarry/patch-1
      Merge pull request #2819 from Kondou-ger/fix_2730
      Merge pull request #2851 from owncloud/added-user-quota
      Merge pull request #2850 from owncloud/touch-newfile
      Merge pull request #2781 from owncloud/fix-2592
      Merge pull request #2853 from owncloud/long-file-names
      Merge pull request #2554 from owncloud/hide-toggle-checkbox
      Merge pull request #2874 from owncloud/proper-font-stack
      dont overwrite background image when hovering over button
      Merge pull request #2910 from owncloud/password-toggle-db-2
      also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly
      Merge pull request #2934 from owncloud/shorten_css_colorcodes
      Merge pull request #2953 from jerrac/emailsavetimeout
      use date and time instead of timestamp
      fix admin log display and use a more readable format
      also adjust template properly for log date fix
      Merge pull request #2978 from owncloud/displayname_can_be_null
      Merge pull request #2986 from eMerzh/upgrade_warn
      Merge pull request #3078 from owncloud/files-dnd
      Merge pull request #3073 from owncloud/setup-error-message
      Merge pull request #3074 from owncloud/sqlite3-raiseerror
      Merge pull request #3080 from owncloud/validate_redirect_mast
      check if there is a default/ folder in the theme directory if no theme exists
      use  variable instead of relative path to file
      use utf-8 encoding for json
      fix bug that would only return error responses for 3rdparty apps
      logout before output to not run into header already sent problems
      respect format output
      Merge pull request #3329 from owncloud/increase_lock_timeout
      Merge pull request #3399 from owncloud/fix_js_for_ie
      make log date configurable, default to iso 8601
      Merge pull request #4671 from owncloud/emptycontent
      center utils
      Merge pull request #4477 from owncloud/hooks-view
      use lineheight instead of padding and height
      Merge pull request #4506 from owncloud/oc_avatars
      Merge pull request #4871 from owncloud/add_exists_method_to_jquery
      Merge pull request #5144 from owncloud/public_middleware

Birk Borkason (1):
      Fix indentation in util.php.

Bjoern Schiessle (209):
      working decrypt files method
      remove whitespaces
      improved error handling
      use path relative to data/
      only write keyfiles if it was a new file, otherwise nothing changed
      check if app is enabled
      encrypt/decrypt file versions
      only show decrypt all files option if encrypted files are available
      added missing isEmpty ajax file
      adapt unit tests to the modified stream wrapper
      remove unused method, the right one is in util.php
      handle error if we can't handle the given path
      don't create empty versions
      we need to use the path relative to data/
      fixing some unit tests
      fix searchUsers() call in group.php
      this test works locally, let's see what out build server says...
      this hopefully fixes testRecoveryForUser(), works locally
      use OC\Files\View to read encrypted file, so that it also works with external storages
      don't know why it works locally but not on the build server... let's keep it out for the moment
      cancel sharing if some users doesn't have a working encryption set-up.
      fix test and make warning translatable
      make methods private which are not used from outside
      catch broken server config and disable encryption app.
      also write error message to the log
      improved error message to refect openSSL PHP extension and stock openSSL configuration issues
      more error messages which might be useful for the user to debug his server config
      oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
      adapt tests to the changes in crypt.php
      remove todo item
      fix function call for searUsers()
      remove old comments, TODos, etc.
      Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
      fix array declaration
      preserve mtime if file gets encrypted/decrypted
      change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
      check if some encrypted files are left after the app was disabled and warn the user
      provide correct path for require_once
      throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files
      use __DIR__ instead of realpath
      use OC files API to create missing directory which should handle special chars in every environment correctly
      also create root dir if it doesn't exist yet
      remove whitespaces and some leftover code from testing
      increase width of versions dialog
      first check if file exists before checking the files size
      Merge branch 'master' into decrypt_files_again
      added createMissingDirectories() method
      added missing parameter documentation
      switched to dirname()
      don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
      revert changes to 3rdparty submodule reference
      the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
      also move empty folders to the trash bin as discussed here #4590
      improved error messaging, initial commit
      enable user to inform recipients about a shared file by mail
      return mailSend status in getItems()
      some clean-up
      set sendMail status back to false
      don't send mail to the user who shared the file
      add expiration date if it is already set
      encryption error messages, distinguish between a re-enabled encryption app and a password change from outside
      improved documentation of the methods
      error.php no longer needed
      Merge branch 'master' into encryption_improved_error_messages_4617
      Merge branch 'master' into sharing_mail_notification_master
      fix db queries
      fix db queries
      revert submodule reference changes
      use css class hidden to hide setting elements
      make sure that initial encryption also starts for a fresh installation
      coding-style fixes
      check if stream wrapper is already registered to avoid warning
      initial commit, start implementing the ocs share api
      intermediate results, share api
      Merge branch 'master' into sharing_mail_notification_master
      intermediate result ocs api
      re-added error.php
      no longer enforce log out, but provide useful errors/warnings instead
      remove test code
      some more OCS calls for sharing
      handle part files correctly
      first check if a extension exists before comparing it
      check shares for the real file and not for the .part file
      fix part file handling and real size calculation, this should also solve #4581
      if the files doesn't exist yet we start with the parent to search for shares
      coding style fixes
      remove error logs
      remove some error_logs
      remove some more debug output
      Merge branch 'master' into sharing_mail_notification_master
      Merge branch 'master' into encryption_improved_error_messages_4617
      ocs api for file sharing
      allow to set a different permission during initial share operation
      return error if public upload is disabled
      more rest-style API
      use share ID as REST resource
      performance improvement, check configuration only if no private key exists
      check only permission from link-share to decide if public upload is enabled or disabled
      we can leave the loop if the permission of the link share was checked
      remove debug output
      only remember password if the user changes the permissions, otherwise the user disabled the password protection
      let user repeat the recovery key password to prevent typos
      remove debug output
      remove spaces
      return error if wrong shareType is given
      some unit test for the new ocs share api
      remove some unused variables
      extend API to get the shares from all files in a given folder
      set share id to 'unknown' if we can't retrive one
      disable encryption app for share API tests
      check if encryption app is enabled
      disable encrpytion app before performing tests
      make sure that files are shared correctly before each test and unshared again after the test
      make sure that both $permissions and $oldPermissions have the same type
      calculate correct permissions while toggle the password protection
      initialize variable
      Merge branch 'master' into encryption_improved_error_messages_4617
      revert changes to 3rdparty submodule
      Merge branch 'master' into sharing_mail_notification_master
      remove debug output
      revert broken 3rdparty reference
      don't remember login if the encrypion app is enabled because the user
      introduce OC_Util::rememberLoginAllowed()
      some small js fixes
      some small fixes
      fix PHPDoc
      use template for txt and html mails to send notification mails
      set default value for expire parameter
      use OC_DB::executeAudited
      use OC_DB::executeAudited
      add some additional assertions to the tests
      check if key exists before reading it
      fix check if app is enabled
      check if key exists before reading it
      fix check if app is enabled
      Merge branch 'master' into ocs_share_api
      check if encryption app is enabled before trying to calculate file size
      check every enabled app if the remember login feature needs to be disabled
      set rememberlogin to false for the encryption app
      check not only if the keyfile folder exists but also if it contains keyfiles
      add test getShareFromId
      add some comments
      go back to old template but add expire date as optional content
      mail is already themable via the template, no need to provide additional string in OC_Defaults
      Make sure that testDeleteShare() has some shares to delete
      add getShareFromFolder() test
      add testUpdateShareUpload()
      also return success if no shares are found.
      fix mail subject; don't show time for expire date
      grammar fixes
      Merge branch 'master' into encryption_improved_error_messages_4617
      revert changes in personal template
      Merge branch 'master' into sharing_mail_notification_master
      remove deleted shares from the database table oc_share
      add previews to versions dialog
      trash bin button needs to be an input field
      maxX and maxY should be a integer
      we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
      fix hidden fieled name
      use always path as parameter to specify a file/folder
      use true/false instead of yes/no for publicUpload and subfiles parameter
      fix array_diff call
      Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master
      Merge branch 'master' into sharing_mail_notification_master
      update tests
      remove hover effect from preview image
      add comments
      increase version number to trigger db update
      clean up oc_share table from files which are no longer exists
      Merge branch 'master' into remove_deleted_shares_from_db
      catch exception if db query execution fails
      let admin specify timezone for log file entries
      If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder
      updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
      part file needs to have .part extension
      make sure that we only remove file/folder shares
      find users which are in the same group
      catch unknown timezone and fall-back to UTC
      changed default time format to ISO8601
      fix trashbin layout
      fix delete/restore individual files
      fix group delete/restore
      fix indention
      fix checkbox
      only encrypt file to users with encryption keys
      update file summary after group delete/restore
      make sure that we only find file/folder shares
      make sure that we are logged in ad user1 while performing the tests
      don't use glob() and getLocalFile(), this can lead to problems on windows servers
      add missing preview link
      don't cache if the encryption is enabled, this can lead to problems during unit testing
      fix getVersions() for sub directories
      make previews work for shared files in the versions drop-down
      add "received_from" and "received_from_displayname" field in case of a reshared file to the output
      some small changes/fixes
      make files versions root a class constant
      fix api tests
      some small fixes
      block file access if share keys are missing
      fix typo in error message and change error code to 403
      change error code to 403
      fix another typo
      fix setting dialog headlines for the encryption app
      Merge branch 'master' into versioning_preview_shared
      remove debug output
      check if we are writing to user/files, otherwise skip encryption
      avatars should also work with encryption after pr #5332 was merged
      test should work now
      Merge branch 'master' into avater_with_encryption

Björn Schießle (337):
      added some TODOs
      - moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
      unshare all should work the same like unshare single users
      go back to preUnshare hooks since sharing doesn't trigger post unshare hooks
      take group shares into account if we retrieve the list a all recipients
      use right location of the file is the source and not the target it is shared to
      also find users with access to the file if a folder above the actual file was already shared
      add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
      add post_unshare hook, also add public link shares to the list of user with access to a file
      add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
      create keypair for ownCloud with empty passphrase, will be used for public link shares
      remove debug output, fix typo in file names
      remove todo, it is already solved
      remove debug output
      isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
      the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely
      make sure that home folders are mounted correctly before write/read keyfile
      define key size in constructor, otherwise the key size will depend on the servers openssl conf
      make sure that $this->userId is initialized before using it as a parameter
      use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
      not only files can be reshared but also folders
      don't add share action to the Shared folder
      let public link download handle json encoded file lists
      only prevent shared action for the Shared folder in the root dir
      we need to listen to the pre delete hook, otherwise the file is already gone
      Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
      use display name as sender for private link mails, approved in #2294
      replace \MDB with \OC_DB, approved in #2278
      create new version if the same file is uploaded again over the web interface
      fix var name
      fix var name
      use html video tag to preview videos for public shares
      Merge pull request #2336 from eMerzh/fix_trashpg
      add backtick for db queries to prevent postgresql errors
      remove backticks around table names
      add some error logs to the trash bin app
      Merge pull request #2324 from owncloud/html_video_tag
      add backticks around table names
      skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares
      fix indention
      the old path no longer exists after rename, update the parent folder instead
      listen to touch hook to update the mtime after sync
      Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
      new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir)
      always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later
      get shared keys from new location
      move getUidAndFilename() tu util.php
      get the correct paths and owner to access shared files
      delete share keys if file gets deleted
      also delete share keys if a different user than the owner deletes a shared file
      reuse function provided in util.php
      check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete
      Merge pull request #2797 from owncloud/fixing-2792-master
      only add filesize to trashbin size if the file was moved to the trash bin successfully
      size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage.
      add $view as parameter for session constructor
      add $view as parameter for getFileKey() call
      Session expect OC_FilesystemView()
      make sure that public-keys dir exists
      remove used space for versions from db is a user was deleted
      cleanup the trash bin tables in the database after a user was deleted
      fix stream wrapper to make initial encryption work
      fix some confusion about paths relative to the files dir and to the data dir
      fix some more paths
      write a info message to the log if a file gets removed from the trash bin automatically
      add explenation of the expire function to the apps description
      improved free space calculation if no quota is set, discussed in #2936
      adapt free space calculation to the way it is done for the trash bin
      return filename relative to users file dir and not relative to data dir
      always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
      remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles
      fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
      rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
      we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
      some fixes to the keymanager class to identify the file owner and the owner path correctly.
      necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() (fe58e4b1a6a0f3b63afe74690986493facdad2c4)
      Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
      getUsersSharingFile() no longer needed, use  getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
      make sure that all share keys get deleted if a file/folder gets unshared from a user/group
      fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
      removed some leftover code; use already existing var for path to users file folder
      the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared
      check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
      fix comment, remove unused variable
      fix encryption to owncloud user for public link shares
      delete all share keys if a file gets deleted
      move encryption keys to trash bin
      restore encryption keys from trash bin (development snapshot)
      get original path in case of shared files
      get original path in case of shared files when restoring file from trash bin
      disable proxys before copying files to the trash bin
      remove encryption keys if a file gets deleted permanently
      make sure to find the correct path for shared files
      allow to set quota to zero, issue #2696
      fix inconsistent post parameters in change password operation
      touch file relative to users file folder, otherwise the hooks will be ignored
      update etag for for the touched file
      rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
      don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
      touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly
      Merge branch 'master' into update_etags_on_restore
      use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
      generate random key name for share key to avoid name conflicts
      if file was shared to user than userIds is just the users Id
      don't create a recovery user, only generate recovery key similar to the public link share key
      don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
      fix history template, print_unescaped() needs to include closing tags
      only let the user change the recovery admin settings if a key passwords was entered.
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      check if the user knows the correct recovery password before changing the recovery key settings
      enable admin to change the recovery password
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      added missing file to enable the admin to change the recovery key password
      add recovery key to all files if the user enabled the feature and removes them again on disable
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      allow admin to recover users files in case of password lost
      some error handling in case the recovery password is wrong
      show nicer warning if the admin recovery password was wrong
      add pre-shared hooks
      upgrade from old encryption to the new one needs to generate share keys too
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      set migration status after successful upgrade
      gremove unused code
      some typo fixed
      re-add 3rdparty submodule
      fix migration to new encryption
      fix path to class
      display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
      Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
      move 3rdparty dependencies to app
      fix path, needs to be relative to data/
      fix path to 3rdparty apps
      Merge branch 'master' into files_encryption
      Merge branch 'master' into files_encryption
      improved error messages
      settings clean-up; There is no blacklist in the new encryption app
      revert submodule changes
      revert changes to .gitmodules, they were applied by accident
      Merge branch 'master' into files_encryption
      fix public link share if a user is logged in
      code clean up; nicer solution to solve the public link share problem if a user is logged in
      fix first time encryption after app was enabled
      no use the recoveryPassword var instead of accessing the POST array
      Merge pull request #3481 from owncloud/firsttime_enc
      remove unused varaibles
      fix tests, after unused variables are removed
      Merge pull request #3506 from owncloud/fix_3320
      fix migration from old to new encryption
      make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
      legacyBlockDecryprt() needs to be public
      replace == with ===
      Merge branch 'master' into remove_unused_vars
      $_POST["adminEnableRecovery"] is a string
      check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
      if one public link share was found, we don't have to check it for the other folders
      for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
      use public API for error handling; improved while condition
      remove unnecessary variable
      fix indention
      introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
      control files are no longer needed, remove them from the tests
      $session->setPrivateKey expects only one parameter
      let user update private key password in case it was changed from outside, e.g. external auth back-ends
      added test for decryptPrivateKey()
      use generated private key fro m setUp()
      link directly to the encryption settings
      improved label for the password recovery feature
      only show personal settings if the recovery feature is enabled or if no private key is set
      tell the user what he can do to regain access to his files
      allow to press enter to update the password
      print a warning if a user wants to reset his password and encryption is enabled
      add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set
      add hint about what the recovery password field is for
      always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
      use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
      only check for recovery key if someone else than the user wants to change the password
      Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
      Merge branch 'master' into files_encryption_check_private_key
      update submodule
      make sure that only one process can enter the migration mode
      use constants for different migration status
      createUser() needs to return something; the user object or false
      Merge branch 'master' into files_encryption_check_private_key
      backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6
      Merge branch 'master' of github.com:owncloud/core
      disable proxys during ssl root cert upload to avoid encryption
      use number of manipulated rows as idicator if it was possible to enter the migration mode
      Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload
      adapt test to the code changes
      mage page title aware of ownCloud edition
      make footer aware of ownCloud editions
      keep all strings in one place to make it easier to change them
      make footer and urls aware of ownCloud editions
      add default doc url
      make main menu aware of the different owncloud editions
      make pub link share footer aware of different owncloud editions
      short explanation about OC_Defaults
      don't show translation hints in enterprise edition
      add logo-claim
      Merge branch 'template_updates' of github.com:owncloud/core into template_updates
      Merge branch 'master' into files_encryption_upgrade_fix
      fix typo in var name
      add comment to explain the helper function
      LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
      Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix
      Merge pull request #3668 from owncloud/encryption_migrate_only_once
      Merge branch 'master' into files_encryption_upgrade_fix
      Merge pull request #3552 from owncloud/files_encryption_upgrade_fix
      Merge branch 'master' into files_encryption_check_private_key
      Merge pull request #3558 from owncloud/files_encryption_check_private_key
      improved footer
      Merge pull request #3687 from owncloud/template_updates
      Merge pull request #3715 from owncloud/fixes_for_3641_3620
      only escape glob pattern
      fix indention
      don't normalize absolute local path
      Merge branch 'master' into fix_glob_escaping
      Merge pull request #3727 from owncloud/fix_glob_escaping
      fix lost password page, don't show checkbox is encryption is not enabled
      also use the default theme if the theme is set to an empty string in the config.php
      fixed enghlish sentence, thanks to @MTGap
      add some more error messages, in case something went wrong
      some more error messages
      always have a defined return value
      Merge pull request #3788 from owncloud/more_error_messages
      Squashed commit of the following:
      encryption is LDAP compatible
      fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'
      add openssl_error_string() output to the owncloud.log
      introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
      fix function documentation
      construct the foother in defaults.php so that we use always the same footer
      check for updates only in the community edition
      lib/defaults.php should only contain the default strings and read the other strings directly from the theme
      remove unneeded if condition
      make mail footer aware of different themes
      logo claim added
      add logo claim to defaults.php
      set default logo claim to ''
      Merge branch 'master' of github.com:owncloud/core
      backport from pull request #3863
      check php version, the encryption app needs php >= 5.3.3
      add correct php version
      fix error string
      cast result to bool
      improved error message
      improved error message
      Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
      Merge branch 'master' into encryption_check_php_version
      Merge pull request #3870 from owncloud/reset_migration_status
      Merge pull request #3858 from owncloud/more_ssl_error_messages
      if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal
      don't run hooks for .part files
      Add init funtion to OC_Defaults to be able to wrap translatable strings
      move to non-static OC_Defaults
      add public api
      eddition string should be empty by default
      revert changes which where introduced by accident during merge https://github.com/owncloud/core/commit/23cc69b816f5df465c7c9d0df5630d00abfaf6d0
      more verbose error message
      Merge https://github.com/owncloud/core/pull/3900
      handle system wide mount points
      fix path to OC_Mount_Config
      some performance improvements, check for system wide mounts only once while writing share keys
      move isSystemWideMountPoint() to util.php
      handle rename correctly for system wide mounts
      delete file keys from the correct location
      always return normalized path
      del share keys from correct location
      only escape glob pattern
      make trash bin aware of system wide mounts with respect to encryption keys
      only check for external mount points if the external storage app is enabled
      fix getUidAndFilename() test
      added helper function to escape glob pattern
      remove wrong closing bracket
      Merge https://github.com/owncloud/core/pull/3827
      add new file above summary if it is the first file in the list
      call expire function before writing the new version to make sure to have enough free space
      it is enough to call the expire function once
      also expire versions on rename, to update the history more regularly
      fix typo in comment
      adjust comments
      fix some var names according to our style guide
      continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota
      fix array access and change variable names according to the coding style
      if the file doesn't exists; create a new one. We use this to create new text files in the web interface
      initialize OC_Defaults in template constructorX
      Merge branch 'master' into move_defaults_to_template_constructor
      use OC_Defaults directly from the template
      Merge pull request #4177 from owncloud/move_defaults_to_template_constructor
      new version drop down
      fix css
      remove unused code; use jquery
      css for button no longer needed
      nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
      don't move empty folders to the trash bin
      disable "deleted files" button if trash bin is empty
      expire trash bin if trash bin exceeds max size after a new file was added to ownCloud
      fix typo
      make 'restored' extension translatable
      Hide Delete Permanently button when Restore happens
      found some more places where we can disable buttons while performing a action
      reduce time for auto expire to 30 days by default
      user interface to allow user to decrypt all his files once the encryption app was disabled
      add ajax call to decrypt all files
      register decrypt all route
      add decryptall.php
      Merge pull request #4203 from owncloud/trashbin_improvements
      Merge pull request #4270 from owncloud/fix_4253
      Merge pull request #4243 from owncloud/no_empty_versions
      Merge pull request #4349 from owncloud/oc_cache_fix
      Merge pull request #4352 from owncloud/encryption_clean_up
      Merge pull request #4481 from owncloud/fix_versioning_size_check
      Merge pull request #4239 from owncloud/decrypt_files_again
      Merge pull request #4596 from owncloud/fix_isEmpty_trash
      Merge pull request #4708 from owncloud/encryption_fixes
      Merge pull request #4896 from owncloud/sharing_allow_disable_password
      Merge pull request #4887 from owncloud/sharing_disable_public_upload
      Merge pull request #4902 from owncloud/repeat_recovery_password
      Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
      Merge pull request #4689 from owncloud/sharing_mail_notification_master
      Merge pull request #5121 from owncloud/shareapi-syntaxerror
      Merge pull request #5085 from owncloud/versioning_preview
      Merge pull request #4877 from owncloud/ocs_share_api
      Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
      Merge pull request #5193 from owncloud/fix_5126_2
      Merge pull request #5173 from owncloud/set_timezone_for_log
      Merge pull request #5219 from owncloud/catch_wrong_timezone
      Merge pull request #5230 from owncloud/trashbin_fixes
      Merge pull request #5210 from owncloud/sharing_search_users_fix
      Merge pull request #5233 from owncloud/enc_filter_users
      Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
      Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
      Merge pull request #5261 from owncloud/versioning_no_glob
      Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
      Merge pull request #5333 from owncloud/avater_with_encryption

Boris Rybalkin (1):
      fixing typo

Brice Maron (9):
      Preserve Debug flag accross config writes
      Allow to load splited config files ref #946
      Small perf improvement : filter before sort
      Add backtick for trash app to prevent pg errors
      Improve detection of installations errors
      Log Queries when we add a log query flag
      Change logQuery from define() to OC::Config
      Warn when we do an upgrade
      Try connection with specified db when postgres does not work

Ceri Davies (2):
      Correct emails when folders are shared.
      Use displayName in the From field of outbound email about new shares.

Chris Kankiewicz (1):
      Added 3rdparty folder as a git submodule

Christian Berendt (33):
      adding AWS SDK for PHP 2.4.0
      adding several new parameters
      reworking and extending \OC\Files\Storage\AmazonS3
      reworking testclass for \OC\Files\Storage\AmazonS3
      added commented new parameters
      increasing difference for modifcation time tests
      test copying and moving files in subdirectories
      test working with subdirectories
      test working with files in subdirectories
      fixing rmdir in \OC\Files\Storage\AmazonS3
      move new tests into the correct test method
      test moving and copying of subdirectories
      remove tests from the wrong test method
      use us-west-1 as default region for Amazon S3
      revoking additional tests
      removed aws.phar and added extracted zip instead
      replaced substr with trim
      remove needless check
      fixed syntax error
      check if used bucket name is valid
      wait until bucket exists after the creation
      increasing allowed time difference
      added exception messages
      make tests workable with Amazon S3
      wait methods are probably not working, just wait
      minimize waiting time
      rewrote initialisation, added testing workaround
      remove uneeded calls to touch
      use === instead of ==
      fixing style issues
      stripping services from AWS SDK
      added @var tags
      write all catched exception messages to the log

Christopher (9):
      Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
      Merge pull request #4262 from owncloud/fix_jslint_kondou
      Merge pull request #4331 from owncloud/improve_app-management
      Merge pull request #4329 from owncloud/fix_4258
      Merge pull request #4706 from owncloud/fix_filepicker_mimetype
      Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
      Merge pull request #4761 from owncloud/fix_language_selection-kondou
      Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
      Merge pull request #4963 from cyberb/patch-1

Daniel Molkentin (3):
      Try to prefer index.php over index.html in the same directory
      sync parameters in setup.php with the ones in the actual .htaccess
      Merge pull request #3100 from owncloud/ensure_index_php

David Reagan (4):
      Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
      Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
      Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
      Fixed comment in personal.js. Changed message text in changedisplayname.php.

Doug Neiner (1):
      Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms

Evgeni Golov (1):
      cURL does not honour default_socket_timeout

Felix Niklas (1):
      fix checkbox <-> label binding

Florian Scholz (1):
      - xframe restriction configurable now

Florin Peter (229):
      fix performance issues
      fix for trashbin
      fixed incorrect filesize, download via web is now possible
      improved rename and file size support
      improved handling for getSharingUsersArray
      Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
      fix wrong file path in util
      Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
      fix wrong file path in proxy
      improved file size handling
      Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
      Added post proxy for getFileInfo.
      fixed file_proxy handling
      added unencrypted file size to file cache
      fixed webdav errors, now webdav up - and downloads are full working
      webdav fix for file chunking
      added post rename proxy
      implement postRename
      fix share for renamed or moved files
      Merge remote-tracking branch 'core/master' into files_encryption
      improved file size
      added filesystem post rename hook
      fix reusing keys
      removed preRename and moved postRename to hooks.php
      check if file exists before fixing file size
      removed previous added post rename FileProxy hook
      added self healing if file get remove from file cache
      improved file size
      fixed some problems and broken code
      restore fixed
      added handling for share-keys
      delete and restore of versions and share-keys now works
      speed improvement
      improvements for test testSymmetricStreamEncryptShortFileContent
      fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
      fixed missing parameter
      fixed test for crypt and keymanager
      rename folder to tests
      fixed tests, now tests should work via autotest.sh
      improved key length tests
      fix for sharing files
      Merge branch 'master' into files_encryption to get the latest files_trashbin app
      fixed tests after merge against master
      fixed public-keys mount point error
      revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now
      fixed some tests
      merged files_trashbin
      fix duplicate login behavior if user not setup
      Merge branch 'master' into files_encryption
      fixed re-share problems
      fixed re-share problems
      improved pre_unshare and post_unshare hook
      handling for re-share and re-unshare should work now
      merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970
      fix file info put on stream
      added test for share
      fix empty path
      fix for wrong file infos
      test for share is now able to run with autotest.sh
      fix for tearDownFS, after filesystem::tearDown() the root is not mounted
      Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
      added test for re-share
      fix for tearDownFS, after filesystem::tearDown() the root is not mounted
      added test for share folder
      added helper class and moved hook registration to it
      improved tests and include helper
      fix for accessing non object
      added helper
      fix for autotest.sh
      added test for re-share folder
      fix for accessing non object
      fix for webdav
      sharing with group should work now
      added handling for sharing with link
      removed var_dump
      added handling for public file access via files_sharing link
      added post_createUser hook
      added post_deleteUser hook for cleanup public key
      added test for public shared file via link
      fix for public link share
      fix for zero size files
      fix for Allowed memory size of xx bytes exhausted while reading big files
      fix for move file to an empty folder
      added setter for filesystem view
      prevent of infinite loop with FileProxy
      disabled FileProxy in Keymanager::getPrivateKey
      improved tests and added new tests for file rename and move
      Merge branch 'master' into files_encryption
      Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
      fix for losing mount point "/"
      merge changes for files_encryption
      removed FileProxy from test
      improved files_encryption tests
      workaround for blank page need an other solution
      fix for previous workaround
      fix for broken tests
      fix for  SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
      fix for  SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
      fix for losing mount point "/"
      added test for password change
      removed unused code
      added test for rename folder
      added test for share with group
      fix if file is not yet created
      fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
      added tests for put content, get content, touch and fopen
      improved tests for touch
      fix typo in addRecoveryKeys
      fix for recover files in subfolder
      moved enable and disable recovery to Helper class for unit tests
      improved tests
      added tests for recovery
      revert changes
      only connect share hooks if installation OC is installed
      revert changes
      fix broken legacy tests
      added folder move test
      remove unused code
      improved tests
      fixed typos
      removed mockery from tests and changed class names
      fixed key-manager tests
      changed migrationStatus to migration_status for pgsql
      fixed again key-manager tests
      updated authors info
      changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
      cleanup tests
      fix for webdav and wrong reference for findByStorageId
      update phpdoc
      changed recovery_enabled and migration_status columns to integer and fix tests
      removed /l10n/.tx/ from .gitignore
      reformat code added and changed phpdoc
      Revert "fix for webdav and wrong reference for findByStorageId"
      fix for webdav because initMounts() is triggered twice so we lost the root path
      Merge branch 'master' into files_encryption
      added legacy encryption test
      key creation should never override a private or public key
      removed dead code for delShareKey
      added test for failed sharing
      improved tests
      cleanup unused code optimize tests
      fix broken tests
      fixed postFileSize
      added webdav test
      fixed finding encrypted files in subfolders and removed unused code
      improved tests
      Merge branch 'master' into files_encryption
      fix pgsql error
      added static function registerHooks() for better unit tests handling
      added trash bin tests
      fix problems with german "Umlaut" in folder name
      revert previous fix and added normalizer to cache class
      added l10n support in apps/files_encryption/ajax/adminrecovery.php
      fixes after review from @DeepDiver1975
      added normalizeUnicode() method to OC_Util
      changed builtin normalizer to \OC_Util::normalizeUnicode
      changed tests for using new normalizer
      Merge branch 'master' into fix_for_2377
      improved trashbin test
      improved trashbin test again
      prevent for returning while false normalize string
      added more places where normalization is needed
      we should also normalize on update and search because the database layer will not do this for us
      improved tests to check if database layer normalize folder names
      Merge branch 'master' into fix_for_2377
      added OC_DB::isError and logging
      fixed error rising from fetchRow
      improved test
      added users for tests
      added check by numRows()
      Merge branch 'master' into file_encryption_tests
      Merge branch 'master' into file_encryption_util_is_error
      Merge branch 'master' into remove_unused_vars
      reformat code
      changed basic auth to test user
      replace == with === and replace != with !==
      changed to public log api
      fix for losing private key while being logged in and accessing a public link
      fix for undefined index
      Merge branch 'master' into remove_unused_vars
      fixed encryption session namespace to avoid problems
      Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass
      fixed missing convert to new session handler
      fixed if fopen returns false typically on external storage
      Merge branch 'master' into remove_unused_vars
      changes after review
      changes l10n after review
      fix for share folder on external storage
      Merge branch 'master' into file_encryption_external_storage_fixes
      fix $parent/$source typo
      fixes if cache returns false
      fixed typo
      changed deprecated class
      changed l10n to full sentences
      Merge branch 'master' into remove_unused_vars
      fixes for pgsql
      changed " to '
      reformat code
      Merge branch 'master' into file_encryption_external_storage_fixes
      fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
      fix share and un-share for single file
      prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
      added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
      fix for autoloader while user logged in and system is in maintenance
      use legacyDecrypt to decrypt key file like the previous files_encryption
      fix re-encrypt legacy files
      fix legacy key in until test
      normalize path to prevent following split to fail
      fix login errors while filesystem is not loaded
      Merge branch 'master' into files_encryption_fs_loaded_fix
      also fix login errors while filesystem is not loaded in app.php
      Merge branch 'master' into files_encryption_upgrade_fix
      check if the decrypted private key is valid on login and on read/write files
      allow the user to login but do not allow upload and show error message on the web
      code optimized and cleaned up unused vars
      Merge branch 'master' into files_encryption_upgrade_fix
      fix broken tests
      user should set into session before postLogin hook otherwise it will break not only the files_encryption app
      cleanup unused method legacyKeyRecryptKeyfile
      reformat code
      fix password change when files_encryption app is disabled
      fixed typo
      changed redirect handling
      better handling for http post
      improved error msg and removed duplicate string
      update submodule
      fix memory problems as reported at #3620
      fix for path_hash not unique as reported at #3641
      Merge branch 'master' into fixes_for_3641_3620

FlorinPeter (9):
      Merge pull request #2992 from FlorinPeter/files_encryption
      Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
      Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
      Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
      Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
      Merge pull request #3496 from owncloud/file_encryption_tests
      Merge pull request #3512 from owncloud/file_encryption_session_fix
      Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
      Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix

Frank Karlitschek (64):
      first version of the new previewer lib. It currently only created previews/thumbnails for images. It get´s more interesting when we add PDFs, movies, mp3, text files and more...
      add some documentation, remove a debug hack, move folder name definition to main class
      snapshor of the preview lib. movies are not yet working
      Merge pull request #2213 from owncloud/fix_2208
      5.0.0
      this is now 6.0 pre alpha
      Merge pull request #2234 from owncloud/fix_ldap_edirectory
      Merge pull request #2317 from owncloud/create_version_on_upload
      Merge pull request #2320 from ceri/master
      Merge pull request #2204 from owncloud/chache_updater_rename
      remove deprecated call
      Merge pull request #2411 from owncloud/fix_magicquotes
      add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
      Merge pull request #2457 from KnownSubset/master
      Update config.sample.php
      Merge pull request #2751 from Borkason/patch-1
      Merge pull request #2909 from owncloud/addHook
      Merge pull request #3092 from guruz/external_storage_check_for_curl
      Merge pull request #3103 from owncloud/default-theme
      Merge pull request #3154 from owncloud/fix_3153
      Merge pull request #3202 from owncloud/swift_id
      Merge pull request #3211 from owncloud/fix-2816
      Merge pull request #3220 from owncloud/gitignore-themes
      Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
      increase version and add warning
      Merge pull request #3510 from owncloud/publicemitter
      Merge pull request #3567 from owncloud/fixing-3466
      Merge pull request #3676 from owncloud/move-storage-bar
      Merge pull request #3765 from owncloud/hide-logo-claim
      Removed the preview warning. This is only a simple text change
      remove knowledgebase calls that are no longer used in ownCloud 5/6
      remove the config option that is no longer needed
      remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
      fixing this obvious typo directly
      prepare the updater for the new update channels
      use ===
      put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
      use a 4 digit number
      add explanation
      Merge pull request #5092 from owncloud/design-finetune
      make it possible to prepopulate a new user gome with a skeleton
      Merge pull request #5108 from owncloud/fix_avatar_kondou
      add public static
      fix typo
      use Filesystem::isIgnoredDir
      ups. remove debug
      add a real examplefile instead of an .gitignore which is a bit stupid here
      Merge pull request #5123 from owncloud/cache_mimetypes
      Merge pull request #5125 from owncloud/fixing-5122-master
      Merge pull request #5140 from owncloud/settings-beautify
      correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login
      Merge pull request #4662 from owncloud/fix-4129
      a few styleguide fixes
      Merge pull request #5142 from owncloud/fix_version_cache_expire
      Merge pull request #5146 from guruz/cache_enabled_apps_list
      6.0 alpha 1
      Merge pull request #5245 from owncloud/file_put_contents-no-create
      Merge pull request #5232 from owncloud/fixing-webdav-touch-master
      show the channel. Also mark git as git channel so that someone can see where this build comes from
      finally fix the app sorting
      fix style
      case insensitive sort
      Merge pull request #5323 from owncloud/files-external-missinggridstyle
      6.0 alpha 2

Georg Ehrke (176):
      Update CONTRIBUTING.md
      Merge branch 'master' into oc_preview
      save current work state of Preview Lib
      add route for previews
      save current work state
      implement OC_Preview
      implement pdf preview backend
      Disable transparent backgrounds for now
      set default value of scalingup to true
      implement mp3 preview backend
      Merge branch 'master' into oc_preview
      fix typo
      implement movie previews
      remove whitespace
      add svg backend
      fix return value of OC_Util::isinternetconnectionworking()
      add previews for public files
      add sample config for previews
      Merge branch 'master' into oc_preview
      make image preview backend work with encryption
      make svg preview backend work with encryption
      fix https://github.com/owncloud/core/issues/3320
      add event.preventDefault to undelete function
      move check if internet connection is disabled on purpose to a dedicated method
      don't show a warning if internet connection is disabled on purpose
      update comment
      make method names camelCase
      use false instead of 0
      update images.php
      check if the imagick extension is loaded
      add preview backend for text based files
      remove whitespace
      make movie backend work with encryption
      make mp3 backend work with encryption
      make pdf backend work with encryption
      don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
      make preview cache work with encryption and improve error handling
      connect preview lib to filesystem hooks
      move to OC namespace
      namespace fix
      respect coding style guidelines
      add php preview backend
      more style fixes
      fix c&p fail
      Merge branch 'master' into oc_preview
      validate size of file
      improve imagick error handling
      add javascript preview backend
      load getID3 only if needed
      add backend for microsoft office 2007 documents
      save current work state
      public.php - check if maintenance mode is enabled
      save current work state of libreoffice preview backend
      escape tmppath shell arg
      update require_once block in preview.php
      use ->cmd instead of hardcoded libreoffice
      fix syntax error
      update config.sample.php
      yet another update for config.sample.php
      make libreoffice preview backend work :D
      use tmpdir var instead of hardcoded /tmp
      Merge branch 'master' into oc_preview
      Merge branch 'master' into oc_preview
      update 3rdparty submodule
      Merge branch 'master' into oc_preview
      implement previews for single shared files
      don't crop Y axis
      code optimization
      check if imagick is loaded in office.php, not in libreoffice-cl.php
      save current work state of office fallback
      init language object before using it
      finish implementation of Excel preview fallback
      work on powerpoint fallback
      implement unknown preview backend
      some whitespace fixes
      stream first mb of movie to create preview
      Merge branch 'master' into oc_preview
      remove opendocument.php
      use ppt icon instead of preview
      implemenet getNoCoverThumbnail
      comment out old code
      update 3rdparty submodule
      improve error handling of webdavauth
      add unit tests for preview lib to make @DeepDiver1975 happy
      some minor improvements to preview lib
      improve Image Provider
      implement server side use of previews
      increase size of preview to size of row
      implement preview loading after upload
      fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a better solution coz this won't work in most IE versions ...
      fix position of 'user shared the folder foldername with you' label
      implement use of preview icons in thrashbin app
      fix for previews in trashbin app
      some style adjustments
      properly encode path
      add two new icons - for copyright see filetypes/readme-2.txt
      merge conflicts ...
      fix orientation before caching preview
      clean up oc\preview
      update some comments in preview lib
      fix typo
      improve validation of oc\preview and implement preview of error icon if something went wrong
      fix typo
      use $root instead of $path
      implement use of previews in sharing app
      make jenkins happy
      it's setValue not getValue, damn type
      remove debug code ...
      OC\Preview - use camelCase
      OC\Preview - improve documentation
      OC\Preview - remove unneeded comment
      OC\Preview - fix logic of two return values
      OC\Preview - outsource static methods
      OC\Preview - use !== and === instead of != and ==
      OC\Preview - proper handling of a cached previews's filename
      OC\Preview - update git submodule
      OC\Preview - set scale factor down to 2 and upscale cached preview - this got lost in a git stash ...
      return empty array instead of 0
      Merge branch 'master' into fix_return_value_search_principals
      make previews in files app smaller
      Revert "OC\Preview - outsource static methods"
      add class='preview-icon' to rows in file app that make use of previews
      add class='preview-icon' in trashbin app as well
      fix syntax in config.sample.php
      style fixes
      fix merge conflicts
      fix code style of try catch blocks
      Merge branch 'master' into oc_preview
      suppress is_file error msg
      fix merge conflicts
      implement previews of single shared files
      allow permissions.user to be null as suggested by @butonic
      fix js error
      update indexes of oc_permissions
      don't use hardcoded size for preview
      use web.svg instead of web.png
      remove \OC\Preview::showErrorPreview
      lazy load preview icons
      fix adding preview-icon to clss attribute
      fix deleting old previews after file changed
      Merge master into oc_preview
      don't generate previews of empty txt files
      improve unknown backend
      fix svg and cache transparency issue
      add comment to make @jancborchardt happy
      check if ->resource is a resource
      use jQuery.get instead of jQuery.ajax
      Merge master into oc_preview
      style fixes for preview lib
      outsource sharing and deleted files previews to apps
      Merge branch 'master' into readdir-strict-equals
      move isMimeSupported out of template files
      make it possible to disable previews
      Merge branch 'master' into oc_preview
      move path generation for previews to dedicated function
      fix return value of method
      fix preview issue when uploading a file with parentheses
      Merge master into oc_preview
      fix background size in filelist.js
      use random string as id for checkbox
      invert logic of disable_previews
      Merge master into oc_preview
      fix parameter missing warning
      use gerMimeTypeDetector detectPath instead of getMimeType
      Merge master into oc_preview
      fix issue with filetable background
      use avconv instead of ffmpeg
      fix previews in shared folders
      implement previews for public upload
      add blacklist to txt preview backend
      add test data for cal and contact preview
      add test for txt blacklist
      use dataProvider for txt blacklist test
      move fileView object initialization to testIsTransparent
      rename testTxtBlacklist to txtBlacklist
      rename variable in testIsTransparent

Henning Oschwald (1):
      Restores keyboard accessibility for expandable settings area.

Jakob Sack (12):
      Add possibility to read/write plural translations
      make l10n libs capable of handling plural translations
      Partly integrate plural translations into js
      Allow several plural forms in l10n php files
      Add multiple plural forms to the php part
      Fix two bugs in l10n.pl
      Fix an error jenkins found
      Save the plural information given in po files
      Update l10n.php to read plural_forms string
      Create plural functions on the fly
      Fix copy and paste errors in l10n.php
      Fix syntax error.

Jan-Christoph Borchardt (199):
      Merge pull request #2145 from eMerzh/preserve_debug
      Merge pull request #2322 from PHLAK/master
      Merge pull request #2408 from dcneiner/infield-upgrade
      Merge pull request #2515 from yannickoo/master
      modify app styles to adhere to coming CSS coding guidelines
      soften highlight for navigation entries
      use SVG for folder image
      also use SVG for settings cog
      remove extra type selector qualification for ID and class names
      Merge pull request #2576 from owncloud/fixing-2125-master
      revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal
      Merge pull request #2275 from owncloud/app-styles
      button selector cleanup
      add styles for disabled input fields
      group some selectors again
      Merge pull request #2737 from Kondou-ger/proper_css_comments
      use proper sans-serif font-stack
      Merge pull request #2895 from owncloud/button-fox
      add .disabled class so it can be used for simple a buttons as well
      correct naming for Pictures app, add Music
      move notice to search existing issues up
      Merge pull request #2918 from owncloud/update_CONTRIBUTING.md
      fix navigation hover effect, documentation
      additional comments
      Merge pull request #2933 from owncloud/fix-active-style
      correct primary color to #1d2d44 where slightly wrong
      make textarea inherit ownCloud font instead of using monospace
      move warning and error states together in CSS, to be cleaned up
      move password warning more relevant below password field, un-nest log in warning
      apply navigation hover effect directly to img and span, cleaner code
      remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px
      Merge pull request #2983 from owncloud/style-details
      Merge pull request #3159 from owncloud/reword
      ignore themes
      don't ignore themes README
      Merge pull request #3257 from owncloud/fix_3251
      darker low threshold color for file size and age fading, better contrast
      better contrast for files list, darker greys for selection and hover
      better contrast for controls bar
      better contrast and grouping for blocks in personal settings through darker background color
      feedback for hover/tap on breadcrumbs
      gitignore apps2 folder as well
      move storage bar below clients showcase to make it more visible
      remove leading spaces
      checkstyle: add space after colon
      multiselect: do not cut off group names
      multiselect: drop shadow for better focus
      multiselect: more breathing space for entries
      multiselect: fixed 'add group' interface a bit
      multiselect: up min-width of group multiselect to 150px
      Merge pull request #3672 from owncloud/files-contrast
      remove App management top bar and move buttons more contextually in the interface
      apps management: change misleading + to ...
      move common settings footer fieldset out of conditional
      Merge pull request #3677 from owncloud/apps-buttons
      remove dotted outlines in Firefox, fix #3712
      Merge pull request #3726 from owncloud/remove-outlines
      Merge pull request #3733 from owncloud/email_template
      differentiate delete from close icon
      use consistent icon for 'restore'/versions/history, also SVG
      transparent background for lock icon
      use mail icon consistent with Mail app icon
      remove unused big images
      remove unused loading spinners, just have one
      use proper style for add icon
      standardize on 32px loading spinner, decrease size in CSS where needed
      use history icon in Deleted Files template as well
      hide the logo claim in case the theme is not loaded
      increase Files row height to tappable 44px, more breathing space
      first round of replacing small filetype icons with proper ones, from Elementary
      change delete from entry forbidden sign to proper icon
      Merge pull request #3757 from owncloud/icon-cleanup
      apply @LukasReschke's cookie changes, hopefully finally fix #854
      app styles: remove bottom padding. Settings should be last in list instead of permanent
      more whitespace WIP
      more whitespace WIP 2
      more small whitespace fixes for the app list
      more whitespace for user menu
      prevent ugly selection effect on accidental selection, fix #3713
      add MB indicator to size heading, fix #3987
      Merge pull request #3990 from owncloud/size-mb
      introduce shortname themable string and split from title, use for image alt text
      use themable strings for installation
      use themable strings for admin page, simplify admin export, fix rest of #3791
      reword WebDAV auth to not have 'ownCloud' anymore
      reword LDAP config and use themable strings, fix rest of #3791
      Merge pull request #4061 from rolandgeider/master
      update 'get in touch' links
      make delete icon less intrusive again, only on hover
      use background image instead of img for Files delete icon
      remove unnecessary tipsy for Files delete
      use new delete icon for deleted files as well
      finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
      replace external storage status images with CSS, also use form to distinguish, fix #3910
      deactivate show password toggle for IE
      add back public API function, but mark as deprecated
      fix delete button not showing in IE8
      initial WIP for cleaner log in page
      rip out unneeded #login div, replace with existing body-login
      fix general reset CSS issue which caused gradient background to cut off
      input field adjustments for new full-color background on log in
      primary button adjustments
      sticky footer
      larger clickable area for remember log in
      adjust text colors for remember and footer
      move log in button CSS to appropriate place
      increase button size, adjust remember checkbox
      fix and checkstyle for show password toggle
      more beautiful warnings
      shorten wording on config directory errors
      adjust labels and input field groups
      add some padding to footer
      input fields work on any background now
      cleaner look and code for primary button
      better whitespace for footer
      larger log in and installation buttons
      fix browser rendering issues
      remove superfluous important
      Bring the Noise
      Merge pull request #4030 from owncloud/more-themable-strings
      check remember log in by default, ref #3918
      Merge branch 'master' into remember-checked
      slight dark inset text shadow for warnings to increase legibility
      Merge pull request #4175 from owncloud/remember-checked
      merge master
      Merge pull request #4173 from owncloud/login-cleanup
      fix loading.gif size for both upload and deletion, force visiblity
      reduce z-index of settings popup, fix #4212
      remove ugly inset shadow from header
      remove unused and never to be used pagination
      remove table layout for background jobs
      wrap code output in error messages, fix #4231
      change long couldn't be determined string to question mark again
      show 'More apps' link to app administration directly in app navigation
      prepend the new app before the 'More apps' function
      scroll the app navigation down so the newly added app is seen
      draw attention to the newly added app entry by flashing it twice
      Merge pull request #3912 from owncloud/css_cleanup_kondou
      Merge pull request #4344 from owncloud/appmgmt-in-navigation
      add more file type icons, replace old ones
      replace same but differently named package graphics with one proper one
      replace different icons for documents, spreadsheets and presentations with proper ones
      replace different icons for code with proper ones
      Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
      adjustments of video and web icon
      fix breaking error due to ... a wrong icon link. Seriously?
      increase row height to 50px, properly position everything, checkboxes, actions etc
      Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
      fix file summary position
      adjust New file dialog for new styles
      add folder icons for shared, public and external
      checkstyle double quotes in HTML
      merge master into more-whitespace
      force show loading icon also for IE
      merge master into css-fixes
      Merge pull request #4113 from owncloud/delete-fix
      Merge pull request #4314 from owncloud/css-fixes
      use proper password icon, three dots are 'more'
      vertically center rename input box
      Merge pull request #4426 from owncloud/ldap_settings_design
      move upload progress bar near upload button, more contextual
      remove unneeded extra ID selectors
      remove show password toggle from log in page, ref #4577 #4580
      fix shadow style of username input box
      Merge pull request #4563 from owncloud/use_personal-password
      change orientation for delete tooltip to left, fix #4589
      fix coding style for controls bar
      adjust right padding of controls bar, fix #4650
      Apps management as sticky footer and rename to 'Apps', fix #4622
      move CSS for apps out of styles.css into new apps.css
      move CSS for browser-specific fixes out of styles.css into new fixes.css
      fix issues caused by introduction of sticky Apps management footer
      Merge pull request #4661 from owncloud/separate-app-styles
      placeholder.js: adjust saturation and lightness values
      placeholder.js: fix typo
      Merge pull request #4816 from owncloud/fixing-723-master
      reduce rounded corners of Share and Versions dropdown
      remove box-shadows for header, navigation and controls bar - looks sharper and less washed out
      reduce rounded corners of New dropdown
      simplify From Link icon in New menu
      Merge pull request #5093 from owncloud/file-actions
      simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
      fix position of New and Deleted Files buttons
      better style and color for warning and success feedback on inputs
      remove duplicate upload CSS from files.css
      increase height of controls bar and elements to more clickable 44px
      merge master into input-simplify
      fix multiselect bar opacity, webroot
      remove specific border-radius for .primary button as it should be specific to log in instead
      fix disabled buttons not showing icons
      prevent hover effect when settings are open
      increase font size of file actions for better readability
      add useful icon from News app to core
      more elegant style for Personal and Admin settings
      fix mobile and desktop app images looking different
      improve clickability of footer link
      properly indent contents of folders for app styles, to line up with text
      fix web interface showing very small when accessed on smartphone
      Merge pull request #5297 from owncloud/quota-style

Jenkins for ownCloud (173):
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex

Jörn Friedrich Dreyer (210):
      only encodeURIComponent once
      fix npe when createStorage() returns null
      ignore files in scanFile instead of scan to catch all occurences.
      supress write hook for .part files
      Merge pull request #2575 from owncloud/fixing-1461-master
      return original filename to fileupload
      refactor files.js, make proper use of fileupload events
      return created table row, use as context in fileupload events
      don't update progress bar in ie < 10
      use === to compare empty string ''
      use local variable to walk DOM only once
      '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
      use css browser switch instead of deprecated jquery browser detection
      Merge pull request #2594 from owncloud/fix_part_file_ignoring
      Merge pull request #2747 from owncloud/cache-contructed-cache-objects
      always connect file cache updater hooks first
      rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
      don't emit rename hooks on partial file renames
      peselect filename without extension on rename
      cleanup after people who don't test in ie
      Merge pull request #3335 from owncloud/prevent-scan-loop
      allow install when only oracle is available
      add debug output
      use to_char only for oracle, whitespace
      cleanup codestyle
      Merge pull request #2778 from Kondou-ger/optimize_pictures
      Merge pull request #3179 from pawl/patch-1
      Merge pull request #3509 from owncloud/update_jquery_to_1_10
      Merge pull request #3560 from owncloud/init-order-session
      Merge pull request #3581 from owncloud/publicphp_maintenance
      Merge pull request #3444 from owncloud/share-fix
      add timeouts 3/30/90 to phpunit tests
      add missing backticks all over the place
      convert LIMIT to parameter
      raise failed tests from first commit to size @medium
      use to_char to allow comparing string to CLOB cloumns in oracle
      shorten table identifiers in tests
      Merge pull request #3648 from owncloud/sql_limit_as_param
      introduce and use executeAudited in db.php
      clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
      remove duplicate logging from db.php, now happens in entrypoints
      allow 30 sec for testDeleteFile
      fix fetchRow checks to also work with MDB2
      db structure, allow null in columns for '' values
      Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
      Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
      allow autotest to run 10x times longer
      every test now has 15min to execute
      minor cleanup for exception handling
      use executeAudited in files cache
      remove additional array wrapping
      fix another double wrapped array
      PDOException has no previous(), oh the consistency ...
      oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect
      use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config
      fix oci dbschema test
      add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
      use executeAudited in sabredav lock
      remove default tablespace in parameter
      remove dangling AND in SQL statement
      Merge pull request #3661 from owncloud/fixing-windows-server-master
      add missing backticks
      remove unnecessary exception handling
      skip teardown if cache has not been set up
      graceful teardown of cache
      use to_char when comparing clob to string on oracle, use execute audited
      make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
      fix numRows usage in user_ldap
      fix numRows usage in core lib
      fix numRows usage in files_encryption
      use assertEquals number of rows in db tests
      for oracle use BITAND() instead of & in sharing permissions sql
      manuall calculate unix_timestamp for oracle
      log as index, not remote
      enable testing individual tests
      check item id is set
      fix type of numeric columns
      one if less
      check item id is set
      Merge pull request #3872 from bantu/phpunit-xml-dist
      enable oracle testing
      Merge pull request #3838 from rgeber/master
      Merge pull request #3832 from owncloud/oracle_sql_fixes
      use executeAudited, add table name to assert message, skip schema changing test on oracle
      correctly handle error results of PDO and MDB2 backends
      remove wrong check here
      Merge pull request #3950 from owncloud/fixing-3941-master
      fix insertIfNotExist return value, update doc and corresponding test
      update comment
      enable oracle testing by default
      requires fixes in 3rdparty mdb2
      Merge pull request #3979 from owncloud/permissions-hook
      Merge pull request #3920 from owncloud/Fixing_search_ie8
      Merge pull request #3980 from owncloud/try-permissions-hook-again
      Merge pull request #3994 from owncloud/fix_oracle_setup
      Merge pull request #4015 from owncloud/fixing-4005-master
      need to use \OC_Image to escape OCP namespace
      Merge pull request #4159 from owncloud/Fixing-share-sj-error
      Merge pull request #4150 from owncloud/better-error-handling
      use $defaults->getName() as webdav REALM
      force dbs to stay in one line
      force dbs to stay in one line
      show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids
      Merge pull request #4191 from owncloud/autotest-show-skipped-tests
      IE8 login/install screen cleartype fixes and input box borders
      Merge pull request #4199 from owncloud/login-cleanup
      test lastinsertid
      always return int
      check type, assertgreaterthan
      Merge pull request #4237 from owncloud/fixing-4026-master
      add overflow-y scroll and clean up indents
      update css properties with px based values
      Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
      Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
      Merge pull request #4221 from owncloud/fix-3698
      Merge pull request #4278 from owncloud/breadcrumb-first
      add OC.Breadcrumb.show(dir, filename, link)
      use fixed OC.Breadcrumb.push()
      Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
      Merge pull request #4274 from owncloud/breadcrumbs_show
      fix #2711 using a custom event, also use css selectors over filterAttr
      Merge pull request #4151 from owncloud/doctrine-object
      allow empty configvalue in appconfig
      add PERMISSIONS_ALL summary
      use edit & reshare permission as default
      comment clarification
      Merge pull request #4410 from owncloud/fix_sharing_defaults
      fix whitespace, check selected files before starting upload
      change filelist ui updates
      Merge pull request #4376 from owncloud/use_plurals
      add triangle icon east
      progress fixes
      remove editor div in filelist
      refactor OC.Breadcrumbs, allow injection of container to allow rendering crumbs into full screen editor
      replace ' ' with '%20' in urls for curl
      architecture too complex
      reduced complexity, added listing conflicts to dialog
      Merge pull request #4348 from owncloud/fixing-4343-master
      Merge pull request #4673 from owncloud/ocsapi_cleanup
      use on to add event listener instead of deprecated jquery bind
      Revert "remove editor div in filelist", add "is deprecated" comment
      Merge pull request #4473 from owncloud/texteditor_polishing
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      refactor dialog creation
      separate uploading code from progress code, add progress capability detection
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      cleanup dead code
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      completely remove dialog on cancel/continue
      refactor replace and autorename resolution in upload.php
      fix upload of multiple files
      fix upload to folder
      fix page leaving checks
      fine ie8 compatability
      close and destroy dialog on ESC
      cleanup comments
      remove unused hooks
      whitespace and indentation fixes
      fix ESC for conflicts dialog
      Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack
      refactor upload js & html to always use only js to fill form data
      fix gitignore for all apps* folders
      add exists method to jquery
      refactor upload progress
      initial scrollto implementation:
      use correct doublequotes in template, remove container
      make 'open in folder' action default for files
      add fixme
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      use exists
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      we cannot load avatar on guest page
      disable avatar loading on public guest page
      Merge pull request #4872 from owncloud/refactor_upload_progress
      Merge pull request #4769 from owncloud/gitignore_apps_fix
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      hide excessive logging with a trace flag
      allow passing classes to buttons
      move upload dialog css to separate file
      simplify conflict template handling, fix reopen after ESC
      indentation
      fix 'event is not defined' error
      use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
      css selectors never have a : before []
      jsdoc types should go into {}
      use n to translate title
      fix double translation of error message
      Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
      use {count} instead of 'One' for more versatile translation
      fix race condition in lazy preview loading
      Merge pull request #4263 from owncloud/search_scrollto
      Merge pull request #4900 from owncloud/fixing-4488-master
      Merge branch 'master' into fix_3728_with_file_exists_dialog
      add initial search in shared files
      divide ids into chunks of 1k
      return fixed path, skip shared files outside of 'files'
      fix getAll(), refactor search by mime & search
      add all results, sharing cache also returns entries for shared files in external storages
      same for search by mime
      namespaces use upcasefirst parts
      remove unneccessary lib in namespace
      Merge pull request #4938 from owncloud/scan-filter-outside-view
      use !== comparison
      remove obsolete comment
      use correct property for mimetype of existing files
      canceling individual uploads is currently impossible because there is no placeholder
      remove double uri encoding

Kondou (7):
      Merge pull request #3573 from owncloud/octemplate_speedup
      Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw
      Merge pull request #4037 from owncloud/add_new_file_above_summary
      Merge pull request #4154 from owncloud/return-ocl10n
      Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
      Merge pull request #4496 from owncloud/fixing-error-page-layout-master
      Merge pull request #4497 from owncloud/newlines_at_eof_kondou

Lennart Rosam (6):
      Make default language configurable via config.php
      Fix typo (again >.<).. gnah
      users's -> user's
      Fixes #4129
      Actually test the connection
      Update file to meet coding standarts

Lukas Reschke (44):
      Merge pull request #2165 from owncloud/fix_2155
      Merge pull request #2214 from riso/fix_xsendfile
      Check if username is valid and remove slashes from filename
      Merge pull request #2217 from owncloud/mountconfig-location
      Merge pull request #2360 from sherbrecher/master
      Check if the installed PHP version has a fix for the nullbyte vulnerability
      Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack
      Add link to issue creation
      Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
      Unescape the update hint
      Use a more random source...
      Use random bytes instead of time
      *gnaaarf*
      Don't expose the server installation time
      Add a name to the version parameter
      Juse send the cookies in the ownCloud directory
      Set file perms to 0640 of mount.json - fixes #2718
      Merge pull request #2834 from owncloud/suppress-setup-warning
      Update 3rdparty
      Disallow URLs containing a @
      Merge pull request #3077 from owncloud/rename-checksourcepath
      Allow loading of external media ressources
      Merge pull request #3106 from IMM0rtalis/xframe_restriction_config
      Add an update notification on every page for admin users
      Merge pull request #3108 from owncloud/fileactions-order
      Remove uneeded link
      Correct function description
      Correct the parameter description
      Merge pull request #3121 from owncloud/ocs_fix_api_response
      Reword sentence and move HTML out of translation
      Move onclick handler
      Remove uneeded onclick handler
      It's a class
      Use the internal ownCloud view
      Use $dir instead of $fullpath
      Merge pull request #3245 from owncloud/use-$view
      Get config from template
      Typo
      Merge pull request #3290 from owncloud/config-data
      Add requesttoken to guest view
      Merge pull request #3326 from owncloud/fix-3321
      Add password to pre_login
      Merge pull request #3811 from owncloud/string_fixes_encryption_settings
      Escape dropdown

Markus Goetz (11):
      Fix ugly error style on install
      External Storage: Check for curl in PHP
      WebDAV Auth Connector: Check if already logged in
      Merge pull request #4042 from guruz/webdav_auth_check_existing
      Cache OC_Util::checkServer() result in session
      Merge pull request #4441 from guruz/checkServer_cache_result
      Class Auto Loader: Cache paths in APC
      Merge pull request #4485 from guruz/class_autoloader_optimization
      DAV: Use fileinfo_cache for ETag
      Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
      OC_App: Cache list of enabled apps

Masaki (1):
      replace ident spaces with tabs

Masaki Kawabata Neto (3):
      added help and status commands
      added help and status commands
      enable usage with CLI interface

Michael Gapczynski (97):
      Check if extra / is necessary for the folder URL
      Include etags for the root of the shared folder
      Include etag field for folder contents
      Fix WebDAV uploading of partial shared files
      Return unknown free space for shared root folder so we can still upload partial files
      Fix variable
      Correct parent folders' ETags for all users with access to a shared file
      Fix target path and reuse mtime
      Merge branch 'master' into shared-folder-etags
      Update ETag when file is shared
      Fix variable name in Shared_Updater
      Fix group post_shared hook
      Merge branch 'master' into shared-folder-etags
      Move hook connectors from shared storage to app.php, add post_unshare hook
      Update Shared folders ETags of users with reshares
      itemSource parameter should be fileSource
      Merge branch 'master' into shared-folder-etags
      Fix #2080 and fix #2141
      Fix share hook for updater
      Fix correctFolders and retrieve the correct storage cache
      Merge branch 'master' into filecache_mtime
      Fix variable for mounting for all users, fix #357
      Merge pull request #2224 from owncloud/ldap_version_bump
      Add error handling to the file cache upgrade
      Correct undefined variable in post_shared hook, fixes #2592
      Initialize collectionTypes variable as false
      Check if operation worked before sending post hooks, fixes #2484
      Don't unlink old renamed file if stream copy failed
      Merge pull request #2943 from owncloud/always_load_cache_hooks_first
      Merge pull request #3147 from owncloud/storage-mkdir-root
      Fix #2816 renaming shared files
      Don't display shared links if disabled
      Fix retrieving of mount points for shared storage, fix #3218
      One more mount point fix
      Merge pull request #3025 from owncloud/move-file
      Merge pull request #3277 from owncloud/fix-change-password
      Prevent backgroundScan() from looping if opendir() is failing for the same path
      Turn off theme before update
      Merge pull request #3366 from owncloud/contributing_add_contacts
      Fix finding mount in background watcher, fixes #3353
      Switch to using Google Drive SDK, closes #2047
      Setting Redirect URI is not required here
      Add undefined verision variables
      Prepare for #2013 fix
      Fix constant in last commit
      Don't set Content-Length header if size is unknown
      Include 3rdparty Google Drive SDK 0.6.2
      Fix require_once for 3rdparty in google ajax frontend
      Merge pull request #3421 from owncloud/pre_login_password
      Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
      Add tests for copying/moving between storages
      Fix undefined variable for copying empty folders
      Add data-dir attribute to home breadcrumb
      Remove user name addition to paths in deleteAll
      Merge branch 'master' into move-maint-start
      Fix undefined index for share mount point retrieval
      RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
      Merge pull request #3457 from owncloud/fix-share-links
      Switch to calling deleteAll via storage to avoid emitting delete hook
      Merge branch 'master' into move-storages
      Merge pull request #3425 from owncloud/move-storages
      Clear opcode caches after writing to the config file, fixes #3372
      Bump version for files_encryption changes
      Merge pull request #3493 from owncloud/bumpversion
      Merge pull request #3388 from roha4000/master
      Merge pull request #3478 from davidak/master
      Merge pull request #3412 from owncloud/fix_2013
      Return null if file size is negative for WebDAV, fix #2013
      Merge branch 'master' into googledrive
      Only update metadata that has changed
      Organize conditionals in a better order
      Style fixes
      Merge pull request #3532 from owncloud/scan-update
      Only retrieve the current user's permissions
      Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
      Merge branch 'master' into googledrive
      Implement hasUpdated() to watch for changes on Google Drive side
      Style and comment fixes
      Merge branch 'master' into convert-oc_config
      One more style fix
      Revise Contributing document
      substr storage id to prevent problems with storing the change id in appconfig
      Merge branch 'master' into hook-improvements
      Merge pull request #2919 from owncloud/hook-improvements
      Fix potential glob error
      Can't determine if debug mode is defined until we read the config
      Add tests for the updater with mount points
      Merge pull request #3783 from owncloud/improved_wording
      Merge pull request #3911 from owncloud/fixing-unittests-master
      Add update permissions hook to sharing
      Only emit permissions hook for files and and include path
      Fix 'most' Google Drive tests
      Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing
      Move  check so the variable will never be undefined
      Fix calculating size for empty folders
      Use query to calculate folder size
      Add test for calculating size of newly empty folder

Miquel Rodríguez Telep / Michael Rodríguez-Torrent (3):
      Minor typo, coding style fixes for OC_Util::getInstanceId
      Ensure instanceid contains a letter
      Use isAppVersionCompatible in app installer

Morris Jobke (182):
      share autocomplete - improve group appearance
      replace hardcoded css style with css class - ref owncloud/core#173
      use simple markup to highlight groups in share autocomplete
      Make it possible to show less log entries again - fix owncloud/core#1593
      remove animation
      add copyright note
      apply code review hints
      convert js call to css rule
      fix typo and remove animation
      turn off autocompletion for password field
      Merge pull request #2975 from owncloud/log-date
      modify password clone to password type right on submit to prevent the browser remind the content
      fix logical issue while retrieving log via ajax
      remove log sort in admin section
      fix syntax layout
      Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
      fix wrong shared icon description
      Merge pull request #3109 from owncloud/fix-2928
      Merge pull request #3098 from jerrac/displaynamesaveontimeout
      Merge pull request #3145 from owncloud/magic_quotes_gpc-check
      Merge pull request #3146 from owncloud/restart-hint
      Merge pull request #3160 from owncloud/remove-onclick
      Merge pull request #3203 from qzio/patch-1
      Merge pull request #3212 from owncloud/stop-links
      Merge pull request #3246 from owncloud/newfile-mimetype
      remove hard php-intl requirement
      Merge pull request #3283 from owncloud/move-legacy-fs
      Merge pull request #3296 from owncloud/disable_mbstring.func_overload
      fix allowed rename of folder in root directory to reserved name "Shared"
      wrong root dir name
      string comparision
      [files] refactoring
      [files] fix typos
      [files] kill stripslashes
      [files] remove normalizePath on rename and dependency injection
      [files] rename tests
      [files] remove realpath in test
      [files] rename test class and add rename test
      [files] ownCloud typo
      [files] rename lib to "App"
      Merge pull request #3311 from owncloud/disable_mbstring.func_overload
      [files] fix mock creation and remove hardcoded 'require' statement
      Merge pull request #3235 from NCTU-NBA/pr-langcode
      Merge pull request #3303 from owncloud/update_etags_on_restore
      [files] add private declaration of $view
      Merge pull request #3330 from owncloud/preselect_filename_on_rename
      Merge pull request #3406 from owncloud/oc_dialogs_oc_template
      fix wrong signature delimiter - fix #3523
      Merge pull request #3507 from owncloud/remove_unused_vars
      trashbin -> deleted files
      Merge pull request #3628 from owncloud/update_3rdparty_submodule
      Merge pull request #3647 from owncloud/missing_backticks
      Merge pull request #3666 from owncloud/allow_null_in_text_columns
      Merge pull request #3681 from owncloud/fix_ajax_removeuser.php
      TL;DR and remove link from "Report issue here"
      Fix typo
      Merge pull request #3586 from owncloud/contributing
      improve comment
      Merge pull request #3684 from owncloud/pg_install_db_master
      if rename of file fails, the rename is undone in the view - #fix 2820
      Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
      Merge pull request #3884 from owncloud/fixing-unittests-master
      Merge pull request #3881 from owncloud/archive_tar_php5.5
      Merge pull request #3223 from owncloud/fix-2820
      Merge pull request #3857 from owncloud/enable_single_autotest
      Merge pull request #3915 from owncloud/summary_as_last_filelist_entry
      Merge pull request #3932 from owncloud/fix_label_position
      Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_for_dialogs
      Merge pull request #4002 from owncloud/use_OC_in_settings_js
      Merge pull request #3985 from owncloud/cookie-past2
      Merge pull request #4130 from owncloud/ie-show-password
      Merge pull request #4118 from owncloud/remove-size-experiment
      add proper deprecated tag
      fix failing master branch - Test_Config::testWriteData
      mark test as incomplete because I can't reproduce jenkins failure
      Merge pull request #2980 from owncloud/===_and_!==_in_settings
      Merge pull request #4171 from owncloud/fix-config
      Merge pull request #4238 from owncloud/fix_4235
      Merge pull request #3982 from owncloud/test_lastinsertid
      Merge pull request #4259 from owncloud/search_result_scrollbar
      Merge pull request #4208 from owncloud/scanner-php53
      Merge pull request #4155 from owncloud/mdb2schemareader-booleans
      Merge pull request #4320 from owncloud/adding-executable-occ-master
      Merge pull request #4321 from owncloud/add_unittests_kondou
      Merge pull request #4328 from owncloud/cleanupdb_kondou
      Remove noisy Log/Debug message
      Merge pull request #4302 from synchrone/master
      Merge pull request #4448 from owncloud/fixing-4444-master
      remove jPlayer css rules from core css file
      Merge pull request #4032 from owncloud/more-whitespace
      Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
      change font on login/install page from black to white
      fix difference between packaged version and master
      fixes for IE8
      Merge pull request #4193 from owncloud/versions_fix_css
      Merge pull request #4475 from owncloud/brighter-font-color
      Merge pull request #4427 from owncloud/fix_4425
      Merge pull request #4509 from owncloud/add-odf-templates-master
      fix minor style issue in the app navigation
      Merge pull request #4447 from owncloud/fix_4351_master
      fix reviewers concerns
      Merge pull request #4519 from owncloud/style-fixes
      Merge pull request #4542 from owncloud/fixing-4504-master
      Merge pull request #4281 from owncloud/ie8-multiselect
      Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
      Merge pull request #4584 from owncloud/fixing-4575-master
      Merge pull request #4585 from owncloud/fixing-4385-master
      fix weird logical behaviour
      Merge pull request #4586 from owncloud/fixing-3431-master
      add documentation
      Merge pull request #3208 from owncloud/api_capabilities_quota
      Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
      Merge pull request #4601 from owncloud/fixing-4341-master
      Merge pull request #4610 from owncloud/password-toggle-login
      add visualize
      reviewers comments
      fix 3rdparty commit
      Merge pull request #4627 from owncloud/trashbin-tipsy
      fix typo
      update 3rdparty - md5
      calculate fontsize and line-height
      Merge pull request #3961 from owncloud/logrotate
      Merge pull request #4618 from owncloud/visualize-js
      Merge pull request #4631 from owncloud/hotfix_4630
      Merge pull request #4552 from dampfklon/fix4552
      Merge pull request #4642 from masakik/master
      Merge pull request #4660 from owncloud/apps-management-sticky
      IE8 fixes
      Merge pull request #4674 from owncloud/fit-filepicker-new-icons
      Merge pull request #4657 from owncloud/files-controls-fixes
      Merge pull request #4663 from owncloud/fix-sticky-apps
      RGB -> HSL
      Merge pull request #4695 from owncloud/placeholder-hsl
      Merge pull request #4702 from owncloud/center-utils
      Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
      Merge pull request #4449 from owncloud/clean_up_util
      Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
      Merge pull request #4835 from owncloud/fix-apps-height
      Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
      Merge pull request #4929 from owncloud/fixing-4416-master
      Merge pull request #4987 from owncloud/different_color_placeholder
      Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
      Merge pull request #5001 from owncloud/fixing-user-external-backends-master
      fix license header line breaks
      Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
      Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
      Merge pull request #5012 from owncloud/check_keyfiles_exists
      Merge pull request #5039 from owncloud/lib-private-master-2
      fix unit tests
      Merge pull request #5076 from owncloud/fix_filepicker_kondou
      just fix whitespace stuff
      add/remove specific CSS class - not all classes
      Merge pull request #5100 from owncloud/autotest-backupconfig
      Merge pull request #5109 from owncloud/controls-bar-height
      Merge pull request #4815 from owncloud/ldap_improve_testing
      vertical align versions text
      Merge pull request #5102 from owncloud/input-simplify
      Merge pull request #5136 from owncloud/design-fixes
      Merge pull request #5154 from owncloud/fix-appimages
      Merge pull request #5088 from owncloud/fix_trashbin_button
      Merge pull request #5148 from owncloud/cache-gc-legacy
      Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
      Merge pull request #5162 from owncloud/fixing-l10n-master-2
      Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixes
      Fix password screen for public shares
      Merge pull request #5179 from owncloud/userlist-avatar
      Fix trash bin button
      Merge pull request #5181 from owncloud/fixing-chunked-upload-master
      fix escaping
      Merge pull request #5213 from owncloud/files-filesappdetectionhint
      Merge pull request #5244 from owncloud/more-css-fixes
      Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
      Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
      Merge pull request #4780 from AxelRb/master
      Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix
      Merge pull request #5293 from owncloud/files-ie8-datemisaligned
      Merge pull request #5296 from owncloud/remove-chosen-hack
      Merge pull request #5304 from owncloud/files-deleteiconpositionfix
      Merge pull request #5290 from owncloud/fixing-5191-master
      Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
      Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files
      Merge pull request #5334 from owncloud/files-sharing-actionsafterupload

Myles McNamara (4):
      remove php_value
      use theme name and title for password reset
      fix syntax error
      use getName instead of getTitle

Nathan Dauber (1):
      Update the ignores to include project structure file *.iml

Olivier Tétard (1):
      Fix file sharing via public link for one particular file.

OpenLarry (1):
      fixes #2679

Owen Winkler (11):
      Merge pull request #4271 from owncloud/plural_translations
      Merge pull request #4360 from owncloud/format-date-numeric-strings
      Use JSON to send/receive group data.
      Break long lines into smaller ones.
      Fixed inconsistent spacing.
      Merge pull request #4493 from owncloud/fixing-initL10n-master
      Start a branch for easier OpenSSL configuration.
      Employ config option for OpenSSL config file, if provided.
      Merge pull request #4514 from owncloud/windows_ssl
      Merge pull request #4894 from owncloud/fixing-4620-master
      Merge pull request #4982 from syncloud/master

Paul Brown (1):
      Improve IE Compatibility

Pellaeon Lin (3):
      Modify zh_* language codes
      Merge remote-tracking branch 'upstream/master' into pr-langcode
      Fix "select all" checkbox displacement when checked

Pete McFarlane (3):
      prefix #filestable to tbody tr
      Added autoFocus to #shareWith autocomplete options
      no autoFocus if no users returned

Raghu Nayyar (10):
      Merge pull request #2903 from owncloud/disabled-class
      Merge pull request #2925 from owncloud/navigation-icon-fix
      Merge pull request #3096 from owncloud/add_missing_space_for_new_groups
      Merge pull request #3114 from owncloud/update-notification
      Merge pull request #3338 from owncloud/button_color_fix
      Merge pull request #3927 from owncloud/Fix_new_user_empty_group
      Merge pull request #5095 from owncloud/design-finetune
      Merge pull request #5294 from owncloud/personal-multiselect
      Merge pull request #5318 from owncloud/show_channel
      Merge pull request #5295 from owncloud/show-eye-in-personal

Robin Appelman (243):
      Cache: add seccond mtime field
      Cache: bookkeeping of storage_mtime
      Emulate touch() for backends that don't support it
      merge master into filecache_mtime
      Cache: better rename hook for cache updater
      Store the global mount configuration file in the datadir
      Return unknown freespace if the free_space call failed
      Improve handeling of unlimited max upload size
      Don't block uploads if the max upload size is unknown
      Don't show storage space warning when the free space can't be determined
      Close sessions when doing background jobs
      Seperate memory based cache from OC_Cache
      Add memcached backend
      Add phpdoc documentation to the Storage interface
      Some improvements for the Storage phpdoc
      Improve phpdoc for the filecache
      Port Icewind's fix I
      Cache: fix property path for getting legacy etag
      Users: fix "Other.." quota option for the default quota
      Fix touch for creating new files
      Add the quota change listeners to newly added user entries in the user list
      -L10N: cache the result of findLanguage
      Fix OC_User::getDisplaynames when using numeric user id's
      Cache: only look for child entires when doing a move operation when moving a folder
      Cache: add a backgroundjob to check for external changes to the filesystem
      Cache: check one folder and one file each time the backgroundwatcher runs
      code style
      Rework background job system
      Adjust backgroundjob test cases
      Add database table for backgroundjob
      Ensure we don't throw an exception before we can upgrade to the new backgroundjob system
      Try to supress pre-upgrade backgroundjob error
      Don't try to use backgroundjobs before the installtion is done
      Improve error message if user creation fails during setup
      Fix raiseError call in the MDB2 sqlite3 driver
      Files: also check if the source path is valid when doing a rename or copy operation
      Files: Fix XSS when creating dropshadow
      Update documentation for \OCP\BackgroundJob
      Add support for the old public backgroundjob api
      Files: fix the order fileactions are computed for a file
      Add markdown to mimetype list
      Make sure the filesystem is initialized when searching for mounts
      Have the filecache updater testcase clean the filesystem properly
      Cache: seperate handing of numeric storage id's to it's own class
      Further seperation of mount management logic
      Don't start the session when in cli mode
      Code style
      Dont task external storages with creating their own root
      Set storage id for openstack swift backend
      Move legacy backgroundjob classes to a place where they can be autoloaded
      Files: set the proper mimetype when creating a new text file
      New hook system
      Move autoloader to it's own class
      Add per-autoloader classPath
      Allow the autoloader to try mutliple possible paths for each path
      Allow disabling the global classpath in an autoloader
      Autoloader: split getting the class paths and loading the class
      Autoloader: add support for custom namespace paths
      check for setlocale after setting up the paths to prevent autoloader confusion
      Autoloader: load the 3rdparty libraries using prefixes
      Autoloader: test cases
      Autoloader: fix loading app clases located in lib/
      Move legacy filesystem classes
      Add wrapper storage backend
      Add mechanism to allow apps to wraper storage classes
      fix typo
      merge master into filecache_mtime
      Add PublicEmitter class
      Abstract the session away in a class
      Use the new session wrapper
      Fix session not working error
      check fix if session start is successfull
      provide a dummy session for CLI
      fix syntax error
      merge master into sessionclass
      implement ArrayInterface with Session
      didn't mean to commit this yet
      New user management classes
      implement old user api on top of the new one
      fix User->setHome when the backend action fails
      fix setting getting active userid
      Emit leacgy OC_User hooks
      Cache: provide a function to get the permissions of all files in a folder with one query
      Cache mimetype icons
      Merge branch 'master' into user
      cache instances of \OC\User\User
      initialize the session earlier
      fix caching of user objects
      fix typo
      Fix postLogin hook
      use single quotes
      fix undefined variables
      fix namespacing error
      merge master into backgroundjob
      Files: use public api to register backgroundjob
      fix clearing mounts when filesystem isn't initialized yet
      make sure the filesystem is setup before doing mount operations
      Use int for last_run
      User: remove determineDisplayName
      User: consisten variable naming
      User: return backend result
      move phpdoc comments
      cast result to bool
      use caching for userExists
      also clear cached users when removing a single backend
      seperate mimetype guessing from filename
      fix variable name
      actually return result
      manage creating and wrapping storages in it's own class
      merge master into storage-wrapper
      Storage wrapper: provide access to the wrapped storage
      storage loader needs to be accessible by apps
      add test cases for Mount
      use a getter for the storage loader to ensure the instance is created
      split of scanning the childs of a folder
      scanner: give more percision about what data is reused during scanning
      reuse etag when doing a forced rescan
      Basic tests for getFileNameMimeType
      Make rmdir recursive for local storage
      add tests for reusing existing data in scanner
      fix updaters test cases
      allow scanning files for multiple users
      use json to encode user list
      remove deleted files when re-scanning a folder
      Add a CLI script for manually triggering checking a folder for updates
      Sabre: throw exceptions when delete/create/write operations are not permitted
      move storage wrappers to their own namespace
      fix storage wrapper namespaces
      add option to clear the files in the static streamwrapper
      fix is_file and is_dir for the static streamwrapper
      better unit tests for static stream wrapper
      make rmdir recursive for mappellocal storage backend
      overwrite Sabre_DAV_ObjectTree with a faster getNodeForPath
      make use of the fact that rmdir is already recursive
      improved move operation for sabre's objecttree
      use new ObjectTree in sabredav
      improved copy operation for objecttree
      code style
      fix uploading when ['dirtoken'] is not set
      fix detection of public upload in filelist.js
      Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures
      OC_Config: handle failure of glob('*.config.php')
      fix test case whitespace
      fix \OC\Config test cases when debug mode is enabled
      split upgrade logic from ajax file
      Updater: pass update url as argument to update check
      add forwarding emitter for agregating multiple emitters
      forward previously registerd hooks
      fix typo
      update group management
      use new group api as backend for the old api
      cant use private members from closure in php <5.4
      more consitency in hook names
      add test case for getting group after deleting it
      search parameter is not optional
      consistent naming
      more consistent naming
      reneme id to gid
      Merge branch 'master' into cache
      split out memcache factory from base class
      memchache: use prefix string instead of global flag
      memcache: some additional unit tests
      mamcache: implement the ArrayAccess interface
      memcache: also switch factory to prefix
      Storage: remove tests for search
      Storage: remove some unneeded strict tests of mtime behaviour
      memcache: make base testcase abstract
      group: only pass backends that hold that specific group to the group constructor
      style fix
      Make Cache\Scanner an emitter
      add option to get the mountmanager from the filesystem
      Split scanning logic from ajax file
      return result from getL10N
      db: cast default values for boolean fields to booleans
      add support for the <primary/> element within field definitions
      use ===
      Merge branch 'master' into groups
      Merge branch 'master' into sabre-objecttree
      use output buffering when including the irods libraries
      rename constants
      add quota streamwrapper that limits the amount of data that can be written to a stream
      move storage wrapper test to new namespace
      add quota storage wrapper
      functions in OCP should be static
      fix getPermissionsCache for storage wrapper
      add option to wrap existing mounts
      use renamed constants
      add conveince function to wrap all storages
      use storage wrapper for quota instead of a filesystem proxy
      use renamed constants
      fix scanner hooks, cant use  inside closures in php 5.3
      Cache: don't check if the parent exists in the cache if we are already sure it does
      add function to get config object from OC_Config
      make MDB2Schema reader non static
      add tests for MDB2SchemaReader
      dont need to explicitly pass by reference
      remove unneeded 'use'
      better variable naming
      make sure the first breadcrumb item is inserted before any other elements in the topbar
      remove invalid type hinting and cleanup namespaces a bit
      merge master into doctrine-object
      DB: remove invalid asserts
      add reveal mimetype
      merge master into doctrine-object
      remove deleted files while scanning
      split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
      add the option to have templates for newly created files
      add template for html files
      use ===
      actually register html template
      Scanner: additional tests for reusing etags during scanning
      Scanner: correctly pass trough reuse options when doing a recursive scan
      fix quota wrapper reporting negative free_space, breaking user interface
      remove outdated quota proxy
      also emit hooks for views that are a subfolder of the user folder
      merge master in storage-wrapper-quota
      use strict equals in readdir loops to prevent issues with '0' files
      test case for hooks send from a non-default view
      also emmit create hook when creating new files using touch()
      Provide an implementation of the fileapi for oc6 build on top of the old api
      use ===
      extract interfaces from fileapi for public namespace
      update phpdoc for public fileapi
      change View->deleteAll to an alias of View->rmdir since rmdir works recursive
      show preview for uploading image files on conflict
      move public files api to a clearer namespace
      move filesystem expceptions to global namespace
      improve phpdoc for the public files interface
      add storage backend interface to public namespace
      adjust test cases to namespace changes
      Merge branch 'master' into fileapi-foreward
      cleanup public storage interface a bit
      files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
      clear permissions cache when scanning a file
      fix smb streamwrapper on non existing files
      return the correct result when doing an smb rename
      fix using touch to create a file for smb
      fix recursive delete for smb
      extend test case
      Fix loading legacy global filecache gc backgroundjobs
      don't trigger the create hooks when if the file already exists for file_put_contents
      ensure the view's root is a subfolder of the the default root, not only starting the same
      merge master into hooks-view-same-start

Roland Hager (5):
      Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users.
      New tests to assure that a move will not affect another users cache entries
      FIX: Download of files named "true" or "false" impossible
      Revert "FIX: Download of files named "true" or "false" impossible"
      Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.

Roman Geber (2):
      Public upload feature
      Added file-upload to GIT repo

Sam Tuke (40):
      Fixed bug causing nested file read over webdav to fail
      Work on post_share hook for files_encryption
      Implementing sharing support
      Updated specfile
      Fixed wrong array key reference
      Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
      Development snapshot
      Shared encrypted files now readable by both sharer and sharee
      Started work on post unshare hook
      Unsharing a single file now works
      Deleting encrypted files with missing keyfiles/shareKeys now succeeds
      Made proxy class reuse existing keyfiles not gen new ones;
      Added notes where to reuse old keys instead of generating new ones
      Fixed stream wrapper bugs
      Improved folder creation code
      Added method for setting user keyfile recovery preference
      Added ajax scripts for setting pwd recovery preferences
      Merge branch 'master' into files_encryption
      Merge branch 'master' into files_encryption
      Development snapshot;
      Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload
      Added info about filesystem method access conventions
      Fixed proxy class handing of read / write files
      Merge pull request #2885 from FlorinPeter/files_encryption
      Fixed stream{} reading of encrypted files (stream_read())
      Working on stream{} writing
      Development snapshot
      Updated buglist
      Merge branch 'master' into files_encryption
      Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
      Development snapshot
      Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
      Added support for user-specified password for adminRecovery account in admin settings page
      Added facility to manually encrypt all files from personal settings
      Made code formatting of new methods more consistent
      Added pre_share hook
      Fixed bugs with pre_share hook usage
      Implemented initial recoveryAdmin functionality in crypto file proxy
      Improvements to code formatting & indentation
      Fixes to code formatting and indentation

Stephan Arts (2):
      Use templates to theme share e-mails (#3683)
      Do no translate "ownCloud - "

Stephane Martin (2):
      fixes #4574
      Merge pull request #4578 from houbaastef/master

Thomas Mueller (84):
      Merge branch 'master' into ocs_capabilities
      fixing variable name type
      fixes #2081
      indexed slug should be created based on logic path
      slug generates uniqid in case the file/folder name contains not one single valid character
      adding //IGNORE to iconv to prevent nasty php warnings
      skip archive tests for now
      fixing various filesystem/storage unit tests on windows
      write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-(
      enable UTF-8 charset on mssql
      using rtrim
      more accurate safe_mode check - refs #2258
      Merge branch 'master' into fixing-windows-datadir-master
      adding extension to slugified physical path
      some more test cases & fix on file name generation with index
      some basic unit test for loading classes
      documentation added and trying to fix minor code issues
      initial fix for MSSQL
      fixes #1461
      fixes #2125 - the warning is now displayed with a disabled button
      prevent to fire delete ajax a second time.
      fixes #1463 - file size is now displayed correctly in IE8
      fixes #2792 - only touch if writable
      fixes #2789 - no internet connectivity check if there is non on purpose
      fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName
      initial integration with iRODS www.irods.org
      Merge branch 'master' into ext-fs-irods-master
      in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session.
      checkbox in settings ui
      test case for iRODS storage added
      lastRun is not a method
      adding resource type
      Merge branch 'master' into ext-fs-irods-master
      adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS
      adding auth mode to ui and the url
      No unit test coverage reports for pgsql - this causes issues on Jenkins.
      Merge branch 'master' into fix-3353
      Merge branch 'master' into hooks
      Merge branch 'master' into convert-oc_config
      Merge branch 'master' into ext-fs-irods-master
      adding Oracle support to autotest.sh
      adding Oracle support to autotest.sh
      meanwhile phpunit is seq faulting with mysql as well
      submodule 3rdparty updated
      fix method naming
      In cases where smb4php returns false of an empty array stat/( has to return false.
      adding PHPDoc comment to getManager()
      Fixing code coverage analysis
      fixing code coverage
      ignore l10n folder within remaining apps
      exclude 3rdparty folder within files_external and files_encryption from code coverage
      - implement touch() to at least create a file which doesn't exist
      update to latest master
      Read configuratons for external filesystem test from a private place.
      Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests
      [Fixing Updater Unit Tests on Windows]
      [Fixing Updater Unit Tests on Windows]
      [Fixing unit tests in Windows]
      restore Updater functionality on non-Windows platforms
      Merge branch 'master' into move-maint-start
      dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
      coding style
      adding default to $hint within ctor of DatabaseSetupException
      remove » and « from the text mail because they will be escaped
      in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
      Merge branch 'master' into ext-fs-irods-master
      Merge branch 'rescan-all' into scanfolder-remove
      adding unit test for folder remove: testRemovedFolder()
      session life time is now configurable and set to the same value
      move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
      missing $
      adding PHPDoc
      Merge branch 'master' into ext-fs-irods-master
      TimedJob: make PhpUnit happy with asserts
      make PHPUnit happy and add asserts
      make phpunit happy - adding asserts
      session_life_time -> session_lifetime
      for now we disable public upload in case encryption is enabled
      isError should detect a PEAR_Error even if the backend is PDO.
      Merge branch 'master' into convert-oc_config
      change anonymous to public
      <<<EOL seems not to use proper end of lines on windows
      fixing UNIX_TIMESTAMP() for mssql
      implement a platform independent version of basename

Thomas Müller (451):
      Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master
      Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master
      Merge pull request #2387 from owncloud/cron-session-close
      Merge pull request #2445 from owncloud/extend_public_api
      Fixing author and copyright
      Merge pull request #2578 from owncloud/fixing-2577-master
      Merge pull request #2785 from owncloud/vobject_stringproperty
      Merge pull request #2811 from owncloud/app-version-check
      Merge pull request #3183 from miicha/patch-1
      Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
      Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point
      Merge pull request #3374 from owncloud/vobject_compound_property
      Merge pull request #3371 from owncloud/fix-3353
      Merge pull request #3430 from owncloud/vcategory_rename
      Merge pull request #1586 from owncloud/filecache_mtime
      Merge pull request #3266 from owncloud/hooks
      Merge pull request #3337 from owncloud/oracle_fixes
      Merge pull request #3416 from owncloud/files_encryption
      Merge pull request #3479 from owncloud/testing-oracle-on-master
      Merge pull request #3482 from owncloud/fix_helper
      Merge pull request #3454 from owncloud/fix_hasInternetConnection
      Exclude apps/files/l10n from coverage reports
      Merge pull request #3594 from opensaucesystems/patch-1
      Merge pull request #3622 from owncloud/read-extfx-confg-from-home
      Merge pull request #3653 from owncloud/shorten_identifiers_in_tests
      Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
      Merge pull request #3673 from owncloud/gitignore-apps2
      Merge pull request #3675 from owncloud/allow_autotest_to_run_10x
      Merge pull request #3654 from owncloud/clean_up_exceptions
      Merge pull request #3640 from infoneo/master
      Merge pull request #3686 from owncloud/minor_exception_cleanup
      Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
      Merge pull request #2835 from owncloud/move-maint-start
      No coverage for lib/l10n and core/l10n
      No coverage for settings/l10n
      No coverage for tests
      Merge pull request #3721 from owncloud/oracle_setup_fixes
      Merge pull request #3473 from opensaucesystems/master
      Merge pull request #3621 from owncloud/path-mimetype
      Merge pull request #3774 from owncloud/fix_sql_in_vcategories
      Merge pull request #3773 from owncloud/port_3596
      Merge pull request #3784 from owncloud/rescan-all
      Merge pull request #3792 from owncloud/scanfolder-remove
      Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test
      Merge pull request #3810 from owncloud/improve_webdavauth
      Merge pull request #3766 from owncloud/fix_display_name_edit
      Merge pull request #3822 from owncloud/graceful_teardown_of_cache
      Merge pull request #3818 from owncloud/update-trigger-cli
      Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle
      Merge pull request #3750 from owncloud/dummy_session_for_errors
      Merge pull request #3847 from bantu/phpunit-json-listener-removal
      Merge pull request #3843 from owncloud/sabre-exceptions
      Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
      Merge pull request #2703 from owncloud/cleanup-setup
      Merge pull request #3897 from bantu/gitignore
      Merge pull request #3763 from owncloud/recursive-rmdir
      Merge pull request #3852 from owncloud/fixing-3830-master
      Merge pull request #3894 from owncloud/ie8_compatibility_fixes
      typo
      no ?> at the end of a file
      Merge pull request #3903 from owncloud/nonpublic-uploading
      rename can cause mtime change - invalid assert
      Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
      Merge pull request #3775 from owncloud/test_fixes_for_dbschema
      Merge branch 'master' into convert-oc_config
      use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
      Merge pull request #3748 from owncloud/fixing-3740-master
      on unit test use @expectedException
      handle anonymous upload to reshared folder
      no anonymous upload on files only folders
      no anonymous upload on read-only folders
      fixing Notice: Undefined index: isPublic
      get the real physical folder name for anonymous upload
      php 5.3 compliant now
      proper fix for getting the shared item if no user is logged in
      Merge branch 'master' into fixing-3934-master
      adding tipsy to the upload button showing the max upload and restoring client side upload size validation
      fixing === and ident
      Merge pull request #3957 from owncloud/config-glob-fail
      on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
      Merge pull request #3958 from owncloud/fixing-3933-master
      Merge pull request #3955 from owncloud/cache-scanner-test
      Merge pull request #3951 from owncloud/fixing-3936-master
      Merge branch 'master' into fixing-3942-master
      removing unused getSharedItem()
      fixing check if public share is a folder or not
      Merge pull request #3946 from owncloud/fixing-3942-master
      Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
      Merge pull request #3977 from owncloud/enable_oracle_in_autotests
      - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
      Merge branch 'master' into googledrive
      Merge branch 'master' into ext-fs-irods-master
      incorporate development branch of  ssh://irodsguest@code.renci.org/gitroot/irodsphp
      update .gitignore
      update copy right
      Merge branch 'master' into ext-fs-irods-master
      new admin setting added which allows to turn off anonymous uploads
      in case the encryption app is enabled we cannot yet allow anonymous upload
      fixing Undefined index: publicUploadEnabled
      No admin option to enable public upload in case encryption is enabled
      Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
      Merge pull request #3487 from owncloud/basic_auth_hack
      rename README
      initial markdown verions of README
      Use EXECUTOR_NUMBER in database name and user name.
      Merge pull request #4075 from owncloud/markdown-readme-master
      Merge branch 'master' into ext-fs-irods-master
      fixing / adding comments
      Merge pull request #4067 from owncloud/fixing-tests-win32-master
      Update build.xml
      Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
      Merge branch 'master' into parallel-autotest.sh-master
      parallel execution support for mysql added
      pgsql support added
      don't rely on admin user but create a test user for Test_Encryption_Keymanager
      Merge pull request #4119 from owncloud/external-storage-status
      fixing typos, PHPDoc and missing namespace \
      Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
      Merge branch 'master' into disable-anon-upload-master
      Merge branch 'master' into parallel-autotest.sh-master
      Merge branch 'master' into ext-fs-irods-master
      Merge branch 'master' into disable-anon-upload-master
      Merge pull request #4045 from owncloud/disable-anon-upload-master
      Merge pull request #3142 from owncloud/ext-fs-irods-master
      Merge pull request #4126 from owncloud/parallel-autotest.sh-master
      Merge branch 'master' into delete-fix
      Merge pull request #4090 from owncloud/cleanup-some-template-functions
      Merge branch 'master' into storage-test-cleanup
      Merge branch 'master' into groups
      Merge branch 'master' into more-themable-strings
      fix php syntax
      Merge pull request #4176 from owncloud/fixing-broken-master
      update 3rdparty repo
      Merge pull request #4216 from owncloud/clean_php55_opcache
      adding unit tests for OC_Util::basename
      Merge branch 'master' into oc_preview
      Merge branch 'master' into fixing-testGetById-master
      adding test case with no /
      fixes #4026
      Updating to the latest 3rdparty master commit
      Merge pull request #4227 from owncloud/fixing-testGetById-master
      use tmpfs at /dev/shm to speedup unit test execution
      Merge pull request #4225 from owncloud/better-404
      adding new cli script to rescan files
      Merge pull request #4287 from Takuto88/language-config
      adjust usage text
      more verbose printouts - fixing execution
      remove cli check
      Merge pull request #4299 from owncloud/simplify-db-transaction
      add new line to generated php code
      PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction
      another new line
      unit tests for plural translations added
      return plural form in ajax translations
      initialize $plural_form_string with English default
      adding proper evaluation of plural form - uses LGPL licensed code of jsgettext
      fixing PHPDoc
      add 'logdateformat' to config.sample.php
      fixing PHPDoc
      Merge pull request #4228 from owncloud/fix-3836
      Merge pull request #4308 from owncloud/fix-4194
      Merge pull request #4293 from owncloud/config-date
      Merge pull request #4285 from owncloud/scan-files-script-master
      remove unneeded vars from unit test
      use isset to prevent undefined index
      adding executable script occ (ownCloud console)
      Merge pull request #4319 from owncloud/fixing-undefined-index-mtime-cache-scanner-master
      fixes #4343
      Merge pull request #4340 from owncloud/true-false-as-filename
      adding unit tests to determine length
      adding unit tests for quota checks
      fixing typos and PHPDoc
      adding test case for a numeric value
      Merge pull request #4363 from owncloud/fix-4355
      Merge pull request #4372 from owncloud/allow_empty_configvalue
      Merge pull request #4304 from tripflex/lostpw-themed
      no files external for SMB on windows
      fixing call to join
      fixing all broken translation files
      Merge pull request #4443 from owncloud/remove-jplayer-from-core-css
      Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
      Merge branch 'master' into mimetype-defaults
      communicate size of newly created file back and update UI
      tixing width and position of wider error messages
      updating 3rdparty repo commit
      initial import of appframework
      remove ru_RU - fixes #3135
      Merge pull request #4480 from owncloud/remove-ru_RU-master
      Merge pull request #4476 from owncloud/doc-on-master
      Merge pull request #4471 from owncloud/password-icon
      Merge pull request #4339 from owncloud/mimetype-defaults
      update 3rdparty submodule
      moving Dropbox and smb4php 3rdparty code over to the apps
      pulling in 3rdparty submodule
      update 3rdparty - openid moved
      3rdparty submodule update: getid3 removed
      update 3rdparty submodule
      update 3rdparty submodule - timepicker removed
      fixing undefined js error
      fixing error page layout
      fixing require path
      adding file templates for ods, odt and odp
      Merge pull request #4510 from owncloud/f_e_webdav_urlencoding
      Merge pull request #4512 from owncloud/readdir-strict-equals
      fixing require to Pimple
      there is no HttpMiddleware
      fixing broken test
      typos & unused var fixed
      Introducing IContainer into public api
      Introducing IContainer into public api
      Introducing IRequest
      controller reuses IRequest methods
      reducing controller annotations to:
      kill superfluent classloader from tests - this approach might be of interest within the apps
      cleanup of tests
      initial setup of the server container
      typo
      moving response classes over to OCP
      introducing OCP\AppFramework\App
      remove duplicate code
      additional readdir check in mappedlocal
      Merge branch 'master' of github.com:owncloud/core
      fixing typos
      Merge pull request #4537 from owncloud/no-realpath
      Merge branch 'master' into fixing-4343-master
      lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
      Merge branch 'master' into appframework-master
      as a quick example the public contacts API has been ported over as a service hosted within the server container
      adding translations to update events
      webdav quota now displays the same values as the web interface does
      storage information is path specific
      kill zh_CN.GB2312
      revert debugging code which accidentially entered this pull request
      backport of #4357 to master
      no duplicate declaration of appLicense + camelCase
      fixing typo
      Merge pull request #4615 from owncloud/npm-modules
      Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
      Merge pull request #3926 from owncloud/improve_filesummary
      webdav quota information contains the values for used and free - not total
      fixing typo
      Merge pull request #4643 from owncloud/touch-newfile-hook
      Merge pull request #4592 from owncloud/fix-logic
      Merge branch 'master' into appframework-master
      fixing file header
      Merge pull request #4022 from owncloud/oc_preview
      PHPDoc added to existing interfaces
      move new interfaces into lib/public and OCP
      Merge branch 'master' into rename-lostpassword-controller
      Merge pull request #4683 from owncloud/publicuploadjserror
      fixing style, var name & PHPDoc
      Merge branch 'master' into appframework-master
      adding public interface for preview
      Revert "fixes #4574"
      Merge pull request #4772 from owncloud/preview_improvements
      Merge pull request #4757 from owncloud/deleteAll-alias
      Merge pull request #4647 from owncloud/fix_4619
      removing ?> followed by whitespaces
      removing all ?> jutt in case
      use \OC::$session instead of $_SESSION
      proper test for use_logon_credentials
      Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master
      fixing boolean handling
      never hack late night
      no further comment - which dev did not test this BEFORE submitting the pull request?
      adding icons for shared folders and external folders
      move icon generation logic out of the template
      remove unused $relativePath
      added determineIcon to \OCA\files\lib\Helper
      adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
      Merge pull request #4719 from owncloud/port_4701_master
      adding TB and GB to OC_Helper::humanFileSize
      remove unused OC_L10N
      Merge pull request #4840 from owncloud/adding-tb-master
      fixing no-repeat for IE8
      calling replaceSVG() to display breadcrumb images correctly on IE8
      fixing breadcrumbs on ajax loading of files
      update file summary on ajax file list load
      Merge branch 'master' into appframework-master
      Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
      - giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
      Merge pull request #4712 from owncloud/fileapi-foreward
      Merge branch 'master' into appframework-master
      Merge pull request #4501 from owncloud/ajaxfilelist
      Merge pull request #4853 from owncloud/external-shared_mimetype-icons
      adding null check on a mount's storage
      Merge branch 'master' into appframework-master
      first log the exception
      adding getRootFolder() to server container and hooking up the new files api
      /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
      Merge pull request #4862 from owncloud/db_to_public
      Merge pull request #4838 from owncloud/refactor_upload_js
      adding size() to the file cache
      returning the number of stored bytes in store() and adding cleanup() method
      adding detection of aborted uploads
      recreate an etag within the scanner if the cache contains an empty etag
      Merge branch 'master' into fixing-4866-master
      etag changes are now propagated up the file tree
      adding interface for middleware
      class files have to be lowercase
      Merge branch 'master' into appframework-master
      fix naming
      use \OC::$server->getPreviewManager() instead of \OCP\Preview
      in case the cache cannot be initialized within the autoloader we just shoul not use it
      using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller
      add permissions of the file to the json response
      Merge pull request #4888 from owncloud/public_session
      store the permissions retrieved via ajax within the dom element
      remove file action elements before recreating them
      updating php docs
      Merge pull request #4886 from owncloud/public_cache
      Merge branch 'appframework-master' into vcategories_public
      fixing namespaces and rename hasCategory to hasTag
      no file actions during upload
      adding comma to get cleaner diffs in the future
      fixing syntax error - it it that hard to test own code?
      fixing typos and l10n
      Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
      Merge branch 'master' into fixing-4488-master
      Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
      when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
      setting a default on filecache column unencrypted_size
      fixing typos
      fixing PHPDoc
      fixing typos + adding missing filed $activeEntry
      PHPDoc & get UserManager from container for RooFolder
      Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
      Merge pull request #4327 from owncloud/scanfile-remove
      Merge pull request #4950 from owncloud/fix_preview_shared_folder
      Merge pull request #4869 from owncloud/fixing-4866-master
      handle error situation of rename proper
      Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent
      fixing namespaces and rename hasCategory to hasTag
      Merge pull request #4917 from owncloud/scan-clear-permissions
      Merge pull request #4930 from owncloud/fix-apps-settings
      adding PHPDoc comments to getBackend
      adding privilege check on move and rename operations
      adding file_exists check just to be on the save side
      duplicate code :sigh: - will fix this in a second pr
      adding error handling on file_put_contents within the web dav implementation
      unify duplicate code
      creating non static getETagPropertyForPath()
      adding basic unit test for failing file_put_content operation
      Merge pull request #4898 from owncloud/server_folder_methods
      add error message to the assert
      Merge branch 'master' into appframework-master
      AppFramework:
      class API decommissioning part 1
      stripos return value check
      Merge pull request #4968 from owncloud/user_checkpwd
      collect coverage for all databases again - ci.owncloud.org has more RAM available
      Merge pull request #4989 from owncloud/coverage-for-all-master
      fixing copyright and add class documentation
      $path already contains the full path to the file
      remove unneccessary code
      adding unit tests
      expect unlinkto be called
      Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
      Merge pull request #4892 from owncloud/vcategories_public
      adding unit tests for ObjectTree::move()
      catching NotPermittedException and throw it to the dav client as 403
      run unit tests for apps as well
      Merge pull request #4991 from owncloud/enc_fix_warning
      prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
      Remove $RUNTIME_NOAPPS - setting to false was not enough
      remove unused setUp()
      code cleanup
      Merge pull request #4207 from owncloud/search_shared_files
      Merge branch 'master' into appframework-master
      fixing error in initialization of TagManager
      delay middleware registrations
      Merge branch 'master' into appframework-master
      initialize $middleWares
      Merge pull request #5031 from zimba12/master
      Merge branch 'master' into appframework-master
      Merge pull request #4960 from owncloud/fixing-mirall-1014-master
      - adding unit test testGetShareFromUnknownId()
      flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted
      Merge pull request #3563 from evgeni/curl-no-timeout
      Merge pull request #4969 from owncloud/fixing-4043-master
      Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
      fixing PHPDoc & typo
      Merge branch 'master' into fixing-4546-master
      Merge branch 'master' into appframework-master
      Merge branch 'master' into fixing-4011-master
      remove commented code
      adding test testSimplePutFailsOnRename()
      Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master
      Merge branch 'master' into fixing-4011-master
      Merge branch 'master' into fixing-4546-master
      Merge pull request #4459 from owncloud/appframework-master
      move the private namespace OC into lib/private - OCP will stay in lib/public
      reorganize file in lib
      Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
      Merge branch 'master' into channels
      use public api for session access from server container
      Merge branch 'master' into lib-private-master-2
      Squashed commit of the following:
      use $defaults instead of $theme
      Merge pull request #5026 from owncloud/channels
      Merge branch 'master' into lib-private-master-2
      adding getCurrentUserId() to ApacheBackend
      Merge branch 'master' into fixing-4620-master
      Merge branch 'master' into apache-auth-master
      Revert "use $defaults instead of $theme"
      $defaults is not necessary here - merge artifact
      code cleanup - remove special case for webdav in handleApacheAuth()
      adding warning about failed apache module auth
      adding PHPDoc comment
      Merge pull request #5071 from owncloud/fix-autoloader-master
      only perform files upgrade in case there are actually entries in the old fscache table
      remove obsolete function login()
      fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
      fixing various PHPDoc comments
      Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master
      Merge branch 'master' into sharing_mail_notification_master
      Merge pull request #5107 from owncloud/user_skeleton
      Merge branch 'master' into fixing-4011-master
      upload abortion detection only for PUT
      remove outdated translation files
      move l10n factory into private
      update version to 6.0.0 and adding comment option
      move call to print_unescaped() to template
      Merge pull request #4974 from owncloud/fixing-4011-master
      adding additional exceptions for special cases where creating a file might not be allowed
      Merge pull request #5072 from owncloud/apache-auth-master
      the path for reassembling was created the wrong way
      Merge branch 'master' into fixing-4546-master
      moving createFileChunked() to OC_Connector_Sabre_File
      adding check isDeletable() on $sourcePath
      catch exceptions while uploading and pass on the error message
      catch specific file exceptions and convert them to proper http status code via webdav
      Merge pull request #5194 from owncloud/fixing-5172-master
      fixing status code and formatting
      fixing php 5.3 compatibility
      Merge pull request #5188 from owncloud/master-delete-user
      php 5.3 compatibility for \OC\Files\Storage
      php 5.3 compatibility for Test_Files_Sharing_Api
      php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
      Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
      due to internal implementations touch will always be successful - $mtime will be stored in the cache
      the path need to be normalized before putting it into resolvePath()
      Merge pull request #5207 from owncloud/fixing-4011-part2-master
      Merge pull request #5301 from owncloud/versioning_preview_shared
      Merge pull request #5287 from owncloud/core-layoutviewportdirective
      Merge pull request #5272 from mrflix/master
      Merge pull request #5303 from owncloud/fix-unlogged-session-error
      Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
      Merge branch 'master' into fixing-4546-master
      Merge pull request #4867 from owncloud/fixing-4546-master
      streamCopy() should return proper structure.

Thomas Tanghus (164):
      Merge pull request #2417 from owncloud/trash_more_error_logs
      Add indexes and primary keys.
      Revert "Add indexes and primary keys."
      Add indexes and primary keys.
      User list: Avoid dupes and better sorting. Fix #2420
      Add hashed version parameter to js and css. Ref #1520 and many more ;)
      User list: Keep array of available groups. Should fix #873
      Properly prepare insertIfNotExist queries.
      Quote key for SQLite.
      D'oh, why concatenate static strings.
      Missing backticks. Thx @Raydiation :)
      Double quotes to backticks
      And removing an irrelevant comment ;)
      Merge pull request #2567 from owncloud/fix_insertIfNotExist
      Allow purging multiple objects from category index table.
      Typehint and check $ids parameter.
      Don't try to call a an array :-P
      Remove redundant line
      Merge pull request #2732 from owncloud/sane_version_param
      Move compatibility functions to compatibility.js and add two more.
      Add octemplate jQuery plugin
      Merge pull request #2767 from owncloud/js_compatibility
      Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
      StringProperty unittest
      Merge pull request #2815 from owncloud/default-quota
      Merge pull request #2896 from owncloud/app-enable-fix
      Updated docs.
      Merge pull request #2769 from owncloud/octemplate
      Merge pull request #2746 from owncloud/use-count-userexists
      Remove not null constraint. Fix #2976
      Let autoloader resolve paths under apps lib directory.
      Added explanation
      Merge pull request #3010 from owncloud/fix-cookie_path
      Merge pull request #2993 from owncloud/resolve_apps_lib_path
      Merge pull request #3126 from owncloud/json-utf8
      Add compatibility function for outerHTML
      Merge pull request #3177 from owncloud/outerHTML_compatibility
      disable mbstring.func_overload
      Use new autoloader class
      disable mbstring.func_overload in setup
      Add Contacts repo to CONTRIBUTING.md
      Add Compound property to avoid double escaping values.
      Port OC.dialogs to use octemplate except for prompt() and form().
      Port OC.dialogs to use octemplate except for prompt() and form().
      Line length etc.
      Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dialogs_oc_template
      Various cleanups in OC.dialogs
      Dialogs: Make slug show last dir emphasized.
      Dialogs: Loose up-button.
      Dialogs: Cleanup.
      Dialogs: Fix method names.
      Dialogs: Home folder icon instead of '/'.
      Don't set image path in template.
      Remove more obsolete code.
      Add rename() method to OC_VCategories.
      Remove debug output
      Add test for renaming non-existing category.
      Hack base.php to make Basic Auth work
      Merge pull request #3495 from owncloud/file_encryption_util_is_error
      Merge pull request #3533 from owncloud/signature-delimiter
      Clean up hack.
      Revert "Clean up hack."
      Cleanup hacke v.2
      Speed up octemplate rendering.
      Forgot typeof condition
      Update to jquery.multiselect 1.13
      Replacement for jquery.dialog to fit better with ownCloud design.
      Let the content determine overflow.
      Catch double destroy on escape.
      Set default button in oc-dialogs
      Merge pull request #3578 from owncloud/ocdialog
      Forgot the css.
      Move comment and set requesttoken.
      Merge pull request #3679 from owncloud/multiselect-fixes
      Merge pull request #3576 from owncloud/jquery.multiselect-1.13
      Set path in cookie.
      Merge pull request #4284 from owncloud/dont_fatal_on_is_file
      Fix octemplate string escaping.
      Port DAV groupMemberSet fix to master #4458
      Cache Object.keys(this.vars)
      Merge pull request #4434 from owncloud/fix_octemplate_escaping
      Use provided mimetype on open. Fix #4696
      More trimming
      Fix setting ocdialog options after initialization.
      Remove console logging
      Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
      Don't popup meaningless alerts when dialog called on page leave
      Fix double destroy on escape.
      Remove test error :P
      Save two lines
      Merge pull request #4784 from owncloud/ocdialog_option_setter
      Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
      Merge pull request #4806 from owncloud/oc-dialogs-pageleave
      Add OCP\DB::getErrorMessage() to public namespace.
      OC_Cache namespace changes and add UserCache to server container.
      Add legacy wrapper
      Add interface for Session and add getter in server container.
      Purge session from Request - and fix some styles
      Still some session leftovers.
      Merge branch 'appframework-master' into vcategories_public
      OC_VCategories=>OC\Tags. Public interface + getter in server container
      Add some docs to the sessions interface.
      Add getUserFolder/getAppFolder to Server.
      Update to adhere to the coding guidelines.
      Use new emitter system
      Merge branch 'appframework-master' into public_cache
      Don't try to be clever
      Note to self: Test before pushing!!!
      Note to self 2: Do as you preach. Test!
      Updated method names and added a few more tests.
      Merge branch 'appframework-master' into server_folder_methods
      Fix syntax error
      Add another test.
      Added more error checking in add()
      Forgot to return false if add() didn't add anything.
      Use fetchOne() instead of numRows() when doing a COUNT(*).
      Moar tests.
      Merge pull request #4928 from owncloud/interfaces
      More trimming
      OC_VCategories=>OC\Tags. Public interface + getter in server container
      Updated method names and added a few more tests.
      Add another test.
      Added more error checking in add()
      Forgot to return false if add() didn't add anything.
      Use fetchOne() instead of numRows() when doing a COUNT(*).
      Moar tests.
      Fix conflict
      Add getUserFolder/getAppFolder to Server.
      Don't try to be clever
      Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
      Remove duplicate method definitions
      Add factory class for the server container.
      Check if accessor matched request method.
      Add patch method to OC_Route
      Add interface docs to IRequest.
      Implement PUT an PATCH support
      Check if accessor matched request method.
      Add patch method to OC_Route
      Add interface docs to IRequest.
      Implement PUT an PATCH support
      Add assertions for ->params and array access with json
      Remove JSON request parsing from Server
      Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
      Remove getContent() from IRequest
      Check if accessor matched request method.
      Add patch method to OC_Route
      Add interface docs to IRequest.
      Implement PUT an PATCH support
      Add assertions for ->params and array access with json
      Remove JSON request parsing from Server
      Remove getContent() from IRequest
      Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
      Modified PUT behaviour
      Fix POST decoding
      Fix fix of POST :P
      JS version of the OCP\ITags interface
      Remove obsolete files.
      Fix typo
      It's 'status', not 'result'!
      Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories_to_tags
      Make abstract Middleware class public
      Merge pull request #5116 from owncloud/interfaces2
      Remove misleading IMiddleware interface
      Merge pull request #5133 from owncloud/js_vcategories_to_tags

Tom Needham (34):
      Add new /cloud/capabilities route and remove unused methods
      Add <syncpollinterval> and order the result for /cloud/capabilities
      API: Remove api response structure from OC_OCS_Result, handle multiple registered methods for api calls
      Remove app related values and change structure of /cloud/capabilties call
      Merge master
      Fix merge conflict
      Change strucutre of cloud/capabilities response
      Remove accidental inclusion of apps repo.
      Add capabilities exposure to the versioning app
      Merge branch 'ocs_capabilities' into ocs_multiple_methods
      Use OC_User::isAdminUser() in lib/api.php
      Merge in master
      Fix api result merging.
      Remove debug call, correct app identifier
      Change capabilities exposure for files_versions since it extends files
      Code style and remove OAuth code
      more code style
      Add further capabilities to /cloud/capabilitites api call
      Rebase to current master
      Merge in master
      Merge pull request #1584 from owncloud/ocs_multiple_methods
      Make class properties protected instead of private to allow subclassing
      Correct the api response when both a shipped app and/or a third party app fail
      Use correct variable when checking auth
      Change app identifier for core api routes
      Code style for ocs/routes.php
      Fix typo
      Merge pull request #3216 from owncloud/fix-api-3rdparty
      Add quota to core api
      Code style
      Log the session exception when ownCloud is not installed
      Handle ownCloud logging when data dir not created
      Include exception message in log entry when session fails to start
      Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error

Valerio Ponte (3):
      fixed typo that broke xsendfile
      fixed xsendfile zip generation race condition
      final fix for xsendfile zip generation race condition

VicDeo (13):
      Remove leading and trailing backslashes in classname. Ref #2310
      Remove space before parethesis
      Merge pull request #3855 from owncloud/fixing-3853-master
      Merge pull request #3899 from owncloud/encryption_check_php_version
      Merge pull request #3943 from owncloud/encode_uri_component
      Merge pull request #4076 from owncloud/fix_typos_kondou
      Merge pull request #4071 from owncloud/fix_return_value_search_principals
      Merge pull request #4798 from owncloud/fixing-variable-typos-master
      Merge pull request #5131 from owncloud/fix-5130
      Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
      Merge pull request #5184 from owncloud/fix-trash-bin-button
      Merge pull request #5221 from owncloud/fixing-5217-master
      Merge pull request #5263 from owncloud/fixing-5255-master

Victor Dubiniuk (32):
      Init dummy session first
      Replace display name only
      Hide a ghost image on the apps management page
      Add fallback for svg app icons
      Use svg to png fallback on demand only
      Fix lazy styles loading in IE8
      Fallback to border instead of box-shadow
      Do not add groups if user has no groups
      Implement encodePath
      Migrate to encodePath
      Encode current trashbin directory
      Add unit test
      General fixes
      Show generic error when there is no error
      Create an array entry before filling it
      Explicit ie8 fallback
      Allow apps to have own 404 content, closes #3225
      Move styles from core to app
      Rewording
      Replace delete icon with spinner
      Use default cursor for list items
      Some styling to user list
      Better ie8 multiselect
      Fix autoloader regression
      Load all mimetypes in one go
      Make mimetypes static. Jenkis will be happy
      Check result only once
      Fix new user avatar. Ref#5166
      User::delete should return bool
      Add unit tests
      Show advanced section on error. Fixes #5191
      Improve expand/collapse logic

Vincent Petry (55):
      Fixed public upload error that prevents upload
      Fixed missing checkboxes in IE8
      Ajax calls for "files" and "files_trashbin" apps
      Added missing "files" JS to files_trashbin module
      Fixed ajax support to also update the current dir permissions
      Changed breadcrumb event handling to not use delegate
      Fixed JS error in trashbin app
      Fixed loading mask/spinner to stay fixed on scroll
      Use hash part of URL for IE8 in files app
      Fixed files_trashbin to also use hash URL part for IE8
      Replace plus sign with space in files app URL #4932
      Added dateOnly argument to relative_modified_date
      Removed stray debug log write
      Fixed syntax error in array
      Added backup for config.php in autotest.sh script
      Added unit tests for relative_modified_date, changed method signature
      Fixed missing default values
      Shortened notification message that was too long
      Fixed array syntax to work with PHP 5.3
      Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
      Removed $fromTime argument from public template API
      Merge pull request #5087 from owncloud/templatefunction-relativedate
      Do not call changeDirectory() when no dir set on breadcrumb
      Fix breadcrumb to reinit dnd after ajax nav #5064
      Prevent scroll up when click on links in sharing dropdown
      Fixed label for sharing notification to be clickable
      Prevent share dropdown to close too early with autocomplete
      Added isPublic flag in files_sharing template
      Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
      Added filesApp flag as input field for files app detection
      Fixed login warning style #5065
      Merge pull request #5183 from owncloud/login-warningstyle
      Merge pull request #5134 from owncloud/trashbin-homeiconbroken
      Fixed external storage status indicator in admin page
      Fixed files view regular file actions in IE8
      Fixed delete icon alignment in IE8
      Fixed display name change for IE8
      Now using smaller spinner image for status indicator
      Fixed viewport layout using commas instead of semicolons
      Moved IE8 inline styles in files.css
      Fixed IE8 misaligned date
      Fixed table grid styles for IE8
      File actions are now updated after create/upload file
      Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
      Merge pull request #5302 from owncloud/files-missingfileactionsafteradd
      Fixed position of "delete" icon in files app
      Merge pull request #5320 from owncloud/fix_app_sorting
      Added missing "grid" class on external storage's table
      Removed extra bkg color on file actions when row is selected/hovered on
      Fixed file permissions after public upload
      Disabled ajax mode for public files view
      Merge pull request #5330 from owncloud/files-removedfileactionsbkg
      Merge pull request #5341 from owncloud/fix-logout-link-html
      Prevent renaming/deleting mount points
      Merge pull request #5350 from owncloud/files-preventdeletemountpoint

blizzz (11):
      Merge pull request #2598 from ceri/master
      Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
      Merge pull request #3488 from zafi/master
      Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
      Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
      Merge pull request #3779 from shkdee/patch-1
      Merge pull request #4184 from owncloud/login_cleanup_oracle
      Merge pull request #4507 from owncloud/existingusersfromgroup
      Merge pull request #4672 from owncloud/ocs_cleanup
      Merge pull request #4990 from owncloud/user_fix_manager
      Merge pull request #5114 from owncloud/ldap_uuid_attr_groups

dampfklon (1):
      Make group suffix in share dialog translatable

davidak (1):
      small typo fix: added 2 whitespaces

eMerzh (2):
      Merge pull request #2147 from eMerzh/split_config
      Correct escaping

herbrechtsmeier (2):
      Overwrite host and webroot when forcessl is enabled
      request.php: add type check to the not empty check of a string

icewind1991 (34):
      Merge pull request #2951 from owncloud/no_personal_variables
      Merge pull request #3111 from owncloud/csp-audio
      Merge pull request #3112 from owncloud/markdown-mimetype
      Merge pull request #3132 from owncloud/mount-setupfs
      Merge pull request #3136 from owncloud/mount-cleanup
      Merge pull request #3044 from owncloud/backgroundwatcher
      Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist
      Merge pull request #3309 from owncloud/no_explicit_autoload
      Merge pull request #3511 from owncloud/sessionclass
      Merge pull request #3530 from owncloud/cache-mimeicon
      Merge pull request #3529 from owncloud/folder-permissions
      Merge pull request #3459 from owncloud/fix_for_2377
      Merge pull request #3051 from owncloud/backgroundjob
      Merge pull request #3561 from owncloud/user
      Merge pull request #3671 from owncloud/fix_user_creation
      Merge pull request #3764 from owncloud/scanfolder-existing
      Merge pull request #3892 from owncloud/static-streamwrapper
      Merge pull request #3963 from owncloud/update-logic-split
      Merge pull request #3978 from owncloud/forwarding-emitter
      Merge pull request #3270 from owncloud/convert-oc_config
      Merge pull request #2395 from owncloud/cache
      Merge pull request #4145 from owncloud/fix-failing-master
      Merge pull request #3995 from owncloud/groups
      Merge pull request #4181 from owncloud/irods-ob
      Merge pull request #3898 from owncloud/sabre-objecttree
      Merge pull request #4183 from owncloud/fix-group-id
      Merge pull request #4218 from owncloud/newdata
      Merge pull request #4213 from owncloud/scanning-performance
      Merge pull request #4353 from owncloud/fix_search_user
      Merge pull request #4391 from owncloud/scanner-reuse-recursive
      Merge pull request #4467 from owncloud/storage-wrapper-quota
      Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master
      Merge pull request #5247 from owncloud/hooks-view-same-start
      Merge pull request #5340 from owncloud/fixing-5251-master

infoneo (4):
      Dots in a filenames fix
      Fixed problems with a dots in a filenames
      Update mapper.php
      Update mapper.php

itheiss (5):
      Fix #2499
      Extend test case for getDefaultEmailAddress()
      Move testcase to own test function
      Update to reflect new parameter mail_domain
      fix missing ',' after "mail_domain" parameter

joel hansson (1):
      typo fix in a comment.

kondou (192):
      Fix #2693
      Fix Typo
      Refactor OCdialogs.
      Small fixes
      Make directories clickable.
      Make directories show at top.
      Fix repeating directory names.
      Translate 'Error' in core
      Make files selectable again.
      Make files _and_ directorys selectable/browsable.
      Optimize pictures with optipng.
      Remove manual mimetype checking.
      Fix OC.dialogs.form()
      Fix #2730
      Optimize svgs with scour.
      Add shellscript for optimization.
      Fix textfield label overlapping value.
      Handle empty datafolder better.
      Shorten CSS colorcodes
      Hint to default data directory
      No personal prefixes for variables.
      Priorize common languages.
      Make divider not selectable
      Use !== and === in user_ldap app – Part 1
      Use !== and === in user_ldap app – Part 2
      Improve the password reset screen.
      Fix syntax error.
      Don't split translation lines
      Oneliners, <br>, proper errors & print_unescaped()
      Fix #3095.
      Add space around checkboxes.
      Fis syntax error and add user icon.
      Sort priorized languages as defined in the array
      Fix #3251
      Update jquery to 1.10.0 & add jquery-migrate 1.2.1
      Default to localhost, if nothing is entered.
      Optimize pictures with optipng and scour
      Add a "Wrong password." message, if the password
      Show a summary as the last filelist entry
      Don't escape filesize (can contain a '<')
      Suppress warning in setup if config doesn't exist
      Use better wording.
      General CSS cleanup
      Use !== and === in files_trashbin-app
      Use isIgnoredDir()
      Use OC instead of oc to show alert at an error.
      Close.png instead of delete.png for close dialogs
      Optimize images with optipng and scour
      Include $defaults
      Fix some typos
      Use !== and === in settings.
      Merge branch 'master' into css_cleanup_kondou
      Also clean PHP 5.5 opcache
      Fix some JSLint warnings
      Fix a syntax error & have if-conds in an own line
      Add OC_Image Unit Test
      Cover more cases
      Optimize image and skip mimetype test
      Don't throw a fatal, if is_file() parameter isn't
      Add \OC_Appconfig Unittest
      Merge branch 'master' into add_ocimage_unittest
      Update skipped tests messages
      Add null and emptystring tests to check NOT NULL
      Revert "Add null and emptystring tests to check NOT NULL"
      Add unittests
      Remove pointless unittest (search/result)
      Clean up DB, after we're done with testing
      Improve app-management
      Use setUpBeforeClass() and tearDownAfterClass()
      Use setUpBeforeClass() and tearDownAfterClass()
      Proper WHERE – the table is called userid not user
      Log exception at the catching code
      Merge branch 'master' into improve_app-management
      Use plural translations
      Throw exceptions instead of only logging in \OC_Installer::installApp()
      Reword a phrase
      Clean up \OC\Util
      Remove cancel button from filepicker
      Merge branch 'master' into fix_jslint_kondou
      Fix some naming and spacing in lib/util.php
      Add _many_ newlines at the end of files
      Merge branch 'master' into improve_app-management
      Don't use an alert for displaying app-mgmt-errors
      Use appitem instead of always recreating a jquery object
      Move .errormsg from settings-css to .warning in core. Reusable!
      Merge branch 'master' into clean_up_util
      Merge branch 'master' into improve_app-management
      Fix some phpdoc and camelcase
      Use personal-password for the password name in personal.php
      Add basic avatars and gravatar
      Modularize get(), async getAvatar, avatars @ usermgmt
      Add unittests & check filetype in setLocalAvatar()
      Load avatar from path, if one's provided
      Improve styling & enable avatar-upload at personal page
      Have /avatar.php as a central avatar-point
      Show avatar on personal.php always (except if avatars are disabled)
      Use avatar.php in user-management
      Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
      Have a fancy uploadavatar button
      Several improvements
      Deny access for non-users and add a (not-working) override button
      Clean up and prepare a bit for custom default avatars
      Integrate newavatar.php into avatar.php by using GET, POST & DELETE
      Fix testDefaultAvatar
      Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
      Fix spacing, have remove() and return JSON for custom-default-avatars
      Fix avatar-unittest
      Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
      Have a controller instead ofo avatar.php and fix some cropper-design
      Clean up some cruft
      Translate "Permission denied" & use class-autoloader
      Reimplement filesummary in JS
      Continue work on cropper
      Merge branch 'master' into oc_avatars
      Use OC.Router.generate, TODO use cache, prepare for defaultavatars
      Work around #4630 to fix license showing
      Merge branch 'master' into oc_avatars
      Include placeholder.js
      Use defaultavatars
      Use OC_Cache and finish cropper functionality
      Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
      Clean up
      Fix \OCP\Avatar
      Fix #4258, clean up \OC_Image and improve its unittest
      Merge branch 'master' into oc_avatars
      Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
      Deal with OC.Router.generate()
      Fit filesummary for \OC\Preview's ne mimetype-icons
      Add a description for $.avatar() and remove TODOs @raghunayyar fixed
      Merge branch 'master' into fix_4258
      Check for $this->fileInfo and @depend on testData()
      Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback()
      Merge branch 'master' into oc_avatars
      Provide 'enable_avatars' in config.php, to disable avatars
      Fix @tanghus's complains in avatars and clean up cropper after closing with "x"
      Properly check for tmpavatar, invalidate cache, fix debug msgs
      Use \OC_Response for cache invalidation
      Also set an E-Tag header
      $image doesn't have data() when a defaultavatar should be used
      Pass setLastModifiedHeader() time()
      Merge branch 'master' into clean_up_util
      Fix some of @jancborchardt's complaints in oc_avatars
      Merge branch 'master' into oc_avatars
      Add previews to OC.dialogs.filepicker(); Fix #4697
      Don't use HTML5 <header> to support avatars in IE8
      Partly fix cropper in IE8 and don't use a dialog for it
      Fix unwanted caching in IE8
      Have the header avatar to the left of the user name
      Don't update avatar on displayNameChange anymore
      Clean up oc_avatars
      Merge branch 'master' into oc_avatars
      Remove backgroundcolor on updating avatar, and add a missing parameter
      Fix some bugs and remove \OCP\Avatar for now
      Use proper controller naming
      Have login-checks and CSRF checks
      Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
      Only use mimetype_list and clean up a bit
      Fix an IE8 bug with the avatarcropper.
      Clean up avatars and preliminary use JSON->rawlist.php
      Sort files by name, not by mimetype
      Use \OC_App for checking whether encryption is enabled
      Use usort() instead of uasort() to not maintain keys
      Split personal and user-mgmt password change logic
      Use shorter array-conversion
      Have the "notsquare" error as data, not as message
      Remove $recoveryPassword from changepersonalpassword & fix indent
      Fix language selection; Fix #4756
      Optimize triangle-e.png and triangle-e.svg
      Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
      Bring another enable_avatars to $_ and fix $thus->$this
      Split some lines, use ===, avoid unnecessary operation
      Add a comment to clear defaultavatar-functionality
      Use a controller instead of two files for changepassword.php
      Merge branch 'master' into split_personal-user_passwordchange
      Clean up rawlist.php and fix non-array request
      Merge branch 'master' into oc_avatars
      Move ajax/changepassword to changepassword/controller to use autoloading
      Improve changepassword route naming
      Remove superfluous $
      Use external and shared icons in OC.Dialogs.filepicker()
      Translate errormsgs in settings/changepassword/controller
      Fix not displaying "Upload something!" message
      Make it possible to have a different color than the username for placeholder
      Shorten optional text-argument processing
      Base defaultavatar text on displayname
      Have uniform (wrong) indention
      Fix require in apps/files/ajax/rawlist.php
      Remove require in rawlist.php
      Hide defaultavatar in #header and don't darken proper avatars in #header
      Optimize images with optipng
      Optimize confirm.[svg|png] with optipng and scour
      Fix avatar unittest

miicha (1):
      fixing mimetype for "new" ms office formats

mvn23 (5):
      Implement X-Sendfile2 for resume support in LigHTTPd
      Update files.php
      Revert most changes for testing
      Reviewed code for X-Sendfile2
      Merge pull request #3787 from mvn23/patch-1

opensaucesystems (5):
      Enable https authentication
      Enable https authentication
      Remove http:// from label and add placeholder
      Update settings.php
      Added input[type="url"] to styles.css

petemcfarlane (1):
      prefix 'tbody tr' to separate app/core css errors

raghunayyar (26):
      Initial Commit : Password Toggle Button hides if no input present
      Fixes autofill for display / hide toggle button, a better function name.
      Removes the setTimeout() method.
      Adds a fixed width to the filename to prevent horizontal scroll.
      Using max-width instead of width for filename.
      Long Application Names are ellipsis correctly.
      The Opacity for the navigation loads fine for icon and App name.
      New Password in Personal Password Page loads fine.
      Add span tag while enabling or disbling apps as well.
      Implements Toggle for Database Password.
      Clubbing Exact styles together.
      Keeping Font Colors Consistant on the headers.
      color change to crumb elements as well.
      Removes Borders from the left navigation.
      Adds Node Modules to build in gitignore for easy testing.
      File Selected on Click instead of download.
      Closes Label inside the a tag for not hiding the fileactions.
      Takes nametext inside the anchor tag to fix the issue completely.
      Uniform Styles and Indentation Fixes for Personal Block
      Removes the Bogus Label
      Puts the language divider in place. thanks @Kondou-ger ;)
      Includes <optgroup> tag
      Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167
      Fixes Default Quota Style in User Management.
      Should Display PasswordToggle Eye Everywhere.
      Removes Bogus showpassword js. thx @PVince81

ringmaster (5):
      Workaround for IE 9 & 10 for clicking filelist after adding new item
      Don't cache the pkey, skip generation if the keyfile exists
      This function doesn't cache anymore. Adjusted PHPDoc to suit.
      Allow numeric group names
      Allow "Finishing..." button on setup page to be translated.

rolandgeider (1):
      Use transifex.com on link to translations

root (3):
      Add missing backticks.
      Proper CSS comment
      Fixed things in alert-messages

runky (1):
      Update authenticate.php

sherbrecher (2):
      Update settings.php
      Merge remote-tracking branch 'upstream/master'

shkdee (1):
      Update user.php

vsapronov (3):
      autoconfig.php could have only some of parameters; installation.php generates UI accordingly
      Fixed review issues
      Moving Advanced button out of datadirField fieldset

yannickoo (2):
      No Scrolling for more than approximately 10 Applications
      Fixed typo

zafi (1):
      The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD

-----------------------------------------------------------------------

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list