summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-30174-2966/+2990
|
* Merge pull request #24335 from ↵Thomas Müller2016-04-292-0/+20
|\ | | | | | | | | owncloud/warning-for-wrongly-done-storage-wrappers Add a warning if a storage wrapper was registered outside of the hook
| * Add a warning if a storage wrapper was registered outside of the hookJoas Schilling2016-04-292-0/+20
| |
* | Merge pull request #24299 from owncloud/availability-avoid-concurrencyThomas Müller2016-04-292-2/+9
|\ \ | | | | | | Prevent concurrent storage availability checks
| * | Prevent concurrent availability checksRobin McCorkell2016-04-262-2/+9
| | |
* | | Merge pull request #24357 from owncloud/psr_more2Thomas Müller2016-04-2919-0/+0
|\ \ \ | | | | | | | | Move more from \OC to PSR-4
| * | | Move more from \OC to PSR-4Roeland Jago Douma2016-04-2919-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\OCSClient * \OC\Preview * \OC\PreviewManager * \OC\Repair * \OC\RepairException * \OC\Search * \OC\ServerContainer * \OC\ServerNotAvailableException * \OC\ServiceUnavailableException * \OC\Setup * \OC\Streamer * \OC\SubAdmin * \OC\SystemConfig * \OC\TagManager * \OC\Tags * \OC\TempManager * \OC\TemplateLayout * \OC\URLGenerator * \OC\Updater
* | | | Merge pull request #24350 from owncloud/locking-release-memoryVincent Petry2016-04-292-2/+11
|\ \ \ \ | | | | | | | | | | optimize releaselock for memcache based locking backends
| * | | | optimize releaselock for memcache based locking backendsRobin Appelman2016-04-292-2/+11
| | | | |
* | | | | Merge pull request #24351 from owncloud/capped-normalized-cacheMorris Jobke2016-04-291-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | | cap the normalized path cache
| * | | | cap the normalized path cacheRobin Appelman2016-04-291-1/+6
| |/ / /
* | | | Merge pull request #24337 from owncloud/add-db-group-for-required-testsThomas Müller2016-04-292-0/+14
|\ \ \ \ | | | | | | | | | | Add the DB group for preview tests that require the database
| * | | | Add the DB group for tests that require the databaseJoas Schilling2016-04-292-0/+14
| | | | |
* | | | | Merge pull request #24352 from owncloud/psr4_moreRoeland Douma2016-04-2911-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move more of \OC to PSR-4
| * | | | | Move more of \OC to PSR-4Roeland Jago Douma2016-04-2911-0/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\DateTimeFormatter * \OC\DateTimeZone * \OC\ForbiddenException * \OC\HTTPHelper * \OC\HintException * \OC\LargeFileHelper * \OC\Log * \OC\NaturalSort * \OC\NavigationManager * \OC\NeedsUpdateException * \OC\NotSquareException
* | | | | Merge pull request #24305 from owncloud/update-show-repair-step-progressVincent Petry2016-04-2910-231/+322
|\ \ \ \ \ | |/ / / / |/| | | | [Update] show repair step progress ...
| * | | | Adding progress to occ upgradeThomas Müller2016-04-281-15/+51
| | | | |
| * | | | Adding progress to web upgradeThomas Müller2016-04-284-12/+69
| | | | |
| * | | | Remove emitter from class RepairThomas Müller2016-04-284-188/+142
| | | | |
| * | | | Adding progress to occ maintenance:repairThomas Müller2016-04-283-17/+61
| | |_|/ | |/| |
* | | | Merge pull request #24345 from owncloud/readme-9.1Thomas Müller2016-04-291-2/+2
|\ \ \ \ | | | | | | | | | | Update readme for 9.1 links
| * | | | Update readme for 9.1 linksVincent Petry2016-04-291-2/+2
| | | | |
* | | | | Merge pull request #24342 from owncloud/fix_private_root_filesThomas Müller2016-04-2911-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | Moved some files in \OC to PSR-4
| * | | | Moved some files in \OC to PSR-4Roeland Jago Douma2016-04-2911-0/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\ActivityManager * \OC\AllConfig * \OC\AppConfig * \OC\AppHelper * \OC\Avatar * \OC\AvatarManager * \OC\CapabilitiesManager * \OC\Config * \OC\ContactsManager * \OC\DatabaseException * \OC\DatabaseSetupException
* | | | Merge pull request #24317 from owncloud/app-require-bitsLukas Reschke2016-04-293-8/+29
|\ \ \ \ | |/ / / |/| | | Allow app developers to specify the minimum int size
| * | | allow app developers to specify the minimum int sizeBernhard Posselt2016-04-283-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify comparison remove additional null fix off by 1 error
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2916-0/+110
| | | |
* | | | Merge pull request #24332 from owncloud/http_psr4Thomas Müller2016-04-293-0/+0
|\ \ \ \ | |/ / / |/| | | Move \OC\Http to PSR-4
| * | | Move \OC\Http to PSR-4Roeland Jago Douma2016-04-283-0/+0
| |/ /
* | | Merge pull request #24326 from owncloud/fix_for_php_7_0_6Roeland Douma2016-04-281-0/+3
|\ \ \ | | | | | | | | Make ownCloud work again in php 7.0.6
| * | | Make ownCloud work again in php 7.0.6Roeland Jago Douma2016-04-281-0/+3
| |/ / | | | | | | | | | See https://bugs.php.net/bug.php?id=72117
* | | Merge pull request #24274 from owncloud/async-repair-stepsThomas Müller2016-04-285-1/+258
|\ \ \ | | | | | | | | Introduce background repair steps
| * | | Introduce background repair stepsThomas Müller2016-04-265-1/+258
| | | |
* | | | Merge pull request #24287 from owncloud/smb-110Vincent Petry2016-04-288-41/+122
|\ \ \ \ | |_|/ / |/| | | update icewind/streams to 1.1.0
| * | | update icewind/streams to 1.1.0Robin Appelman2016-04-268-41/+122
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2824-36/+228
| | | |
* | | | Merge pull request #24290 from owncloud/mimetypealiases-2Thomas Müller2016-04-281-1/+1
|\ \ \ \ | | | | | | | | | | correct typo in mimetypealiases.dist.json
| * | | | correct typo in mimetypealiases.dist.jsonCarla Schroder2016-04-261-1/+1
| | | | |
* | | | | Merge pull request #24315 from owncloud/l10n_psr4Thomas Müller2016-04-283-0/+0
|\ \ \ \ \ | | | | | | | | | | | | L10N to PSR-4
| * | | | | Move \OC\L10N to PSR-4Roeland Jago Douma2016-04-272-0/+0
| | | | | |
| * | | | | Move OC_L10N_String to legacy folderRoeland Jago Douma2016-04-271-0/+0
|/ / / / /
* | | | | Merge pull request #24310 from owncloud/enoch85-patch-1Thomas Müller2016-04-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | 2015 --> 2016
| * | | | | 2015 --> 2016Daniel Hansson2016-04-271-2/+2
|/ / / / /
* | | | | Merge pull request #23942 from owncloud/fix-behatThomas Müller2016-04-271-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Use baseUrl as provided
| * | | | | Use baseUrl as providedThomas Müller2016-04-121-6/+6
| | | | | |
* | | | | | Merge pull request #22777 from owncloud/encrypt_all_master_keyThomas Müller2016-04-274-29/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | improved encrypt-all script
| * | | | | | if we don't have a encrypted file key we can return a empty string right awayBjoern Schiessle2016-04-262-5/+38
| | | | | | |
| * | | | | | don't create a private-/public-key pair for each user if the master key is ↵Bjoern Schiessle2016-04-263-24/+78
| | |_|/ / / | |/| | | | | | | | | | | | | | | | enabled
* | | | | | Merge pull request #21417 from J0WI/css-fixesThomas Müller2016-04-277-27/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | css fallbacks and code style fixes
| * | | | | | fixed fallbacks and code stylejowi2016-01-027-27/+38
| | | | | | |