summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13516 from nextcloud/version/noid/14.0.6v14.0.6Morris Jobke2019-01-111-2/+2
|\ | | | | 14.0.6
| * 14.0.6Morris Jobke2019-01-111-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13507 from nextcloud/backport/13503/stable14Roeland Jago Douma2019-01-111-0/+8
|\ | | | | [stable14] RemoveClassifiedEventActivity: check if calendar still exists
| * Check for no longer existing calendarsRoeland Jago Douma2019-01-111-0/+8
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-01-1148-50/+228
|
* Merge pull request #13480 from nextcloud/backport/13473/stable14Roeland Jago Douma2019-01-102-1/+4
|\ | | | | [stable14] Don't log parameters on user creation in case of error/exception
| * Fix doc blockJoas Schilling2019-01-101-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Don't log parameters on user creation in case of error/exceptionJoas Schilling2019-01-101-0/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #13476 from nextcloud/version/noid/14.0.5v14.0.5Morris Jobke2019-01-101-2/+2
|\ \ | |/ |/| 14.0.5
| * 14.0.5Morris Jobke2019-01-101-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13470 from nextcloud/backport/13467/stable14Morris Jobke2019-01-101-0/+2
|\ | | | | [stable14] Show the repair steps and repair info output in the web for better feedback
| * Show the repair steps and repair info output in the web for better feedbackMorris Jobke2019-01-101-0/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2019-01-1042-482/+6
|
* Merge pull request #13453 from nextcloud/version/noid/14.0.5RC2v14.0.5RC2Roeland Jago Douma2019-01-091-2/+2
|\ | | | | 14.0.5 RC 2
| * 14.0.5 RC 2Morris Jobke2019-01-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13441 from nextcloud/backport/13430-14Roeland Jago Douma2019-01-096-4/+148
|\ | | | | [stable14] Respect classification of calendar events in activity stream
| * Prevent php info about missing index for old eventsJoas Schilling2019-01-091-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add a repair step to remove sensitive event activityJoas Schilling2019-01-094-1/+128
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Correctly handle the classification of events in the activity streamJoas Schilling2019-01-092-3/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #13445 from nextcloud/backport/12969/stable14Morris Jobke2019-01-091-1/+5
|\ \ | |/ |/| [stable14] add support for boolean default
| * add support for boolean defaultMaxence Lange2019-01-091-1/+5
|/ | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* [tx-robot] updated from transifexNextcloud bot2019-01-098-10/+12
|
* Merge pull request #13426 from nextcloud/backport/13418/stable14Morris Jobke2019-01-081-1/+7
|\ | | | | [stable14] HttpClient getHeader can return empty string
| * HttpClient getHeader can return empty stringRoeland Jago Douma2019-01-081-1/+7
|/ | | | | | Fixes #11999 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-01-082-0/+4
|
* [tx-robot] updated from transifexNextcloud bot2019-01-072-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2019-01-066-2/+42
|
* Merge pull request #13347 from nextcloud/version/noid/14.0.5RC1v14.0.5RC1Roeland Jago Douma2019-01-051-2/+2
|\ | | | | 14.0.5 RC 1
| * 14.0.5 RC 1Morris Jobke2019-01-051-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2019-01-0598-180/+244
|/
* Merge pull request #13373 from nextcloud/backport/13138/stable14Morris Jobke2019-01-054-32/+184
|\ | | | | [stable14] register and show when an LDAP user was detected as unavailable/deleted
| * ensure db is pristine before starting the testsArthur Schiwon2019-01-041-0/+3
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * LDAP: extend remnants output with "detected on" fieldArthur Schiwon2019-01-043-26/+57
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add tests for the DUIArthur Schiwon2019-01-042-6/+124
| | | | | | | | | | | | as they are interact with the DB they are more integraiton than unit tests Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #13371 from nextcloud/backport/13363/stable14Morris Jobke2019-01-044-11/+17
|\ \ | | | | | | [stable14] Fix loginflow with apptoken enter on iOS
| * | Fix loginflow with apptoken enter on iOSRoeland Jago Douma2019-01-044-11/+17
| |/ | | | | | | | | | | | | It seems iOS doesn't like us to change the location. So now we submit it to the server that geneartes the redirect. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13369 from nextcloud/backport/13367/stable14Morris Jobke2019-01-041-1/+1
|\ \ | |/ |/| [stable14] Throttle with correct metadata
| * Throttle with correct metadataRoeland Jago Douma2019-01-041-1/+1
|/ | | | | | Fixes #13202 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #13350 from nextcloud/backport/13172/stable14Roeland Jago Douma2019-01-042-21/+95
|\ | | | | [stable14] fix can change password check in case of encryption is enabled
| * fix can change password check in case of encryption is enabledBjoern Schiessle2019-01-042-21/+95
| | | | | | | | | | | | | | | | | | | | | | | | Admin should _not_ be able to change password when: - if an encryption module is loaded and it uses per-user keys - if encryption is enabled but no encryption modules are loaded Admin should be able to change the password when: - no encryption module is loaded and encryption is disabled - encryption module is loaded but it doesn't require per user keys Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #13353 from nextcloud/backport/13351/stable14Morris Jobke2019-01-041-9/+10
|\ \ | |/ |/| [stable14] Update the CRL
| * Update the CRLRoeland Jago Douma2019-01-041-9/+10
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-01-04144-556/+578
|
* Merge pull request #13224 from nextcloud/stb14-svg-controller-fixesJohn Molakvoæ2019-01-031-3/+4
|\ | | | | [stable14] Use only app path to get the icon on the svg api
| * Use only app path to get the icon on the svg apiJohn Molakvoæ (skjnldsv)2018-12-211-3/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #13254 from nextcloud/backport/13227/stable14Roeland Jago Douma2019-01-035-1/+246
|\ \ | | | | | | [stable14] Fix opening search results for comments
| * | Fix opening search results for commentsDaniel Calviño Sánchez2018-12-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | "OC.dirname" removes everything after the last "/", so a path without slashes is returned without changes. "result.path" does not include leading nor trailing "/", so when the path is for a file or folder in the base folder "OC.dirname(result.path)" returns "result.path". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance tests for opening search results for commentsDaniel Calviño Sánchez2018-12-243-0/+91
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance tests for searching commentsDaniel Calviño Sánchez2018-12-243-0/+152
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #13321 from ↵Morris Jobke2019-01-031-0/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/backport-of-issues-fixed-in-12105 [stable14] Force var to be integer
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 12:28:31 +0000