[Pkg-owncloud-commits] [owncloud] annotated tag v4.5.0beta1 created (now 5e7c647)

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


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

taffit pushed a change to annotated tag v4.5.0beta1
in repository owncloud.

        at  5e7c647   (tag)
   tagging  9338d093f9bbcb8b25c088d8777f5803964570c3 (commit)
  replaces  v4.0.6
 tagged by  Frank Karlitschek
        on  Wed Aug 29 15:01:37 2012 +0200

- Log -----------------------------------------------------------------
4.5 beta 1

Alessandro Cosentino (5):
      fixes bug oc-1433
      reset version number when not specified - again bug oc-1433
      OC_App::getAppVersion return blank if version is not specified
      link of Add your app was broken
      Merge branch 'master' of gitorious.org:owncloud/owncloud

Anders Nor Berle (1):
      Comment out javascript that hides login button

Arthur Schiwon (92):
      LDAP: support for 'member' as group-member-association
      LDAP: fix wrong value for input type
      LDAP: make queries compatible also with PostgreSQL
      linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
      LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
      LDAP group backend: Set configured true when it is... fixe oc-887
      LDAP: link to documentation on settings page
      commited a bit too much before
      make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863
      load authentication apps before checking wether user exists. fixes oc-910
      make groups not static, fixes oc-919
      LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
      avoid too-early database access and thus make owncloud installable again
      ldap: check index carefully, can be 0
      ldap: correct query condition and determining of success
      ldap: remove unused private functions
      ldap: enable the destructor
      LDAP: cache the results, reduce LDAP searches
      Sharing, fix: connect to hooks from the correct classes
      typo in var
      ldap: check array for emptiness, not nullness
      LDAP: offer config option for Group Display Name attribute
      reverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1, differs between OC3 and 4
      LDAP: only map users within the User Base Tree
      forgotten $, incorrect  subtract
      bookmarks: make read later-button draggable again, fixes oc-944
      make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
      LDAP: cheaper userExists() implementation
      remove unnecessary closing PHP tag
      LDAP: always sanitize DN and DN-containing attributes
      LDAP: cheaper userExists() implementation, fixes oc-1012
      fix syntax error after merge
      LDAP: compare base trees case insensitively
      LDAP: reset resource on failed bind
      provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8
      LDAP: make it UTF-8 save
      define an interface for the User Backend
      define an interface for the Group Backend
      LDAP: pass user backend as instance, not classname
      Offer User and Group interfaces in public API
      remove only internally used function from interface
      LDAP: switch user backend from extending class OC_User_Backend to implementing OC_User_Interface for improved flexibility
      Support for OCA namespace
      Support for OCA namespace
      LDAP: put app under the OCA\user_ldap\ namespace
      provide recursiveArraySearch as Helper function and make available through API
      LDAP: group backend now implements the interface, does not inherit backend class
      method not used externally, thus not needed in interface
      LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly.
      LDAP: silence warning, but handle the error
      LDAP: adjust test after refactoring
      code style
      code style
      remove unnecessary debug output
      code style
      code style
      LDAP: remove obsolete require_once
      code style
      LDAP: remove debug output
      code style
      LDAP: replace deprecated constant
      LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
      code style
      LDAP: some cleanup
      LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
      LDAP: add Test Configuration functionality in the settings
      LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
      Show Login-Button when user+pw are autocompleted, fixes oc-1068
      LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302
      add missing \
      LDAP: check for always available attribute on userExists, fixes oc-1440
      remove accidentally added blank lines
      LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only.
      LDAP: layout settings form. Hope it is now a bit clearer and prettier.
      LDAP: don't give Test Connection button red background on fail, it is becoming unreadable
      adjust LDAP to updated interface
      LDAP: adjust getGroups to updated interface
      LDAP: adjust usersInGroup to updated interface
      Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
      LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item.
      LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs.
      LDAP: bg jobs: sane default refresh interval
      LDAP: make refreshInterval for background jobs configurable in the DB
      LDAP: fix potentially unavailable LDAP resource, which can prevent successful login
      LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens).
      Show Login-Button when user+pw are autocompleted, fixes oc-1068
      LDAP: sanitize base, user and group trees. fixes oc-1302
      Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
      OC_User: getHome is an optional method, taking it out of the Interface
      LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected.
      LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use
      LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master.

Bart Visscher (187):
      Start of audit app
      Audit: Add user login/logout logging
      Audit: Log messages with separate function
      Audit: Log sharing actions
      Implement default functions in OC_User backend
      Implement default functions in OC_Group backend
      Whitespace fixes
      Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT
      Gallery: Use App storage instead of contructing our own path
      Remove DOCUMENTROOT static var, and make SUBURI var private
      Template: Make getFormFactorExtension function public
      Template: Fix var name
      Combine and minimize core and default app css files
      Combine and minimize core and default app js files
      Fix empty jsfiles and cssfiles in layout template
      Whitespace fixes
      Remove unused L10N variable
      Calendar: small cleanup of import progress writing
      Remove OC_App::register function
      Calendar & Contacts: Store import progress in OC_Cache
      Fix newline in code
      Merge branch 'unstable'
      Tasks: styling fixes
      Load apps before minimizing the core css and js
      Move setting remote_core.* to after setup of OC, also check if it is not set yet
      Make check for writable apps dir configurable
      Fix remap dir for CSS minimizer
      Spelling fixes in XCache files
      OC_Cache_File ttl=0 indicates forever, but expire in a day to keep the cache clean
      Skip test for XCache when the module is not there
      Add OC_Cache implementation for APC
      Add layer to select fast or slow cache for storing values
      Better handling of core.css and core.js
      Add help texts to config options in config.sample.php
      Use the default parameter of OC_Config::getValue to set defaults
      Gallery: Fix database creation on update, also only from version less then 0.5
      Comment layout and spelling fixes
      Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
      Add cache for getStorage and getInternalPath functions.
      Smarter code for OC_FileProxy
      Don't use substr to get first char of string
      Check for missing path_info, also use OC_Response for 404 error
      Tasks: Use POST for ajax calls that change data
      Calendar: remove unused markup from #controls
      Gallery: remove extra include of lib/base.php
      Tasks: Fix resizing of the content part
      Calendar: Make button of #datecontrol_date
      Calendar: Clicking #datecontrol_date gives datepicker to jump to date
      Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts
      CSSMin: Remove debug code
      Whitespace fix
      Add app for logging access to shared files
      Disable minizing when DEBUG is true
      Load app before running update script
      Optimize WebDav access using OC_FileCache
      Use setter for FileinfoCache
      Fix webdav property name compare
      Spelling fix
      Optimize WebDav access by preloading dav custom properties
      Remove $DOCUMENTROOT, not used
      Merge commit 'refs/merge-requests/121' of git://gitorious.org/owncloud/owncloud
      Calendar: Write-close session to enable parallel events.php requests
      Add session_write_close to the minimizer
      Only check for apps owncloud version requirment when there is a new owncloud version
      Be smarter when checking single app language availability
      Cache the minimized output also on the server
      Forgot a file
      Fix errors for minimizer
      Allow apps to load before login, needed for user_openid
      Move formfactor code to OC_Template
      Move page layout handling to its own class
      Prepare template js and css functions for use in the js and css minimizers
      Use TemplateLayout functions for finding js and css files in minimizer
      Delay loading of translations until they are used
      Remember result of OC_User::isLoggedIn, can be very expensive to check
      Move check code from setupFS to checkServer
      Remove OC::$CONFIG_DATADIRECTORY, not used
      Small code reorder
      Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
      Delay setup of FS until OC_Filesystem is used
      Prefer requested app before redirecting to default page
      Merge branch 'audit'
      Merge branch 'shared_log'
      Gallery: Move code/js/css from main template to the right place
      DateTime objects are directly comparable
      Tasks: Fix position of the summary input
      Tasks: Use list label for ordering by list
      Tasks: Add delete action
      Calendar: Fix missing template parameter 'shared' for new and update calendar
      Calendar: Missing userid in allCalendars call
      Calendar: convert choosecalendar.rowfields template from plain php to html+php
      Calendar: Fix caldav url encoding
      Contacts: Fix name and carddav-url encoding
      Spelling fixes
      Convert OC_L10N_String to a string in OC_JSON::encodedPrint
      More session_write_close
      Fix initialization of OC_Filesystem setup from DAV
      Add compatability function for APC cache
      Simplify search result js code
      Gallery: Fix opening folders with a ' in the name
      Merge resource error-suppressing fix
      Spelling fixes
      Cache: Create global cache in OC_Cache
      Cache: Use getUserCache cache in OC_Cache
      Cache: Add APC and XCache to global cache handler
      Fix setting ETag header on cache miss
      Cache: try to set the fast cache in the Broker
      Media: Change includes in app.php to use the autoloader
      Move app upgrade check to loading of apps
      Cache result of OC_App::getAppVersions
      Check if app is enabled before loading in remote and public.php
      Documentation fix
      Basic framework for contacts sharing
      Fix recursion when running an update script
      Something like this should do it for sharing contacts
      Remove redundant code from OC_Helper::linkTo
      Remember the app root information.
      Gallery: Get all the image information for a directory at once
      Spelling fix
      Whitespace fixes
      Coding style fixes
      Increment user_openid version to load new app type
      Simplified remote.php file loading
      Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong
      More helpfull debug msg for redirectToDefaultPage
      Contacts: Fix copy&paste error
      Custom chunking support
      Add ETag support to the Sabre file connector.
      Fix parameter order in OC_Filestorage_Common->hash
      Add missing public to function definition
      Style fixes
      DRY for getting calendar timezone setting
      Tasks: Remove unused code
      Fix missing parameter decleration, thanks Jenkins :-)
      Fix oc-1163: gzdecode function not always defined
      OpenID: fix include path
      Rename functions
      Create uniqid ETag for directories
      Fix oc-1362: post_rename has no path param but newpath and oldpath
      Smarter remove of etag properties for path
      Merge branch 'master' into chunked_upload
      Chunked upload: Refactor to static class
      Chunked upload: Refactor OC_FileChunking to object
      Chunked upload: Support reusing local chunks
      Merge branch 'chunked_upload'
      audit: update appinfo to OC4
      Calendar: remove double html encoding
      Change hardcoded urls to use linkTo function
      Fix rewriting GET parameters with ? in REQUESTEDAPP
      Added function to make url absolute
      Move serverHost and serverProtocol functions to OC_Request
      Add comments the other functions in OC_Request
      remoteStorage: split auth allow template
      remoteStorage: Use OCP\\Util for redirecting for login and generating link
      Move getting the path info to OC_Request
      Decode the alternative path_info
      adjust the query generation in getItems, to use placeholders
      Add Event share backend
      Don't return error when just no sharing found
      Fix warnings and better styling
      Use new sharing API in OC_Calendar_Share::allSharedwithuser
      Remove unused RUNTIME_NOSETUPFS var
      Remove useless setting of RUNTIME_NOAPPS
      Move handling request of index.php to OC class
      Move login code from index.php to OC class
      Combine install checks in lib/base.php
      Use OC_Util::displayLoginPage and cleanup the function
      Cleanup OC::loadfile
      Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest
      Move OC::loadfile and OC::loadapp next to OC::handleRequest
      Always load when the requested file is css
      Remove checks before displaying login page
      Move login handling to OC class
      Simplify loading app php script files
      Contacts: Better parameter names in addressbook share backend
      Contacts: Check format parameter
      Calendar: update share backend using contacts backend as template
      Change image links to use imagePath function
      Remove unused gallery template
      Rewrite remoteStorage settings, remove block echo
      Calendar: remove not used style rules
      Fix webfinger documentation
      Contacts: Fix no active Addressbooks
      Calendar: remove double html encoding
      Add background job for global file cache cleanup
      Clean user cache on login
      Remember storage view in OC_Cache_File

