summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1377 from nextcloud/improve-finish-l10nJoas Schilling2017-03-026-1/+230
|\ | | | | Change language code from fi_FI to fi
| * Fix table name and add a test for more than 1 entriesJoas Schilling2017-03-022-21/+24
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Change language code for languages with only one translationMorris Jobke2017-03-016-1/+227
| | | | | | | | | | | | | | | | | | | | | | | | * then the language is not that specific and get also matched for fi * fallback from fi_FI to fi is supported - the other way around not * contains repair script * contains tests for repair script * fixes #869 Order results to make postgres happy Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3676 from individual-it/trash_problemJoas Schilling2017-03-021-5/+2
|\ \ | | | | | | fix for #3201
| * | fix for #3201Artur Neumann2017-03-021-2/+3
| | |
| * | Revert "fix mouse pointer"Artur Neumann2017-03-021-5/+1
| | | | | | | | | | | | This reverts commit a4e2dc3033e40b58e5e72e2bda85a327ff092464.
* | | Merge pull request #3674 from nextcloud/transifex-for-themingJoas Schilling2017-03-022-0/+6
|\ \ \ | |_|/ |/| | Transifex config for theming app
| * | Transifex config for theming appMorris Jobke2017-03-012-0/+6
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3666 from nextcloud/fix-return-typeMorris Jobke2017-03-011-1/+1
|\ \ | | | | | | Fix return type of share provider
| * | Fix return type of share providerJoas Schilling2017-03-011-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-0242-40/+4
| | |
* | | Merge pull request #3370 from Flole998/Flole998-patch-1Morris Jobke2017-03-011-0/+2
|\ \ \ | |/ / |/| | Fix for Win Clients sometimes not connecting
| * | Fix for Win Clients sometimes not connectingFlole9982017-02-031-0/+2
| | | | | | | | | Fix for Win Clients sometimes not connecting
* | | [tx-robot] updated from transifexNextcloud bot2017-03-0118-36/+134
| | |
* | | Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uriRoeland Jago Douma2017-02-281-41/+121
|\ \ \ | | | | | | | | Fix saving backup codes by using a correct data uri
| * | | Fix saving backup codes by using a correct data uriChristoph Wurst2017-02-281-41/+121
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3650 from ↵Roeland Jago Douma2017-02-281-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/tokenprovider-asserted-method-name DefaultTokenProviderTest mocked/asserted the wrong method
| * | | | DefaultTokenProviderTest mocked/asserted the wrong methodChristoph Wurst2017-02-281-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | It's 'getRemember' instead of 'getRememberMe', hence some warnings were generated by phpunit. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3651 from ↵Morris Jobke2017-02-281-76/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/refactor/provisioning-usercontroller-test Refactor provision api app's UserControllerTest
| * | | | Refactor provision api app's UserControllerTestChristoph Wurst2017-02-281-76/+67
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace deprecated getMock with createMock * Use createMock consistently * Use php's ::class references Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3643 from nextcloud/replace-deprecated-tipsyLukas Reschke2017-02-284-11/+11
|\ \ \ \ | |/ / / |/| | | Replace deprecated $.tipsy(...) by $.tooltip(...)
| * | | fix typoMorris Jobke2017-02-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Replace deprecated $.tipsy(...) by $.tooltip(...)Christoph Wurst2017-02-274-11/+11
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #2997 from nextcloud/fix_2957Morris Jobke2017-02-284-34/+48
|\ \ \ \ | | | | | | | | | | Allow groups with / in sabre
| * | | | Properly handle groups with a /Roeland Jago Douma2017-02-274-34/+48
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a group contains a slash the principal URI becomes principals/groups/foo/bar. Now the URI is plit on '/' so this creates issues ;) Fixes #2957 * Add tests for groups with / Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #3635 from individual-it/fix_quota_validationMorris Jobke2017-02-283-13/+35
|\ \ \ \ | | | | | | | | | | better quota validation
| * | | | make values with white spaces possibleArtur Neumann2017-02-282-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a user might enter values with white spaces, and that should be possible and valid Signed-off-by: Artur Neumann <info@individual-it.net>
| * | | | better quota validationArtur Neumann2017-02-283-12/+27
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes #3634 1. fixed computerFileSize to be more picky about incorrect values 2. more tests for computerFileSize 3. use computerFileSize to validate user quota Signed-off-by: Artur Neumann <info@individual-it.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-2814-14/+152
| |/ / |/| |
* | | Merge pull request #3618 from nextcloud/fix-install-page-warningRoeland Jago Douma2017-02-271-5/+0
|\ \ \ | | | | | | | | Remove not needed rule for .warning
| * | | Remove not needed rule for .warningMorris Jobke2017-02-241-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-2722-26/+40
| | | |
* | | | Merge pull request #3623 from nextcloud/daita-patch-1Morris Jobke2017-02-261-1/+1
|\ \ \ \ | | | | | | | | | | Fix condition
| * | | | Fix conditionMaxence Lange2017-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-2612-0/+12
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-2540-26/+260
| | | |
* | | | Merge pull request #3489 from nextcloud/give-hint-about-opcacheMorris Jobke2017-02-244-1/+99
|\ \ \ \ | |/ / / |/| | | Show info in admin settings about PHP opcache if disabled
| * | | Show info in admin settings about PHP opcache if disabledMorris Jobke2017-02-224-1/+99
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3588 from GreenArchon/issue_#3461Lukas Reschke2017-02-242-36/+18
|\ \ \ \ | | | | | | | | | | Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
| * | | | Refactor files' CacheEntry object creation to call cacheEntryFromData() all ↵Frédéric Fortier2017-02-221-36/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the time thus allowing proper casts to be done Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
| * | | | Typecast filecache 'storage' as int to return it as documented, fixes #3461Frédéric Fortier2017-02-202-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
* | | | | Merge pull request #3598 from ↵Roeland Jago Douma2017-02-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3583-shared-addressbooks-fail-on-legacy-endpoint Use the correct principal for shared addressbooks
| * | | | | Use the correct principal for shared addressbooksJoas Schilling2017-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3612 from KB7777/patch-1Roeland Jago Douma2017-02-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Setup.php
| * | | | | | Update Setup.phpKB77772017-02-241-1/+1
|/ / / / / /
* | | | | | Merge pull request #3287 from nextcloud/readd_appstoreenabled_switchJoas Schilling2017-02-244-8/+193
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add back appstoreenabled config switch
| * | | | | | Fix unit tests and improve appstore logicMorris Jobke2017-02-244-9/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Add back appstoreenabled config switchSteffen Lindner2017-02-241-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
* | | | | | | Merge pull request #3603 from nextcloud/update-iconJoas Schilling2017-02-241-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bring back checkmark icon on successful update
| * | | | | | | Bring back checkmark icon on successful updateMorris Jobke2017-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>