summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add emptycontent div, show/hide emptycontent div, fix #1070giorgia2017-03-032-0/+14
| | | | Signed-off-by: giorgia <g.sambrotta@gmail.com>
* Merge pull request #3597 from nextcloud/remove-data-from-lookup-serverRoeland Jago Douma2017-03-031-19/+30
|\ | | | | add posibility to remove all personal data from lookup server
| * add posibility to remove all personal data from lookup serverBjoern Schiessle2017-02-231-19/+30
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #3684 from nextcloud/run-lang-update-only-onceRoeland Jago Douma2017-03-033-4/+44
|\ \ | | | | | | Execute UpdateLanguageCode only once
| * | Fix DIJoas Schilling2017-03-032-2/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make the test usefulJoas Schilling2017-03-031-0/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Execute UpdateLanguageCode only onceMorris Jobke2017-03-022-2/+39
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3607 from nextcloud/api-to-resend-welcome-messageRoeland Jago Douma2017-03-034-1/+628
|\ \ \ | | | | | | | | OCS API endpoint to resend welcome message
| * | | Fix injection of defaultsMorris Jobke2017-02-281-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | OCS API endpoint to resend welcome messageMorris Jobke2017-02-284-1/+624
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger the welcome message to be send * fixes #3367 example curl statement: curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H "OCS-APIRequest: true" -u admin:password -X POST Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3678 from ↵Roeland Jago Douma2017-03-034-55/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3677-caldav-sharing-permission-problem CalDAV sharing permissions should not depend on the order
| * | | | Make sure shares use read-write when availableJoas Schilling2017-03-022-4/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Don't waste energy unless necessaryJoas Schilling2017-03-022-16/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add a unit test for the broken caseJoas Schilling2017-03-022-1/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Unit test cleanupJoas Schilling2017-03-021-37/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3689 from nextcloud/cleanup-legacy-classesJoas Schilling2017-03-037-251/+12
|\ \ \ \ \ | | | | | | | | | | | | Cleanup not used legacy classes
| * | | | | Get rid of static OCS::notFound()Morris Jobke2017-03-032-45/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Cleanup not used legacy classesMorris Jobke2017-03-035-206/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Person was removed via #2170 * other lcasses/interfaces are not used at all Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3687 from nextcloud/proper-transfer-ownership-dateJoas Schilling2017-03-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use a proper date format for transfer ownership
| * | | | | Use a proper date format for transfer ownershipMorris Jobke2017-03-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * on Windows : is not allowed as filename and doesn't get synced then * uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3686 from nextcloud/downstream-27282Joas Schilling2017-03-032-0/+23
|\ \ \ \ \ | | | | | | | | | | | | filelist only refreshed if directory changes
| * | | | | filelist only refreshed if directory changesnoveens2017-03-022-0/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check introduced at another method comment added to explain one check comment added to explain one check unit tests added small fixes in unit tests missing semicolon added Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3682 from whitekiba/masterRoeland Jago Douma2017-03-037-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated OC_User::isLoggedIn
| * | | | | Remove deprecated OC_User::isLoggedInSebastian Wessalowski2017-03-027-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
* | | | | | Merge pull request #3681 from nextcloud/dav-nonexisting-ownerMorris Jobke2017-03-021-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | handle non existing owners when handling dav requests
| * | | | | | handle non existing owners when handling dav requestsRobin Appelman2017-03-021-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-0330-8/+374
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-02202-20/+9840
| |/ / / / |/| | | |
* | | | | 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>