Bartek Przybylski (23):
      git status
      new db scheme
      navigate on galleries
      use fancybox to display image preview
      aviod incorrect image size returning in gallery listing
      removing test image
      hack for file download
      replace spaces with tabs, use const and linkTo instead of static path
      adding title when fancybox is displayed
      pictures: update script and removal some all stuff
      tabs for spaces, removing thumbnail on file removal
      adding missing file
      remove old code
      adding navigation bar to gallery
      hide share button until sharing wont be fixed
      tabs for spaces, fix array key name
      removing app access check, fix title for links in tiles
      handle encrypted images files in oc_image
      add function in filesystem to strip webroot
      gallery: removing search provider for now
      fix first time image loading error
      fix variable name and undefined index notice
      check for view before trying to invoke method on object

Benjamin Diele (1):
      Check for valid LDAP-resource before querying.

Bjoern Schiessle (115):
      Don't allow user to delete, rename and re-share the "Shared" directory
      no move (rename) operation for "Shared" directory
      prevent xss attacks by manipulating text file names
      prevent xss attacks by manipulating image file names
      don't allow user to delete Shared dir via webdav and sync client (bug #774)
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      xss vulnerability fixed
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      xss vulnerability fixed
      write a warning to the log file if .htaccess is not writable instead of failing silently
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      show pictures in folder with special characters, e.g. '+'
      fixed wrong function call
      fixed var name, $filename should be $foldername
      fixed broken lines in user table
      make sure that contact data are always utf8 encoded to avoid encoding problems
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
      applied patch provided by bug #966 to fix broken user specific quota settings
      committed patch (bug #967) to add missing translations for file actions
      block slashes only for new files and new folders but not for file upload from url (bug #964)
      Label the delete operation "unshare" for files in the "Shared" folder to reduce
      urlencode link fort password reset (bug #970)
      suppress warning if /dev/urandom is not readable (bug #997)
      xss vulnerability fixed for fancybox image viewer
      debugging output removed
      fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      prevent xss attacks also if some javascript ends up in the alt-tag
      fixed bug #996: first picture in folder is repeated in the last position behaving like a directory
      fixed bug #996: first picture in folder is repeated in the last position behaving like a directory
      Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
      fixed xss vulnerability
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      escape log messages to avoid possible js execution
      don't add the "Shared"-directory size to users quota
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      ignore "Shared"-directory when calculating free space
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      quota calculation fixed
      introducing a sanitize HTML function for the internal and the public API. This
      use new sanitize HTML function
      removing sanitizeHTML() function from template.php since I moved it to util.php
      use new sanitizeHTML() function
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      use sanitizeHTML() function
      no need to escape the title
      remove unnecessary comment
      correct presentation of HTML encoded characters
      use new sanitizeHTML() function
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      check if user is allowed to edit bookmarks
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      use new sanitizeHTML() function
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      date don't change correctly in the view list (bug #973) fixed
      xss vulnerability fixed
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      xss vulnerabilities fixed
      log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)
      Only delete existing thumbnails (bug #1100)
      sanitizeHTML() has to be called later to keep the path unchanged
      typo in js statement fixed
      bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
      xss fix
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      enable highlighting of address in OSM.
      Util::formatDate() expect $timestamp as double
      no reason to strip tags at this point
      handover the correct timestamp
      delete file versions if the user deletes a file
      move hook to erase versions from deleted files to the right place
      adjust the name and/or location of the stored versions if the actual file gets moved or renamed
      use public API
      - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
      - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
      typo fixed
      webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
      wrong var name fixed
      use filesystem abstraction layer to copy file versions
      allow users to upload ssl root certificates for the webdav client
      certificate should be only visible for users
      send ca cert path to sabredav client
      disabled user upload of root certificates until sabredav client can handle them
      moved remove and rename hook to libs/hooks.php
      check if caview really exists
      use OC_Filesystem for rollback
      fixed faulty commit
      moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems
      use OC_Connector_Sabre_Client
      introduce subclassed client.php and revert changes to 3rdparty
      CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
      allow user to upload his own root certificate for secure webdav mount
      close file after write process
      webdav ssl cleanup
      remove comments around code block
      revert performance improvements in userExists() because it breaks new user creation
      replace urlencoded slash
      remove hard coded path
      create uploads directory for ssl certificates if it didn't exists
      add OCP\Files to access files
      use readfile() instead iof fopen() for file download over webdav.
      use getStorage() to get versions location
      prevent script execution during slideshow
      remember username and provide autocomplete feature
      remove second "autocomplete" statement
      adapted to new SabreDav version
      update routine to fix broken file properties in db
      quick fix for broken properties
      fix broken properties in the database
      fix for bug #1295, don't escape password reset link
      fix for bug 879 - add parent directory to file cache if it does not exist yet.
      while loop not needed because of recursive call of put()
      fix for bug 879 - add parent directory to file cache if it does not exist yet.

BlackEagle (2):
      remote.php :: use non apache-only env vars
      gallery :: display big picture according to exif

Brice Maron (55):
      Correct small style problem with task app fix #oc-689
      Add pending line in file list before trying to upload. Correct indentation
      Add error message when uploading folder or null files. ref oc-739
      Add translation for error message
      Add HEAD request management for files ajax/download.php
      Correct small typo to Crypt_Blowfish 3drparty fix oc-810
      Correct typo in last_insert_id for calendar and pg fix #oc-731
      First almost working version
      Correct installer
      Unit path and webpath, correct some more
      Correct css file inclusion
      Correct remote and public, and last occurence of OC::
      Change app path logic in templates
      Rework to fit with minizer
      Merge branch 'master' into multi_app_dir
      ReAdd possibility to load existing app folders
      Correct Minizer inclusions
      Change parameter 'web' to 'url' and take array of array in config instead of : separated values
      Add doc about multi app dir in sample config
      Add possibility to choose the installation folder
      Merge branch 'master' into multi_app_dir
      Correct sample config
      Force sanitize function to use UTF8 (for php lower than 5.4)
      Merge branch 'master' into multi_app_dir
      Correct inclusion paths
      Correct writable check for app dir
      Merge branch 'master' into multi_app_dir
      Correct usage of approot
      Do not search apps if oc is not yet installed
      Add little more doc about app folders
      Provide solution for smoother migration for apps to multi-app dir
      Fixes for multi app dir :
      Correct OC_Config writer. Use var_export (has support for array,...)
      Correct image path and apps path replacement
      Enhance hint about writable app directory
      Correct css inclusion with minimizer
      Avoid fetch ocs info if the appstore is disabled
      Correction of path looking for apps and css
      Do not close php tag on config file
      Remove references to /apps/ and correct inclusion of settings
      Try to fix the remote pbm. fix oc-1090
      Correct seq name in media songs fix oc-589
      Resolve scanning issue case comparison of songs
      Use intervals for sessions deletion with postgres fix oc-492
      Correct File cache error with postgresql
      Fix the fix about filecache and postgres
      Correct bookmark app : add through interface and remove missing css
      Prevent errors and mini enhancement of saved window in bookmarks
      Trim url and path of appsroot to have and standart type of path fix oc-1107
      Quick fix of multi app migration. Need a better solution
      Set table prefix if not set in postgresql install
      Pg setup enhancement
      Escape pg connection string on setup
      Add slash to app url if not set fix oc-1169
      Correct Postgresql connection with space in password. Work around php bug

Cornelius Schumacher (1):
      Fix URL to sources

Florian Hülsmann (9):
      prevent apps from printing output from app.php
      corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      added CSS class .headerAction
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      CSS class headerAction -> header-action
      remove trailing slash in %appswebroot% placeholder
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      fixed linkTo()

Frank Karlitschek (64):
      this is 5 pre alpha now
      add warning
      encryption is not yet compatible with ldap
      changed the default from Berlin to UTC.
      only enable compatible apps
      update copyright
      check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not
      remove not needed includes
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      don´t hardcode /tmp
      use our own serverHost call so that ownCloud works with reverse proxy servers
      more fixes
      more fixes
      fix oc-780
      fix the breadcrumb
      added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer
      don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
      correctly detect https
      fix oc-769
      try to switch magic quotes off.
      sort users and groups.  fixes oc-779
      fix propper error reporting
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      prevend a division by zero problem
      check if apps folder is writable
      add a check for pdo
      link to apps.owncloud.com
      add deprecated warning
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      comment out non working code
      more reliable host detection for reverse proxy servers
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      fix login for hosts running on port 80
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      fix wrong documentation
      add spacing lines to our awesome new sample config file. readability++
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      generate a random salt during installation and store it in the config.php. use it to salt the password hashing.
      add two csrf check calls. Review and lot´s of porting needed.
      finally fix the updater. next is an automatic updater. but this is a bit more tricky.
      apps paging is not yet implemented. increase pagesize to 100 as a quickfix
      prevent XSS
      implement a simple request token session garbage collector
      fix time call
      check if the data directory is accessible via http. Show a big security warning if yes
      work with non existing apps directory. thanks to Antonio for the hint
      close only if exist
      write sql errors into the error log for better debugging
      move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways.
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      increase the time limit again to a sensible granularity of 1 min.
      first part of the new new OCS CLOUD module. So far only quota is implemented.
      make it generic and implement a dummy call for quota set
      migrate the webapps call to ocs
      add the calls for the new keyserver. Still not connectect to the encryption system
      add impress mimetype
      A first basic presentation app based on the amazing impress.js.
      4.5 alpha 1
      4.0.7
      moved to apps repository
      restore the webdavauth app
      add deprecated warning
      beta 1
      marked as shipped app

Georg Ehrke (309):
      initial commit for OC_Exception
      Merge branch 'master' into oc_error
      Merge branch 'master' into oc_error
      filter notice and deprecated errors and write a proper error handler function
      fix merge conflicts
      Merge branch 'master' into oc_error
      fix merge conflicts
      add class for repeating events
      Merge branch 'master' into calendar_repeat
      create remote directory
      revert d251f3a994e68830095ebb263ae5fc8d83fc7c68
      Merge branch 'master' into calendar_repeat
      add functions get cached events in a specific time period
      some changes for calendar repeat class
      add first version of drop import
      Merge branch 'master' into calendar_dropimport
      some little js fixes for drop import
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into calendar_dropimport
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_dropimport
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      some changes in calendar repeat class
      Merge branch 'calendar_dropimport'
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      fix share for users with a point within their name
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      update When
      add urlencode for caldav link
      fix status
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      add button to clear calendar's cache
      add lib collection and lib scanner to media's appinfo/app.php
      a bit of work for repeating events caching
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      fix potential XSS
      some work for repeating events caching
      Merge branch 'master' into calendar_repeat
      add status
      proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      don't change events timezone and remove the DTSTART value tag
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      fix merge conflicts
      fix merge conflicts
      Merge branch 'master' into calendar_repeat
      remove buggy when
      some work on repeating events caching
      fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app
      some more work on repeating events caching
      add hooks for calendars
      add hooks for events
      Merge branch 'master' into calendar_repeat
      make use of post instead of get
      fix creation of monthly repeated events
      fix a bug in when
      increase height of event dialog
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      fix XSS in Calendar
      fix another XSS
      Merge branch 'master' into calendar_export
      fix merge conflicts
      Merge branch 'master' into oc_error
      remove include command for when
      use native sabredav functions to generate repeating events
      Merge branch 'master' into calendar_repeat
      some work on repeating events caching - basic class should work now :)
      remove insert id
      modify hooks in OC_Calendar_Object
      modify hooks in OC_Calendar_Calendar
      add hooks to connect calendar / event changes with OC_Calendar_Repeat
      some fixes for repeating events caching
      increase version number of calendar
      Merge branch 'master' into calendar_repeat
      fix bug in OC_Calendar_Repeat
      add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public
      connect OC_Calendar_repeat to events.php
      Merge branch 'master' into calendar_repeat
      fix a bug in OC_Calendar_Repeat
      add some information about repeating events caching on personal settings page
      Merge branch 'master' into calendar_repeat
      automatic cache repeating events after an update
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into calendar_repeat
      increase possible size of uri in database - fix oc-140
      increase version of calendar app to force db upgrade
      fix merge conflicts
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      fix merge conflicts
      show username of the body who shares in the summary
      fix a ui bug for calendar sharing
      another ui fix
      fix another ui bug of calendar
      Merge branch 'master' into calendar_export
      don't clean and cache calendar on every update
      fix generateEventOutput for calendar hook
      use easier parseable date to init datetime
      change some function names in OC_Calendar_Repeat
      use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
      fix merge conflicts
      create OC_Calendar_Object::generateStartEndDate function
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      remove a closing php tag in calendar
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      remove a lot of closing php tags and empty lines at a file's end in calendar app
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Revert "create OC_Calendar_Object::generateStartEndDate function"
      Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
      some little fixes for repeating events caching
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Calendar: fix modifying of end DateTime object
      Calendar: js fix
      Calendar: only run ->expand if the event is repeating
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_repeat
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      fix mimetype for cdr files - bugfix for oc 559
      make edit event form work with DateTime Property UTC
      fix a PHP Notice
      fix calendar
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      add x-webkit-speech to searchbox
      another fix for oc-1044
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      add OC_Calendar_Object::createUID()
      Merge branch 'master' into calendar_import
      Merge branch 'master' into calendar_export
      Merge branch 'master' into oc_error
      add merge calendar function and add some documentation to OC_Calendar_Calendar
      move some documentation to the right place
      Merge branch 'master' into calendar_export
      fix style of some doc
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_export
      Merge branch 'master' into calendar_export
      fix calendar export for Apple iCal - i hate bloody line ends
      some changes and more doc for OC_Calendar_Export class
      Calendar Export: replace spaces with dashes in the name of the calendar / event
      use OC_Calendar_Export for publicly shared calendars
      fix for previous commit
      some work on OC_Calendar_Import
      fix birthday calendar
      add some hooks to fix calendar sharing
      fix displaying of events
      Merge branch 'master' into calendar_import
      some more work on calendar import class
      fix merge conflicts
      Merge branch 'master' into calendar_import
      some work on (drop)import)
      some improvements for calendar export
      fix some doc
      fix documentation style
      import works now for dropimport
      Merge branch 'master' into calendar_import
      improve dropimport
      little fix for import
      improvements for dropoimport
      add algorithm to generate the calendar's text color
      fix doc for OC_Calendar_Calendar::generateTextColor()
      use light grey instead of white
      some work on calendar import
      fix a small PHP fail
      remove some whitespace
      fix a small PHP fail
      some work on calendar import dialog
      Merge branch 'master' into calendar_import
      fix encoding fail in calendar app - bugfix for oc-1194
      Merge branch 'master' into calendar_import
      fix spelling fail in code
      Merge branch 'master' into calendar_import
      some more work on calendar import
      Merge branch 'master' into calendar_import
      replace some direct links with OC.imagePath
      Merge branch 'master' into calendar_import
      add miniColors
      some more work on calendar import - new import is (nearly) done
      Merge branch 'master' into calendar_import
      Merge branch 'master' into calendar_import
      Merge branch 'master' into subadmin
      Merge branch 'master' into calendar_import
      comment out some code
      add group_admin table
      some work on subadmins
      Merge branch 'master' into calendar_import
      fix merge conflicts
      subadmins can now add users
      add another file which was missing in the previous commit
      Merge branch 'master' into subadmin
      Merge branch 'master' into calendar_import
      add warning in log if OC_L10N::tA was called
      stop using of OC_L10N::tA
      Merge branch 'master' into subadmin
      Merge branch 'master' into subadmin
      fix changepassword.php for subadmins
      remove unused code from togglesubadmins.php
      add checkSubAdminUser method to OC_JSON class
      fix removeuser.php for subadmins
      add isUserAccessible method to OC_SubAdmin class
      simplify code of remoteuser.php
      fix setqouta for subadmins
      add some doc for lib/subadmin.php
      fix copy&paste fail and deny subadmins to set the default qouta
      add isGroupAccessible in OC_SubAdmin
      simplify code of changepassword.php
      simplify code of createuser.php
      fix tooglegroup for subadmins
      improve default qouta for subadmins
      Merge branch 'master' into subadmin
      remove old files
      add SabreDav 1.6.3 files
      don't show label 'add group' for subadmins and remove some debug code
      Merge branch 'master' into subadmin
      some js improvements for subadmins
      Merge branch 'master' into subadmin
      add some hooks for subadmins
      Merge branch 'master' into subadmin
      some style fixes for calendar
      Merge branch 'master' into calendar_import
      increase width of user migrates form in personal settings, so you can read the whole label in all languages
      convert through caldav transmitted rgba calendarcolor to rgb
      declare OCP\App::register as deprecated
      fix errors like Failed opening required ownCloudcalendar/appinfo/remote.php
      Merge branch 'master' into subadmin
      Merge branch 'subadmin'
      fix spelling fail
      Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
      fix a subadmin UI bug
      little fix for previous commit
      add iWork mimetypes
      hide morelog button if there are no more log entries - bugfix for oc-1398
      fix label for versioning in admin settings
      remove unstable lib
      move calendar settings from personal settings to in app settings
      remove SabreDav 1.6.3
      add SabreDav 1.6.4
      remove debug code from calendar - thanks michael for pointing that out :)
      rename subadmin to group admin
      increase margin top of calendar import's color picker
      fix fail in sql query of isDuplicate method of OC_Calendar_Import
      fix label for versioning in admin settings
      backport 1bccc80996e270f928c207cdd3090f4284abaea5
      fix UI bug with subadmins
      implement getHome in OC_User
      don't allow group admins to change admin's accounts
      Merge branch 'master' of github.com:owncloud/core
      fix c&p fail from earlier commit today
      enable user backends to define their own place where to store the data
      use OC_User::getHome in lib/filesystem.php
      make use of OC_User::getHome in lib/migrate.php
      fix filesharing for multiple data directories
      only mount every single homefolder when using sharing app

Jakob Sack (36):
      Remove OC_App::register call in OCP\App::register
      Fix #476
      Add initial version of backgroundjobs library
      Rename Backgroundjobs to BackgroundJob
      Renaming backgroundjobs on file system as well
      Add public interface to background jobs
      fix license text
      Add "cron.php" for background jobs. It is named cron.php because more people will recognize the purpose of the file then.
      JavaScript file for activating web cron
      Be more precise regarding backgroundjobs mode
      Fixed bug in OC_BackgroundJob_Worker
      rename appconfig keys for backgroundjobs
      Add first version of backgroundjobs settings
      Backgroundjobs: rename ScheduledTask to QueuedTask
      BackgroundJob: forgot to rename file
      Backgroundjobs: Forgot to require lib/base.php
      BackgroundJobs: fix bug
      Backgroundjobs: Improve error handling in cron.php
      Backgroundjobs: Add reset counter in worker
      Error handling works better now
      Backgroundjobs: fix stupid bug
      Backgroundjobs: Add table to db_structure.xml
      Backgroundjobs: improve admin form
      Backgroundjobs: fix bugs in template
      Backgroundjobs: use correct var name in template
      Merge branch 'backgroundjobs'
      Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed
      Backgroundjobs: don't execute cron.php if owncloud has not been installed
      Backgroundjobs: cron.php now checks for mode=="none"
      bump version to reate new tables
      Backgroundjobs: Fix bug in admin interface
      Backgroundjobs: interface improvements
      Backgroundjobs: Fix template
      Backgroundjobs: fix bug in QueuedTask
      Backgroundjobs: Fix wrong var names
      Fix OC_Connector_Sabre_Locks for SQLite

Jan-Christoph Borchardt (3):
      upload button improvement, better separation, fix wrap issue
      remove background fade from navigation, fix flickering icon issue and make it feel faster
      fix cronjobs radio button width

Jenkins for ownCloud (41):
      [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

Johannes Willnecker (3):
      Fix for oc-972, oc-1144 and oc-1191
      fixed typo
      Missing dir added.

Juan Carlos Cornejo (2):
      Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
      Moves the lastAction=null outside the if so it can include the undo requests from replace

Jörn Friedrich Dreyer (26):
      add supersized slideshow
      remove superfluous ?> at the end of .php files (left out apps/*/templates)
      gitignore phpStorm .idea metadata folder
      fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT
      shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height
      small fixes in merge request 104, use OCP\Files::getStorage
      Merge branch 'master' of gitorious.org:/owncloud/owncloud
      add oci8 to MDB2
      comment extra timestamp quotation for oci8. Oracle can handle CURRENT_TIMESTAMP pretty well
      add oracle to install & setup
      add limit support to OC_DB & OCP/DB
      fix sql
      use dbname for non privileged user
      dix php strict warnings in mdb2 oci8
      reorder code for readability
      Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
      Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
      add backticks to SQL, use limit parameter instead of LIMIT SQL
      Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
      Merge branch 'master' of github.com:owncloud/core
      return standard SQL values (sqlite3 understands CURRENT_...)
      remove oc_log, as it is unused
      fix two bugs in MDB2, patches committed upstream https://pear.php.net/bugs/bug.php?id=19582
      Merge branch 'master' of github.com:owncloud/core
      update now(), current_timestamp and backtick replacement
      remove files_imageviewer and files_texteditor from blacklist so they can be activated in a multi apps environment

Lukas Reschke (71):
      Sanitzing user input
      Using POST instead of GET.
      Sanitize user input
      Sanitize user input
      Sanitizing user input
      First try of implementing assignHTML
      Settings...
      Revert
      Handling arrays
      Some updates...
      Check for string
      Make some apps compatible
      Removed some unessecary sanitizations
      Fixes a issue with the log
      Fix double sanitization
      Removed double sanitization
      Removed unecessary sanitization
      Disable mimesniffing
      Don't display error messages
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Remove forced download
      Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out.
      CSRF check in the settings
      Uninitialized variable
      CSRF check
      CSRF checks
      CSRF checks
      CSRF checks
      CSRF checks
      CSRF checks
      Sanitizing file names
      Handling exceptions
      Add CSRF checks
      Updated packages
      Check for admin user
      Remove unused files
      Updated style
      Sanitzing user input
      Added XSRF check
      Removed unused file
      XSRF checks
      Check if webfinger is enabled
      Validate cookie properly and prevent auth bypass
      Activate ACLs
      Disable listening, instead checking the ACL to prevent DoS
      Following the code guidelines makes Michael happy :-)
      Revert "Combine install checks in lib/base.php"
      This is unnessecary because we already run htmlentities() over the template engine
      Also check for some other files
      Disable user enumeration
      Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
      Optimized image size
      Sanitize user input
      Missed an "echo"
      Added XSRF check
      Validate cookie to prevent auth bypasses.
      Check if webfinger is enabled
      Disable listing of all users
      Also check some other files
      Disable user enumeration
      Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
      Add a missing exit();
      Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de)
      Merge pull request #1 from cornelius/patch-1
      I like TLS/SSL
      Gitorious => Github
      Use sanitizeHTML instead of strip_tags
      Remove some empty lines
      Check if app is enabled
      OC_Util is better thank OCP\JSON because it'll redirect the user to the index.php instead of displaying an error
      Wrong function

Marco B (1):
      utf8 in der DB config

Michael Gapczynski (284):
      Initial support for Amazon S3 storage backend
      Fix private link sharing via email, fix for bug oc-750
      Initial work on UI for mounting external storage
      Initial support for Amazon S3 storage backend
      Restrict requested app to apps directory
      Improve efficiency of retrieving log file entries
      Fix typo in log message
      Verify user exists when checking if logged in, fix for bug oc-863
      Hide app page link for internal apps, fixes bug oc-913
      Supress any warnings if log file does not exist
      Remove old internal mail call for password reset, fixes bug oc-934
      Working UI for external storage mount configuration
      Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
      Add Dropbox storage backend
      Stop AWS SDK from looking for configuration files, forgot to include lib/cachecore
      Mount personal mount points into filesystem
      Add support for mounting Dropbox in external storage UI
      Create directory for mount point if it doesn't already exist
      Fix incorrect creation of filesystem for user at group in data folder during shares
      Add support for mounting Google Drive in external storage UI
      Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
      Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
      Revert "Fix a counting mistake"
      Forgot $ sign for variable
      Fix upload for Google Drive; Google Documents List API documentation was misleading
      Revert "Set default charset to utf-8."
      Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
      Add missing ')'
      Fix variable checks for mounting Google Drive
      Fix removing personal mounts
      Don't call getLocalFile() until you know it actually is music
      Initial work on a share API
      Finish parent folder implementation, change recursive delete process
      Move ajax and js files to core
      Fixes for registering and fetching backends
      Use share type and share with in db instead of separate columns for user and group
      I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
      Fix additional getItems calls due to parameter change
      Some more changes to getItems() and fixes in shared storage
      Prepare drop down UI for share API
      Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
      Fixes and change database table from sharing to share
      Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
      Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted
      Fix which line needs '' wrapped around the array values
      Fix group sharing
      Fix ajax share file and replace 'User or Group' select form with a textbox
      $_POST variables should be $_GET for fetch
      Fix FORMAT_STATUSES
      Show users and groups shared with in dropdown
      Improve error handling of Dropbox storage backend
      Don't overwrite fake directory stream for Dropbox and Google Drive
      Don't overwrite fake directory stream for Shared storage
      Add Samba Share parameter to external storage UI
      Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
      Don't overwrite fake directory stream for Amazon S3 storage
      Return login errors for PostgreSQL setup
      Fix external storage UI for Admin page
      Hide the delete button on new mount point row
      Clear the mount point value for the new mount point row
      Allow multiple Google Drive and Dropbox external storages to be configured
      Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
      Add new group to other user's group select forms
      Prevent adding a duplicate to a multiselect
      Prevent duplicate group showing in multiselect that added the group
      Fix placeholder value for optional fields in external storage UI
      Switch back to registering just the class and not the object, better for performance
      Change registerBackend calls class argument to strings
      Have getItems() return an empty array instead of false, so apps only need to do an array_merge()
      Don't overwrite the item variable when checking if the item is already shared
      Fix generateTarget() for contacts backend
      Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app
      Add share action to addressbooks!
      Don't select all columns for FORMAT_STATUSES
      Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
      Don't reload the page after sending private link to email address
      Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
      Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
      Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
      Use formatted shared addressbook in all cases, addressbooks out of order now
      Clean up in the dropdown for unsharing
      Return false for single item checks and an empty array for multiple item checks
      Add share with to list in dropdown after sharing
      Add parameter to showDropDown to not show private link UI, only files can be shared as private links
      Improvements and bug fix for log reading, fixes bug oc-982
      Fix time formatting for minutes, prepend 0 if minutes is less than 10
      Move line counter so we only count lines towards the offset that are equal or above the log level
      Sharing files working using share API
      Call exit() to prevent further code execution if directory does not exist
      Call exit() to prevent further code execution if directory does not exist
      Sanitize POST and GET in ajax/share
      Call exit() to prevent further code execution if directory does not exist
      Fix getItems() calls
      Add back returning only the item if the limit is 1 and now check that the format is set to none
      Get rid of sneaky error_log() that got left behind
      Fix addressbook sharing, formatItems() changed in past commits
      Generate random token for private links (more entropy than past private links)
      Show private link in dropdown
      Sanitize toaddress for emailing private links
      Catch exceptions from PHPMailer
      Fix log write() parameters in wrong order
      Revert santizing toaddress, because PHPMailer now throws exceptions
      Fix setting custom quota size for users, bug fix for oc-1128
      Sanitization isn't required here
      Merge branch 'master' into share_api
      Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
      Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
      Add check if file is found in file cache
      Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type
      Move already shared with check out of user and group cases, and add check for already shared with inside a collection
      Add check for folder item type as well
      Add support for CRUDS permissions
      Update documentation
      Fix delete(), it was going in an infinite loop
      Update documentation
      Fix post_deleteUser(), column name changed and item_source is no longer needed
      Add option to delete() to check the owner of the first search of reshares
      Implement post_removeFromGroup()
      Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks
      Fix undo delete user
      Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request
      Delete old session files, suggested by Torben Nehmer, see bug oc-736
      Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage
      Alert user of errors when creating new files or folders
      Permission check should be made on parent folder when creating a new folder
      Fix permission check for rmdir(), implement unlink(), rename(), and copy()
      Improve file source caching for shared folders
      Remove toTmpFile() from shared storage, no longer needed
      Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
      Add root directory checks for CRUDS permissions in shared storage
      Missed a is_readable() call in local filestorage
      Change read only check to isCreatable
      Make file actions permissions aware
      Fix filesystem hash, no longer using basicOperation()
      Merge branch 'master' into share_api
      No longer need hash() in shared storage, already implemented by the common file storage
      Change is_writable() call to isUpdatable()
      Fix used space calculation if shared folder does not exist, fixes bug oc-1331
      Check if size isset, try to fix used space calculation again, fixs bug oc-1331
      Implement CRUDS in share dropdown, and some clean-up
      Run pre and post proxies for file_put_contents() streams
      Forgot data parameter for file_put_contents() streams pre proxies
      Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
      Fix incorrect copy/paste for file_put_contents()
      Add support for configuring which permissions are possible for items
      Only call mkdir() if the root folder does not exist for FTP external storage
      Fix group detection for sharing in case username contains '@', fix for oc-1270
      Set the user id when authenticating user for Ampache, fixes bug oc-219
      Set filter to empty if not set by Ampache client
      Remove delete tipsy if file is deleted, fixes bug oc-958
      Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
      Tweak appearance of undo delete notification
      Add additional error handling for emailing private links
      Remove accidently added 3rd party apps
      Remove another accidently added 3rdparty app
      Remove more accidentally added files
      Add notifications and undo support for replacing files when renaming
      Autocomplete for share with search in sharing dropdown
      Add search, limit, and offset parameters to getUsers() and getGroups()
      Use search and limit parameters for share with search in sharing dropdown
      Add suggestion to share with search for sharing via email
      Don't show self or already shared with users and groups in the share with search
      Remove break, it broke the statuses :)
      Give share with search focus when sharing dropdown appears
      Merge branch 'master' into share_api
      Include contacts in share with search
      Prevent up and down arrow from changing the share with input value
      Basic setup for sharing with contacts
      Throw exceptions in share API for UI to display
      Fix contact email share type redirection
      Hide 'can edit' if not checked
      Throw exception for items already shared in a collection
      Preparing for proper collection implementation
      Dynamically resize breadcrumbs, fix for bug oc-468
      Fix condition checking for resizing breadcrumbs
      Tweak users delete notification
      Show delete tipsy for users
      Listen to correct undo click for undoing deleting users
      Lots of refactoring to share API
      Database scheme for share API
      Don't load item if it doesn't have it status set
      Remove extra line, caused 'headers already sent' issues
      Merge branch 'master' into share_api
      Add additional check for post_deleteUser so we don't delete any non-user shares with the same name
      Throw more exceptions
      Make the file source path relative earlier
      Fix offset for folder detection, no longer including '/Shared' in file target path
      Remove person from array after unshare, so name appears in autocomplete again
      Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible
      Load icons for addressbooks, fix statuses for types other than files
      Somewhat fixes dropdown display issues in the contacts app
      Sharing backends for contacts and addressbooks
      Throw more exceptions
      Set filePath variable
      Select the correct column when searching for similar targets
      Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
      Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
      Only show the user's groups in the share with autocomplete
      Check if itemShares share type is an array instead of set, javascript likes to set indexes to 'undefined'
      Try to fix last commit
      Remove undefined return variable
      Add search and limit to getGroups search in groupExists implementation
      Implement groupExists in group database backend
      Initial calendar sharing backend
      Actually change background image of shared items
      Don't return file handle if the mode supports writing and the file is not writable
      Reset item shares variable, fixes autocomplete not showing people
      Fix issues with hiding and showing dropdown
      Don't include shared addressbook if source not found
      Add back getItemSharedWithBySource(), some situtations require this ability
      Start adding permission checks for addressbooks
      Merge branch 'master' into share_api
      Additional permission checks for editing and deleting contacts
      Bump up version number
      Check blacklist when renaming files
      Cast subadmin groups as strings
      Add search, limit, and offset parameters to getUsers() and getGroups()
      Add infinite scrolling to Settings -> Users, still a little buggy
      Make getting all users and groups the default
      Start with 30 users, this fills my screen
      Change limit parameter in OC_User as well
      Add search, limit, offset parameters to usersInGroups()
      Use limit and offset for subadmin users
      Add type text to new user, fixes display issue
      Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
      Fix remove button display for external storage
      Show access granted label next to Google Drive and Dropbox storage in configuration
      Prevent editing Dropbox configuration input after access granted
      Show access granted label immediately after granting access
      Catch exceptions and write to log when creating storage object fails
      Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
      Suggest mount point name, don't reload custom javascript file
      Improve usability for configuring Dropbox and Google Drive external storage
      Merge branch 'master' into share_api
      Retrieve all file dependent items when looking for file item type
      Use if instead of switch for detecting share type and throw exceptions when setting permissions
      Ensure permissions can't be escalated during a reshare
      Remove setTarget() function, changing target names only leads to confusion
      Change to correct function call getItemSharedWithBySource()
      Add tests for Share API, all tests passing :)
      Fix problems exposed by tests
      File sharing cleanup, works perfectly I think :)
      Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions
      Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
      Merge branch 'share_api'
      Bump version number for Share API
      Remove setTarget from ajax
      Fix share ajax calls to use itemName/itemSource, show who shared a file with you
      Remove unnecessary files
      Remove unnecessary file
      Revert using item name, no longer allowing the same item source exist for a user
      Removing most of files_sharing, the Share API implemented the majority of it
      Move share CSS to core, add script and style from inside Share API
      Check if files_sharing app is enabled, move file specific javascript to files_sharing app
      Don't return file handle if the mode supports writing and the file is not writable
      Check blacklist when renaming files
      Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders.
      Prevent resharing in UI if share permission not granted
      Switch to using file cache ids instead of paths for file sharing
      Determine if reshare needs to be checked
      Add padding to the reshared text
      Temporary fix to prevent rename action in root of Shared directory
      Dynamically update shared status icon
      Move jquery.inview from contacts app to core
      Move additional jquery.inview files
      Fix share getItems() limit
      Change URL from gitorious to github
      setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead
      Initial previewer for public links
      Fix share collection query
      Reimplement links support for sharing and add password protection option
      Add Share API settings to admin page
      Fix incorrect Javascript for changing Share API settings
      Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page
      Allow share_with column to be null for links
      Change public file from get.php to public.php
      Remove old database xml file for files_sharing, bump version number
      Remove unnecessary ajax file from files_sharing
      Check if path info is empty for remote.php, prevent error
      Fix typo
      404 if service is not set for public.php
      Check usernames in the database as case insensitive, they are still stored case sensitive. Bug fix for oc-422 and oc-1514
      Remove unused settings log file
      Fix sharing test case

Michiel de Jong (3):
      sanitize  when logged in as another user
      avoid clickjacking
      sanitize scope and host

Robin Appelman (106):
      files app is always enabled
      dont throw errors when apps dont have types configured
      enable running unit tests from cli
      smb filestorage backend
      share code between smb and ftp filestorage backends
      allow longer paths for gallery
      fix for pgsql database migration
      http user backend
      update file paths in filecache when the parent is renamed
      add unique instance id
      return null when a cache variable is not set
      add OC_Cache::clear
      add XCache backend and testcases for OC_Cache
      add hasKey for XCache backend
      add TTL tests for OC_Cache
      prevent creating files with a / the name
      update l10n script to better read js files
      dont show config option for file upload size if we cant write the new value
      update translations
      split share and root config for smb backend, also sanitize config a bit more
      fix infinite redirect during setup for windows hosts
      fix potential xss in multiselect
      dont load apps when displaying the login page
      load all apps when loging in, needed for apps listening to login hooks
      use absolute path for file proxies
      prevent opening non-music files through the media ajax api
      add hasUpdated to oc_filestorage
      also add hasUpdated to oc_filesystem and oc_filesystemview
      cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
      get rid of php4 style constructors in mdb2
      add binary test case for encryption
      fix encryption proxy for updated filecache
      fix for encryption binary files
      write_close the session when scanning files or music
      when checking if the content of a folder has been updated, exlicitly state that we are checking a folder
      get the correct metadate from updated folders to put in the cache
      fix statcache for filenames containing non-alphanumeric characters in smb streamwrapper
      improve filecache support for smb
      improve caching smb results a bit
      suppress error when using is_dir on non directory in smb backend
      fix problem with encryption flag not being saved correctly in the filecache
      don't show other users file if the filesystem is not index already
      truncate decrypted files based on filelength
      fix saved file size for uploaded files
      only use 1 fsview when initializing encryption
      dont change the encryption key during the test case
      fix webdav errors for empty folders
      fix running tests from cli
      pass progresskey the correct way during calender import
      fix encryption test cases when not logged in
      cant to ttl tests for xcache
      make sure the filesystem is setup properly for oc_cache_file tests
      fix remote and public.php
      use new way to register remote/public.php entries in user_webfinger
      fix minified js and css
      use the remote.php infrastructure for remoteStorage
      revert to using fopen for webdav instead of readfile
      improve webfinger for situations where owncloud is not installed in the server root
      fix running test cases from browser
      allow a more flexible way of using user backends
      imap user backend
      smb user backend
      ftp user backend
      dont use the mtimes stored in zip archives since they dont update correctly
      remove unused variables from webdav file backend
      dont check for filecache updates when getting quota info over webdav
      minor fixes for the google filestorage backend
      remove unused variable from dropbox filestorage backend
      fix eventsource fallback when more then one eventsource is active
      fix increasing folder sizes in filecache for custom roots
      fix unused variables
      fix OC_Cache_File tests if encryption is not enabled
      dont try to create mountpoints automatically
      remove unused and depricated getFolderSize
      remove unused variables
      forgot to make one function abstract
      remove obsolete oc_filesystem::mountall
      cleanup some obsolete foldersize code from the shared storage backend
      fix ununsed variables
      use file extension for determining mimetypes on default
      add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is available
      add prefix option to OC_Cache::clear
      add option to only get fast cache
      cache fileid's in oc_cache
      progressbar for New->From Url
      CSRF protection for eventsource
      add option to clear user backends
      use dummy user backend for oc_cache_file tests
      move some openid files to 3rdparty
      some indention fixes
      fix scanning of archives in some cases
      some basic path normalization
      fix some minor problems with path noramlization
      more path normalization
      add OC_Archive::addRecursive
      fix error in check if app is installed
      add OC_FileStorage::getLocalFolder
      also add getLocalFolder to OC_Filsystem and OC_FilesystemView
      fix error when adding string data to an archive
      better file_get_contents, file_put_contents and toTmpFile for archive storage backend
      ensure proper result format when using opendir on the archive storage backend
      fix creating nested folders inside tar files
      small fix for normalizing paths in archives
      don't report ctime in the archive storage backend since it isn't reliable
      improve hasUpdated for archive storage backend
      return the jQuery deferred object when using OC.loadScript

Sam Tuke (34):
      fixed 'delete' label so it doesn't break translations
      fixed some include path issues
      added recognition of which version is 'current' - which is currently live and in use on history page
      added recognition of which version is 'current' - which is currently live and in use on history page
      Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
      added phpdoc comment
      made initial testing version of expireAll for version control \ngave some old vars new camelcase names
      Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
      removed closing php tag
      Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
      Applied fix from kalassico for "Chiper text must be a string" bug (http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094)
      clarified comment
      fixed typos in var names
      added extensive class comment based on icewind's January list email
      Improved class comment block
      fixed typo
      Added & improved documentation
      Extended class comment
      Minor change to comment
      Added class comment block
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Fixed deleteAll function for deleting all old versions of files (expireAll)
      removed readdir to fix bug oc-1054
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      added new user settings interface for deleting old file versions
      Fixed missing jQuery event object - expire interface now works with Firefox
      Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
      Added placeholder msg to share with menu to clarify user list restricted to security context
      Added text ACS warning to admin's user settings page, and corresponding CSS styles
      Moved hooks and versions.php into new lib directory
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Added undo functionality to delete user procedure on user settings page
      fixed typos

Stephan Bergemann (12):
      fixed sorting errors and missbehaviours - now sorting like file browser
      fixed second_level_images issue
      now also working for directories only containing one image
      improved look of directories not containing images directly
      use images from deeper directories for preview if the actual directory doesn't contain any
      deleted some debugging output
      we don't have empty previewstacks any more - code cleaned up
      we don't neede the functions for empty stacks any more
      fixed one issue with last directory in structure having a lot of
      fixed handling of fallback_images
      contacts app now lists contacts sorted by expandable/collapsable addressbooks
      now a little less in template - more in ajax controller

Steven (1):
      Server verhindert beim OSX Client einen Delete

Thomas Mueller (39):
      oc-657: icons for M$ office file types
      PDF.JS updated, compatibility.js added for browser support, should fix: oc-395
      fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987
      fix javascript error
      first load compatibility.js
      fixes oc-1026
      fixes oc-668
      some path fixes for multi-dir app
      pdf viewer no longer 'eats' keyboard input
      fixing oc-1198
      allow command line based installation/setup
      restructuring test suite invocation - now we load all test cases into one suite and execute this single suite. this is necessary to be able to generate one xml report and is also a precondition for code coverage analysis(which will follow soon)
      autotest.sh added: create an fresh environment using sqlite (mysql anf pg will follow) and executes the test suite
      rediect test results to autotest-results-sqlite.xml
      MySql testing added
      fixing reset on autotest
      some more structure added
      add database type to xml report
      postgres added to autotest mechanism
      fixing syntax error
      fixing syntax error
      create a user for Test_Cache_File to allow unit tesing within ci
      bookmarks.pot and lib.pot added to transifex
      translation resources added and updated
      translation resources added and updated
      l10n directories have been missing
      translation support for text editor and impress added
      resources added to transifex
      adding coverage extension for simpletest
      added translation for odfviewer
      translation support for pdfviewer
      changing l10n to reflect latest repo splitt
      assert array length and individual content instead of assertEqual on arrays
      assert array length and individual content instead of assertEqual on arrays
      removing obsolete .tx
      apply coding style
      apply coding style
      apply coding style
      fixing: apps/files/ajax/scan.php

Thomas Müller (1):
      fixing syntax error

Thomas Tanghus (320):
      Contacts: XSS fix. Still some more to check.
      Contacts: Double check XSS, and fix a rookie error ;-)
      Contacts: Fix XSS.
      Contacts: Improve loading and cleanup of dialogs.
      Contacts: NOTE wasn't saved properly.
      Forgot a break.
      Contacts: Rewrote import script.
      Contacts: Temporary files weren't deleted if crop window was closed without saving.
      Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
      Contacts: Make tmp file cleaup a bit safer.
      Contacts: Cache standard photo less aggressively
      Per user quota didn't show in FF (and possibly IE) http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324.
      Added data() method to OC_Image to return raw image data.
      Added hasKey() method to OC_Cache.
      Contacts: Use OC_Cache for contact photo handling instead of temp dir.
      Use UID for cache key.
      Contacts: Removed temp dir cleanup after using OC_Cache.
      Also use OC_Cache here.
      Cleanup.
      Less aggressive caching on thumbnails too.
      Corrected typos.
      Correct mime type.
      Contacts: Make js a tad DRYer. Added URL property.
      A bit of pixel-pushing.
      Contacts: Import upload button was obscured on Android browser.
      Calendar: Added more explicit sync links and fixed indentation.
      Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
      Edited combobox to adhere to coding standards and added a dblclick handler.
      Make it easier to subclass OC_L10N.
      Break text to fit in dialog.
      Contacts: Attempt to make file upload work in ICS Chrome.
      Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
      Code cleanup.
      Contacts: Use POST instead of GET.
      Changed preferences configvalue to clob. Fixes several bugs e.g. oc-825 and oc-743.
      Bump version to trigger db update.
      Contacts: Used non-existent var.
      Contacts: 11th hour fix for invalid VCARD from CardDAV.
      Copy/paste error.
      Categories: Turned the debugging down a bit.
      Contacts: Fix NOTE also on add, not just save.
      Allow same host redirects (/somepath).
      Redirect HTTP Auth requests to REQUEST_URI. Partial fix for http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-874
      Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
      Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
      Quick fix for index errors when not importing from files.
      Fix js for missing address fields.
      Add .vimrc to .gitignore.
      Contacts: Final (for now) fix to encoding probs on import.
      Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
      Contacts: implemented CSRF prevention.
      Remove debug statements.
      Remove check for encryption.
      Use the right csrf token.
      Don't add slash if it's there already.
      White-space fix.
      Make requesttoken global.
      Contacts: Fixes for CSRF.
      If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...
      Cleanup code.
      Make events show again.
      No need to find calendar twice.
      Agree on argument type.
      Revert "Agree on argument type."
      Agree on argument type (cleaned this time).
      Only create new calendar when there are none. Fix oc-1007.
      Update calendar after delete.
      Make sure there is a calendar after delete.
      Use type=url for URL field.
      Update stylesheet for type=url.
      Files: Double encode download links. Fix for oc-1016.
      Set default charset to utf-8.
      Fix string encoding probs.
      Fix char encoding.
      files_imageviewer: Double encode paths. Fixes oc-1016.
      PDF Viewer: Double encode link.
      Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
      Styled address book entries.
      Obsolete language="Javascript".
      Obsolete language="Javascript".
      Moved parsing to the controller and js to contacts.js.
      Adjustments for inview handler etc.
      Add effect on addressbook show/hide.
      Add effect on addressbook show/hide.
      Sort addressbooks.
      Use uasort instead of usort.
      Add thumbnail links so they are loaded when addressbook is expanded.
      Rearrange markup.
      Make contact list fit in viewport.
      Save addressbook id to be able to rearrange contacts properly.
      Removed erroneous value attributes. Partial fix for oc-1029.
      Update js after contactlist change.
      Remove obsolete js.
      Loading of contacts was placed outside of $(document).ready() function.
      Re-add missing loadhandlers() call.
      Log error as ERROR.
      Make sure address books are shown even if empty.
      Better error checking.
      More changes for updating the contacts list.
      Only search for VEVENTs.
      Fix being able to link directly to contact, that I broke in other commit.
      Fix URL delimiter.
      Cast translation to string.
      Small js fix.
      Improve prev/next selection on delete.
      Trim trailing whitespace from version.
      Click to select which address book to add to.
      Remove unneeded parameter.
      Also load categories from VJOURNAL.
      Fixed function name.
      Add some DRYness to logging.
      Remove excessive debugging.
      Drag'n'Drop contacts between addressbook. Still needs some css magic.
      Allow direct link to app.
      XSS fix.
      Try to conserve some memory. Should fix oc-1106 for master.
      Improve styling on draggables.
      Better visual feedback and prevent drop on self.
      Emit Completed.
      Remove x-scrollbar from contacts list.
      All is good ;-)
      Adjust pic width a bit.
      Added signals.
      Fix variable name.
      Added createUser hook.
      Added error checking on all db queries.
      Added missing requesttoken.
      Added some error checking.
      Make Categories a bit quieter.
      Add check for return value.
      Ensure event handlers are being set when adding first contact.
      Load default categories if there are none,
      Load contactlist progressivly.
      Smoother profile picture loading - hopefully.
      No need for this anymore.
      Don't add duplicate contacts in the list when en-/disable an address book.
      Moved action buttons down to the add field menu. Fixes oc-1155.
      Query contacts in batches of 20. Possible fix for oc-1126.
      Remove ugly activation hack.
      Missing update script.
      Add missing CSRF check.
      Correct db default value.
      Missing requesttoken
      No need for being protected.
      Fugly fixed include.
      Correct hack ;)
      Fix endless loop when no addressbooks.
      Make export batch size configurable.
      Add missing requesttoken.
      Return error messages in correct format.
      Set the loading class on the property being changed, not on its container.
      Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
      Implemented Sabre iCalendar Export Plugin.
      Implemented VCFExportPlugin.
      Make it possible to import files using CR as eol.
      Simplify VCF generation.
      Remove deleted address book from list.
      Added default parameter $reset to allow for incremental rescan.
      Move code to OC_Contacts_App::scanCategories().
      Rescan categories in small batches to reduce memory usage.
      Delay fetching of carddata and set ETag and size instead.
      Revert "Delay fetching of carddata and set ETag and size instead."
      Reduce variables assigned.
      Look for the right field :-P
      Make sure the proper DOM is loaded and the right address book gets expanded.
      Don't escape assigned values.
      Revert reversion of f5c329af981f59f78c12648ea41c258f477f3e82 :-P
      Try to avoid occasional error messages.
      Give default address book a more intuitive name and replace spaces with underscores in uri.
      Fix loading previous or next contact after deleting one.
      Refactored contacts import.
      Removed obsolete TODO.
      Fixed sorting of addressbooks.
      Added notification.
      Typo.
      Made notifications more flexible.
      Hide file form field behind image so it will maybe work with IE...
      Improve temp file handling.
      Make list droppable too instead of just the header.
      Also unlink unsuccessful imports.
      Remove obsolete FIXMEs.
      Wrap image uploading in anonymous function.
      UI part of addressbook merging.
      Set the address book of the active contact active.
      Bold active address book.
      Fix sorting - again :-P
      Remove obsolete code.
      latin1 => utf8
      Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
      If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264.
      Wrong argument count in postCreateUser hook for contacts.
      Added hook for postCreateUser. Probably fix for oc-1265.
      Wrong version comparison in update.php.
      Added CSRF checks to Calendar. Expect some error messages - and report them ;)
      Added CSRF checks to Tasks. Expect some error messages - and report them ;)
      Added CSRF checks to files_versions. Expect some error messages - and report them ;)
      Added missing CSRF checks.
      Fixed require path.
      Eye candy for the draggables.
      Tweak dragging.
      Cleaning up a bit.
      Trigger loading of more contacts a bit earlier.
      Code style
      Coding style.
      Change uri fields from 100 to 200 chars.
      Code style.
      Remove unused file.
      Added some documentation for OCP\JSON::callCheck()
      Added some more documentation to OCP\JSON.
      Corrected retry count for uploaded imports.
      Hide progressbar on error.
      Trying to get documentation to "Do The Right Thing" (TM)
      Damn, that Jenkins dude is tough ;)
      DRYed inserting into contacts list.
      Added option to notify method.
      White space.
      Made contactlist optional in insertContact().
      Implemented undelete for contacts.
      Code style. One down...
      Remove wrong comment.
      Added next/previous methods to contacts list.
      Improved scrollTo method. Still not quite there...
      First stab at Ninja mode ;-)
      Added help for keyboard shortcuts.
      Whitespace
      Use insertContact
      No need to set checksum for PHOTO.
      Revert "No need to set checksum for PHOTO."
      Make sure notifier cleans up.
      Cleaner variable handling.
      No need to set checksum on PHOTO.
      Cleaner event handling.
      Cache DOM lookups, general cleanup.
      Remove unused ajax file.
      Removed text/plain header.
      Fixed potential error in logging.
      Check if the are contacts marked as deleted and warn if so.
      Code style.
      Remove deprecated code.
      Popup for app specific settings.
      Implemented app settings in popup.
      Unregister from personal settings.
      White space
      Made the parameter for OC.appSettings() an object to be able to extend it.
      Changed fix parameter to OC.appSettings().
      Added some more options to OC.appSettings().
      Forgot to also use the options I added :-P
      Propagate exceptions in OC.appSettings.
      Addressbooks settings rewrite and cleanup.
      And then the missing files ;)
      Updated JS namespace.
      More files to delete \o/
      Use popup class style for ninja-mode help.
      Remove onunload handler when delete is cancelled.
      Line length...
      If first addressbook was empty it was seen as if there where no contacts at all.
      I was a bit too fast in removing methods yesterday...
      Remove logging
      Correct namespace usage.
      Return properly formatted jsondata.
      Revert "Removed text/plain header."
      White space.
      FF complained about missing charset.
      Some fixes for keyboard shortcuts.
      Reorganize ajax scripts.
      Load OCS apps in an ajax call to avoid blocking the WUI.
      And add the file goddammit
      Wait with csrf check for now.
      Remove unused code.
      Use correct variable name.
      Restructure JS code and small fixes.
      Small changes to allow updating main menu dynamically.
      Return possibly changed appid.
      CSS tweaks for app settings.
      Some more pixel pushing.
      Make 3rd party label a bit smaller.
      Correct path to ajax file.
      Some UI improvements on the addressbooks settings.
      Fix require statements. Fix for oc-1460.
      Another take at profile photo/thumbnail caching. oc-839.
      Change parameter name and update docs.
      Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
      Fixed 3 - THREE - errors in one method call :-P
      Used wrong class.
      Readded refresh param. 304 and ETag is still sent so shouldn't matter.
      Position appsettings fixed and load it in dynamically added element.
      Commented out unused(?) class that interfered with appsettings.
      Automatically check radio when new addressbook fields get focus.
      Use correct class.
      Merge addressbooks.
      Merge commit 'refs/merge-requests/139' of git://gitorious.org/owncloud/owncloud into merge-requests/139
      Strip slashes from commas and semi-colons.
      Removed stray img element.
      Try to align and float contact parts better.
      Added types to emails. Support for custom types. Partial fix for oc-1508.
      Remove class contactsection
      Preliminary support for Apple X-ABLabel. Also for oc-1508.
      Minor layout change.
      Removed unused variable.
      Email type list wasn't initialized.
      Add support for IMPP properties.
      CSS fix for Windows.
      Don't add empty property parameters.
      Remove obsolete closure.
      Use right variable name.
      Limit styles so they don't interfere with sharing dropdown.
      Only load js and css once.
      Return newly created addressbook.
      Used non-existing variable.
      Use correct js class in first-run template.
      Missing IM variable assignments.
      Fix for deleting queued contacts.
      Removed redundant __CLASS__ in logging.
      Permission checking for shared addressbooks/contacts.
      Implemented sharing api for CardDAV. Next step CalDAV.
      Forgot to reenable the export plugin.
      White-space.
      Implemented sharing api for CalDAV.
      Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
      Correct variable name.

Tom Needham (21):
      Validate email on save
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Protect the help page
      Move user import to personal settings. Fix user migration between servers.
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      user_migrate: remove old code
      Text Editor: fix editor positioning
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Text editor: Waste less space for line numbers
      Merge branch 'master' of gitorious.org:owncloud/owncloud
      Migration: fix app paths
      Migration: Fix contacts and bookmarks
      Contacts: fix add contact icon path
      Contacts: align the bottom control buttons
      Updates contacts migration provider
      Return correct json response, fix syntax
      Fixed app path
      Text editor: Always use UTF-8 to keep Ace happy.
      Fix strict standards warnings
      Methods to disable and enable users
      Fix scrollbar issue. Fixes oc-1414

jfd (12):
      add css id attribute, minor fixes
      escape all identifiers with backticks
      remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this
      use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want)
      escape all identifiers with backticks
      fix typo in db_structure
      remove duplicate method
      fix missing $
      remove superflous LIMIT
      use limit parameter instead of LIMIT SQL for vcard
      OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
      fix sharing bug introduced with oracle support

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

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