Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-30 | 174 | -2966/+2990 |
| | |||||
* | Merge pull request #24335 from ↵ | Thomas Müller | 2016-04-29 | 2 | -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 hook | Joas Schilling | 2016-04-29 | 2 | -0/+20 |
| | | |||||
* | | Merge pull request #24299 from owncloud/availability-avoid-concurrency | Thomas Müller | 2016-04-29 | 2 | -2/+9 |
|\ \ | | | | | | | Prevent concurrent storage availability checks | ||||
| * | | Prevent concurrent availability checks | Robin McCorkell | 2016-04-26 | 2 | -2/+9 |
| | | | |||||
* | | | Merge pull request #24357 from owncloud/psr_more2 | Thomas Müller | 2016-04-29 | 19 | -0/+0 |
|\ \ \ | | | | | | | | | Move more from \OC to PSR-4 | ||||
| * | | | Move more from \OC to PSR-4 | Roeland Jago Douma | 2016-04-29 | 19 | -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-memory | Vincent Petry | 2016-04-29 | 2 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | optimize releaselock for memcache based locking backends | ||||
| * | | | | optimize releaselock for memcache based locking backends | Robin Appelman | 2016-04-29 | 2 | -2/+11 |
| | | | | | |||||
* | | | | | Merge pull request #24351 from owncloud/capped-normalized-cache | Morris Jobke | 2016-04-29 | 1 | -1/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | cap the normalized path cache | ||||
| * | | | | cap the normalized path cache | Robin Appelman | 2016-04-29 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge pull request #24337 from owncloud/add-db-group-for-required-tests | Thomas Müller | 2016-04-29 | 2 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Add the DB group for preview tests that require the database | ||||
| * | | | | Add the DB group for tests that require the database | Joas Schilling | 2016-04-29 | 2 | -0/+14 |
| | | | | | |||||
* | | | | | Merge pull request #24352 from owncloud/psr4_more | Roeland Douma | 2016-04-29 | 11 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move more of \OC to PSR-4 | ||||
| * | | | | | Move more of \OC to PSR-4 | Roeland Jago Douma | 2016-04-29 | 11 | -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-progress | Vincent Petry | 2016-04-29 | 10 | -231/+322 |
|\ \ \ \ \ | |/ / / / |/| | | | | [Update] show repair step progress ... | ||||
| * | | | | Adding progress to occ upgrade | Thomas Müller | 2016-04-28 | 1 | -15/+51 |
| | | | | | |||||
| * | | | | Adding progress to web upgrade | Thomas Müller | 2016-04-28 | 4 | -12/+69 |
| | | | | | |||||
| * | | | | Remove emitter from class Repair | Thomas Müller | 2016-04-28 | 4 | -188/+142 |
| | | | | | |||||
| * | | | | Adding progress to occ maintenance:repair | Thomas Müller | 2016-04-28 | 3 | -17/+61 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #24345 from owncloud/readme-9.1 | Thomas Müller | 2016-04-29 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Update readme for 9.1 links | ||||
| * | | | | Update readme for 9.1 links | Vincent Petry | 2016-04-29 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #24342 from owncloud/fix_private_root_files | Thomas Müller | 2016-04-29 | 11 | -0/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Moved some files in \OC to PSR-4 | ||||
| * | | | | Moved some files in \OC to PSR-4 | Roeland Jago Douma | 2016-04-29 | 11 | -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-bits | Lukas Reschke | 2016-04-29 | 3 | -8/+29 |
|\ \ \ \ | |/ / / |/| | | | Allow app developers to specify the minimum int size | ||||
| * | | | allow app developers to specify the minimum int size | Bernhard Posselt | 2016-04-28 | 3 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify comparison remove additional null fix off by 1 error | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-29 | 16 | -0/+110 |
| | | | | |||||
* | | | | Merge pull request #24332 from owncloud/http_psr4 | Thomas Müller | 2016-04-29 | 3 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | Move \OC\Http to PSR-4 | ||||
| * | | | Move \OC\Http to PSR-4 | Roeland Jago Douma | 2016-04-28 | 3 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #24326 from owncloud/fix_for_php_7_0_6 | Roeland Douma | 2016-04-28 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Make ownCloud work again in php 7.0.6 | ||||
| * | | | Make ownCloud work again in php 7.0.6 | Roeland Jago Douma | 2016-04-28 | 1 | -0/+3 |
| |/ / | | | | | | | | | | See https://bugs.php.net/bug.php?id=72117 | ||||
* | | | Merge pull request #24274 from owncloud/async-repair-steps | Thomas Müller | 2016-04-28 | 5 | -1/+258 |
|\ \ \ | | | | | | | | | Introduce background repair steps | ||||
| * | | | Introduce background repair steps | Thomas Müller | 2016-04-26 | 5 | -1/+258 |
| | | | | |||||
* | | | | Merge pull request #24287 from owncloud/smb-110 | Vincent Petry | 2016-04-28 | 8 | -41/+122 |
|\ \ \ \ | |_|/ / |/| | | | update icewind/streams to 1.1.0 | ||||
| * | | | update icewind/streams to 1.1.0 | Robin Appelman | 2016-04-26 | 8 | -41/+122 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-28 | 24 | -36/+228 |
| | | | | |||||
* | | | | Merge pull request #24290 from owncloud/mimetypealiases-2 | Thomas Müller | 2016-04-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | correct typo in mimetypealiases.dist.json | ||||
| * | | | | correct typo in mimetypealiases.dist.json | Carla Schroder | 2016-04-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #24315 from owncloud/l10n_psr4 | Thomas Müller | 2016-04-28 | 3 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | L10N to PSR-4 | ||||
| * | | | | | Move \OC\L10N to PSR-4 | Roeland Jago Douma | 2016-04-27 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Move OC_L10N_String to legacy folder | Roeland Jago Douma | 2016-04-27 | 1 | -0/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #24310 from owncloud/enoch85-patch-1 | Thomas Müller | 2016-04-27 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | 2015 --> 2016 | ||||
| * | | | | | 2015 --> 2016 | Daniel Hansson | 2016-04-27 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #23942 from owncloud/fix-behat | Thomas Müller | 2016-04-27 | 1 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Use baseUrl as provided | ||||
| * | | | | | Use baseUrl as provided | Thomas Müller | 2016-04-12 | 1 | -6/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #22777 from owncloud/encrypt_all_master_key | Thomas Müller | 2016-04-27 | 4 | -29/+116 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | improved encrypt-all script | ||||
| * | | | | | | if we don't have a encrypted file key we can return a empty string right away | Bjoern Schiessle | 2016-04-26 | 2 | -5/+38 |
| | | | | | | | |||||
| * | | | | | | don't create a private-/public-key pair for each user if the master key is ↵ | Bjoern Schiessle | 2016-04-26 | 3 | -24/+78 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | enabled | ||||
* | | | | | | Merge pull request #21417 from J0WI/css-fixes | Thomas Müller | 2016-04-27 | 7 | -27/+38 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | css fallbacks and code style fixes | ||||
| * | | | | | | fixed fallbacks and code style | jowi | 2016-01-02 | 7 | -27/+38 |
| | | | | | | |