summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9488 from nextcloud/disabled-users-fixblizzz2018-05-254-5/+34
|\ | | | | Added disabled count per groups & fixed disabled users query
| * Disabled fix since new users listJohn Molakvoæ (skjnldsv)2018-05-243-2/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-05-241-2/+18
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Added disabled count per groupsJohn Molakvoæ (skjnldsv)2018-05-241-1/+6
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9593 from nextcloud/fwdport/9586/masterMorris Jobke2018-05-259-23/+166
|\ \ | | | | | | add privacy link to theming and fix scrollbars
| * | addjust footer height when legal links are present. fixes #9572Arthur Schiwon2018-05-243-3/+16
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | also add a privacy linkArthur Schiwon2018-05-248-21/+151
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / [tx-robot] updated from transifexNextcloud bot2018-05-25104-6/+136
|/
* [tx-robot] updated from transifexNextcloud bot2018-05-24114-108/+132
|
* Fix ExpiresSharesJobTestRoeland Jago Douma2018-05-231-16/+21
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Use node apiRoeland Jago Douma2018-05-231-27/+13
| | | | | | | * delete old test that can't happen anymore since we check for a valid node Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-05-23152-70/+888
|
* Merge pull request #9545 from ↵Morris Jobke2018-05-221-0/+4
|\ | | | | | | | | nextcloud/bugfix/noid/ellipsis-below-public-textfiles Remove ellipsis below public text file shares
| * Remove ellipsis below public text file sharesMorris Jobke2018-05-221-0/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Add testsRoeland Jago Douma2018-05-222-40/+324
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Don't use special chars to avoid confusionRoeland Jago Douma2018-05-221-0/+7
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Rotate tokenRoeland Jago Douma2018-05-221-11/+43
| | | | | | | | | | | | | | | | On a refresh token request: * rorate * reset expire Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Authenticate the clients on requesting a tokenRoeland Jago Douma2018-05-221-2/+45
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fail if the response type is not properly setRoeland Jago Douma2018-05-221-1/+10
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Set OAuth token expirationRoeland Jago Douma2018-05-225-2/+89
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9515 from ↵Roeland Jago Douma2018-05-221-0/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share Regenerate session id after public share auth
| * | Regenerate session id after public share authRoeland Jago Douma2018-05-171-0/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2224-22/+124
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-208-2/+26
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-1914-0/+72
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-18284-412/+412
|/ /
* | Merge pull request #9437 from nextcloud/feature/noid/imprintRoeland Jago Douma2018-05-179-20/+140
|\ \ | |/ |/| allow to specify a link to a legal notice
| * Use link not address in labels for URLsArthur Schiwon2018-05-161-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix undo for url-typed inputsArthur Schiwon2018-05-113-4/+9
| | | | | | | | | | | | and minor adjustments Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix testsArthur Schiwon2018-05-112-0/+12
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * allow to specify a link to a legal noticeArthur Schiwon2018-05-097-16/+119
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #9503 from nextcloud/bugfix/noid/theming-mime-checkMorris Jobke2018-05-172-8/+13
|\ \ | | | | | | Check mime type properly in theming app
| * | Add Content-Disposition headerJulius Härtl2018-05-172-1/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Properly check mime type of the uploaded fileJulius Härtl2018-05-172-8/+10
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-17186-308/+308
| | |
* | | Delete the previews when a version is restoredRoeland Jago Douma2018-05-141-0/+8
|/ / | | | | | | | | | | | | | | | | Fixes #9469 When a version of a file is restored the previews are no longer valid. Thus we should remove them so they are regenerated. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9420 from nextcloud/feature/5263/cleanup_previesMorris Jobke2018-05-141-5/+11
|\ \ | | | | | | Cleanup previews in the background
| * | Fix testsRoeland Jago Douma2018-05-141-5/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9446 from ↵Morris Jobke2018-05-147-2/+26
|\ \ \ | |/ / |/| | | | | | | | nextcloud/feature/9416/fileid_trashbin_dav_endpoint Support fileid propfind on trash endpoint
| * | Support fileid propfind on trash endpointRoeland Jago Douma2018-05-117-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9416 In order to support previews on mobile clients they will need the fileid of files in the trashbin. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9464 from nextcloud/fix/noid/version_expiration_DIMorris Jobke2018-05-144-28/+8
|\ \ \ | | | | | | | | Use more magic DI in files_versions
| * | | Use more magic DI in files_versionsRoeland Jago Douma2018-05-114-28/+8
| |/ / | | | | | | | | | | | | | | | | | | There is no need to register this. The system can figure out by itself what it needs to do :) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-1388-86/+88
| | |
* | | Merge pull request #9288 from GitHubUser4234/ldap_password_renew_nc13fixRoeland Jago Douma2018-05-122-10/+125
|\ \ \ | | | | | | | | Ldap password renewal fixes for NC13
| * | | Remove unneeded semicolon and parenthesesRoger Szabo2018-04-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | css indent alignmentRoger Szabo2018-04-251-70/+87
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | adjust css to nc13 core changesRoger Szabo2018-04-241-5/+107
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | remove reset password linkRoger Szabo2018-04-241-6/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-1222-50/+72
| |/ / |/| |
* | | Merge pull request #9447 from nextcloud/feature/noid/trashbin_propfind_oc_sizeRoeland Jago Douma2018-05-114-0/+14
|\ \ \ | | | | | | | | Trashbin propfind respond to oc:size