summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-3154-224/+568
|
* Merge pull request #3832 from nextcloud/fix_1303Roeland Jago Douma2017-03-301-0/+4
|\ | | | | Do not clear CSRF token on logout (fix for #1303)
| * Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4150 from nextcloud/capped-memcache-pushJoas Schilling2017-03-302-2/+7
|\ \ | | | | | | support pushing to CappedMemoryCache
| * | user ids are stringsRobin Appelman2017-03-301-1/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | support pushing to CappedMemoryCacheRobin Appelman2017-03-301-1/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4128 from nextcloud/updateclipboardJoas Schilling2017-03-306-1485/+15
|\ \ \ | | | | | | | | Update clipboard.js
| * | | Use minified clipboard.jsRoeland Jago Douma2017-03-295-1517/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Update clipboard.jsRoeland Jago Douma2017-03-292-210/+246
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4143 from nextcloud/ldap-downstream-64Roeland Jago Douma2017-03-302-32/+366
|\ \ \ \ | | | | | | | | | | Correctly apply quota
| * | | | Include tests for "default" and "none" quotasJuan Pablo Villafáñez2017-03-291-0/+80
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Add comments in the updateQuota method to explain the behaviorJuan Pablo Villafáñez2017-03-291-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Add new testes to cover more casesJuan Pablo Villafáñez2017-03-291-0/+210
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Adjust current tests to match the expectationsJuan Pablo Villafáñez2017-03-291-28/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Check if the user exists before trying to set the quotaJuan Pablo Villafáñez2017-03-291-4/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Correctly apply quotaJuan Pablo Villafáñez2017-03-291-6/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #3089 from nextcloud/cache-move-single-queryRoeland Jago Douma2017-03-3018-28/+542
|\ \ \ \ \ | |_|_|/ / |/| | | | Move all children of a folder in a single query
| * | | | rename fun to funcRobin Appelman2017-03-304-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add tests for query builder (i)likeRobin Appelman2017-03-302-1/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | dont double escapeRobin Appelman2017-03-302-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update autoloaderRobin Appelman2017-03-302-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix licence headersRobin Appelman2017-03-306-48/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Move all children of a folder in a single queryRobin Appelman2017-03-301-18/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add function builder to the query builderRobin Appelman2017-03-308-0/+326
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add support for escaping like parameters when using the query builderRobin Appelman2017-03-304-8/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add MD5() to sqliteRobin Appelman2017-03-301-0/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-308-18/+18
|\ \ \ \ | | | | | | | | | | Fix gzip files for Safari
| * | | | Fix gzip files for SafariMorris Jobke2017-03-298-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4100 from nextcloud/header-indicatorMorris Jobke2017-03-292-2/+26
|\ \ \ \ \ | | | | | | | | | | | | show triangle below user menu too when an entry inside there is active
| * | | | | adjust opacity of search and gear icons in headerJan-Christoph Borchardt2017-03-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | add pointer finger to full clickable app icon areaJan-Christoph Borchardt2017-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | show triangle below user menu too when an entry inside there is activeJan-Christoph Borchardt2017-03-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-3098-308/+402
| | | | | |
* | | | | | Merge pull request #4142 from nextcloud/numeric_avatarMorris Jobke2017-03-291-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow avatars for full numeric users
| * | | | | | Fix testsRoeland Jago Douma2017-03-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Allow avatars for full numeric usersRoeland Jago Douma2017-03-291-0/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4087 Because of fancy javascript if a full numeric uid was used javascript would convert this to an int. Now we just convert everything to a string first. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4141 from nextcloud/ldap-downstream-9Morris Jobke2017-03-291-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Convert the group limit to match the same behaviour as the user search
| * | | | | | Convert the group limit to match the same behaviour as the user searchJuan Pablo Villafáñez2017-03-291-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #4145 from nextcloud/ldap-downstream-54Roeland Jago Douma2017-03-291-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add tooltips to LDAP wizard special attributtes
| * | | | | | Add tooltips to LDAP wizard special attributtesDavid Toledo2017-03-291-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #4108 from nextcloud/color-variable-renameRoeland Jago Douma2017-03-2920-40/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491
| * | | | | | also rename defaultMailHeaderColor to defaultColorPrimaryJan-Christoph Borchardt2017-03-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Add fallback to getMailHeaderColor so we don't break existing themesJulius Härtl2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2920-37/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuidRoeland Jago Douma2017-03-291-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ldap no memberof with memberuid
| * \ \ \ \ \ Merge branch 'master' of https://github.com/nextcloud/server into ↵Andreas Pflug2017-01-3144-192/+1037
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ldap_no-memberof-with-memberuid
| * | | | | | | Don't try to use memberof on posixgroups, since it doesn't supportAndreas Pflug2017-01-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memberUid attributes. Signed-off-by: Andreas Pflug <dev@admin4.org>
* | | | | | | | Merge pull request #4062 from nextcloud/downstream-26872Morris Jobke2017-03-298-3/+427
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Adding dav resource for avatars
| * | | | | | | Don't output jpeg if we request pngRoeland Jago Douma2017-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Fix PHPDocLukas Reschke2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 14:58:01 +0000