Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
| | | | | | | |||||
* | | | | | | Merge pull request #24286 from owncloud/hooks_psr4 | Thomas Müller | 2016-04-27 | 6 | -0/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move \OC\Hooks to PSR-4 | ||||
| * | | | | | | Move \OC\Hooks to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-27 | 48 | -40/+206 |
| | | | | | | |||||
* | | | | | | Merge pull request #24246 from owncloud/local-invalid | Lukas Reschke | 2016-04-26 | 2 | -0/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | error out if a local storage isn't setup correctly | ||||
| * | | | | | add tests | Robin Appelman | 2016-04-26 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | error out if a local storage isn't setup correctly | Robin Appelman | 2016-04-25 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #24027 from owncloud/translate_ocs_share | Thomas Müller | 2016-04-26 | 4 | -63/+94 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Translate OCS Share API error messages | ||||
| * | | | | | | Translate OCS Share API error messages | Roeland Jago Douma | 2016-04-25 | 4 | -63/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For https://github.com/owncloud/core/issues/22209 | ||||
* | | | | | | | Merge pull request #24277 from owncloud/more-sanity | Thomas Müller | 2016-04-26 | 1 | -1/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't write empty RewriteBase | ||||
| * | | | | | | | Don't write empty RewriteBase | Lukas Reschke | 2016-04-26 | 1 | -1/+9 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud may be configured to live at the root folder without a trailing slash being specified. In this case manually set the rewrite base to `/` | ||||
* | | | | | | | Merge pull request #24269 from owncloud/backgroundjob_psr4 | Thomas Müller | 2016-04-26 | 6 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Move \OC\BackgroundJob to PSR-4 | ||||
| * | | | | | | Move \OC\BackgroundJob to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-26 | 204 | -1114/+1230 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24256 from owncloud/scanner-propagate | Morris Jobke | 2016-04-26 | 2 | -0/+40 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | triger the propagator from the command line scanner | ||||
| * | | | | | | | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 2 | -0/+40 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24262 from owncloud/fix-24228 | Morris Jobke | 2016-04-26 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | check whether index is set before using it | ||||
| * | | | | | | | check whether index is set before using it | Arthur Schiwon | 2016-04-25 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24199 from owncloud/ocp-repair | Morris Jobke | 2016-04-26 | 35 | -199/+369 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to thi… | ||||
| * | | | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new ↵ | Thomas Müller | 2016-04-25 | 35 | -199/+369 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface - refs #24198 |