summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3394 from ↵Lukas Reschke2017-02-088-768/+541
|\ | | | | | | | | nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array Make sure ownCloud 8.2 activities also can get displayed
| * Fix files sharing legacy as wellJoas Schilling2017-02-087-750/+296
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add tests for getUser()Joas Schilling2017-02-071-0/+71
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add tests for getFile()Joas Schilling2017-02-072-11/+149
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Make sure ownCloud 8.2 activities also can get displayedJoas Schilling2017-02-071-12/+30
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3403 from nextcloud/rename-dbpassword-toggleJoas Schilling2017-02-082-9/+9
|\ \ | | | | | | Rename database password toggle
| * | Rename database password toggleMorris Jobke2017-02-072-9/+9
| |/ | | | | | | | | | | | | | | | | * otherwise submitting the form with the password show will be overwritten * see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59 * seems to be a legacy fallback * fixes #3381 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2017-02-0816-2/+1086
|/
* [tx-robot] updated from transifexNextcloud bot2017-02-0722-72/+702
|
* Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-065-120/+89
|\ | | | | Fix public page css fallback loading
| * TOTP cssJohn Molakvoæ (skjnldsv)2017-02-061-0/+18
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Various fixes guest cssJohn Molakvoæ (skjnldsv)2017-02-011-112/+66
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-014-8/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #3364 from nextcloud/sass-loggingRobin Appelman2017-02-063-5/+5
|\ \ | | | | | | Lower log levels of resource locator
| * | fix unit testsMorris Jobke2017-02-031-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-02-0616-60/+128
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-0510-0/+50
| |
* | Merge pull request #3353 from nextcloud/mobile-view-files-fixMarius Blüm2017-02-041-1/+4
|\ \ | | | | | | Fix files mobile view
| * | Fix files mobile viewJohn Molakvoæ (skjnldsv)2017-02-011-1/+4
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-02-042-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-0310-14/+30
| |
* | Merge pull request #3359 from nextcloud/fix-sharing-app-descriptionMorris Jobke2017-02-021-2/+2
|\ \ | | | | | | Fix Sharing app description
| * | Fix Sharing app descriptionJoas Schilling2017-02-021-2/+2
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / [tx-robot] updated from transifexNextcloud bot2017-02-0242-60/+274
|/
* [tx-robot] updated from transifexNextcloud bot2017-02-0136-88/+1104
|
* Merge pull request #3321 from ↵Morris Jobke2017-01-313-6/+5
|\ | | | | | | | | nextcloud/revert-unintentional-change-of-log-timestamp-format Revert unintentional log timestamp format change
| * Fix config.sample.phpMorris Jobke2017-01-301-3/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3022-80/+637
|\ \ | | | | | | Login credential store
| * | minor version bumpChristoph Wurst2017-01-172-2/+2
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | always allow remembered loginChristoph Wurst2017-01-119-32/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | fix constructor params in failing testChristoph Wurst2017-01-111-6/+9
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | do not hard-require the token providerChristoph Wurst2017-01-113-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | The provider might need DB access and therefore depenedency resolution fails on the setup page where we cannot inject the db implementation. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | use login hook credentials as fallbackChristoph Wurst2017-01-113-19/+77
| | | | | | | | | | | | | | | | | | | | | If no session token is available, we can use the credentials provided by the login hook. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | migrate 'password::sessioncredentials' extern storage auth to credential storeChristoph Wurst2017-01-111-32/+24
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | fix @since annotations (9.1->12)Christoph Wurst2017-01-114-8/+8
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | replace session implementation if it changes at runtimeChristoph Wurst2017-01-112-1/+11
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | add @since annotations and document methodsChristoph Wurst2017-01-112-0/+14
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | add login credential storeChristoph Wurst2017-01-1111-0/+496
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #3169 from nextcloud/update-doctrineMorris Jobke2017-01-301-0/+0
|\ \ \ | | | | | | | | Update doctrine
| * | | Update doctrineJoas Schilling2017-01-301-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-3116-82/+244
| | | |
* | | | Merge pull request #3282 from nextcloud/header-menu-arrow-upMorris Jobke2017-01-301-23/+15
|\ \ \ \ | |/ / / |/| | | Merge similar properties and standardize the arrow to the menu class
| * | | Merge similar properties and apply arrow to menu classJohn Molakvoæ (skjnldsv)2017-01-261-23/+15
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-3019-49/+749
|\ \ \ \ | | | | | | | | | | Add self-test for files_external:notify
| * | | | update autoloaderRobin Appelman2017-01-274-0/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add sinceRobin Appelman2017-01-273-0/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add unit tests for smb notify backendRobin Appelman2017-01-272-0/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add notify self testRobin Appelman2017-01-271-1/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>