summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-2264-150/+326
|
* Merge pull request #3568 from nextcloud/fix-pdfviewer-marginMorris Jobke2017-02-211-0/+1
|\ | | | | fix bottom margin of shared pdfviewer links
| * fix bottom margin of shared pdfviewer linksJan-Christoph Borchardt2017-02-211-0/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #3557 from marncz/masterJohn Molakvoæ2017-02-211-2/+2
|\ \ | | | | | | Fixed path in other folders search
| * | Fixed path in other folders searchMarcin2017-02-211-2/+2
| | | | | | | | | Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2158-106/+244
|/ /
* | Merge pull request #3521 from nextcloud/ldap-fix-uuid-attr-detectionLukas Reschke2017-02-2020-43/+895
|\ \ | | | | | | Fix Borken UUID Attribute Detection
| * | add tests to DB groupArthur Schiwon2017-02-172-0/+12
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Background jobs can take 4k of characters only. We find a good batch size.Arthur Schiwon2017-02-175-18/+89
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Add repair stepsArthur Schiwon2017-02-1714-2/+710
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | add integration test for uuid attr detectionArthur Schiwon2017-02-172-0/+88
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Fix determining the UUID attribute, default of the override is nullArthur Schiwon2017-02-171-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Fix integration test by not relying on Fake instancesArthur Schiwon2017-02-173-40/+13
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #3542 from nextcloud/add-crl-for-old-rainloop-certificateLukas Reschke2017-02-201-13/+13
|\ \ \ | | | | | | | | Add CRL entry for old rainloop certificate
| * | | Add CRL entry for old rainloop certificateLukas Reschke2017-02-201-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Certificate has been lost as per https://github.com/nextcloud/app-certificate-requests/pull/47 - let's revoke the old one thus. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #3550 from nextcloud/fix-misleading-wordingLukas Reschke2017-02-201-1/+1
|\ \ \ \ | | | | | | | | | | Fix misleading wording: searching is affected, not user access.
| * | | | Fix misleading wording: searching is affected, not user access.Arthur Schiwon2017-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #3551 from nextcloud/fix-search-result-thumbnailsLukas Reschke2017-02-201-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix thumbnail size of search results
| * | | | Fix thumbnail size of search resultsMorris Jobke2017-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #3466 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3544 from nextcloud/iservercontainer-containerMorris Jobke2017-02-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | IServerContainer is effectively an IContainer
| * | | | IServerContainer is effectively an IContainerChristoph Wurst2017-02-201-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | This relation was not explicitly declared in the class description. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3505 from robert-scheck/autoindexLukas Reschke2017-02-204-0/+8
|\ \ \ \ | | | | | | | | | | Only request "IndexIgnore" if mod_autoindex is loaded
| * | | | Only request "IndexIgnore" if mod_autoindex is loadedRobert Scheck2017-02-204-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robert Scheck <robert@fedoraproject.org>
* | | | | Merge pull request #3257 from nextcloud/updated-guest-checkboxesLukas Reschke2017-02-201-57/+52
|\ \ \ \ \ | |_|/ / / |/| | | | Fix checkboxes on login
| * | | | Fix checkboxes on loginJohn Molakvoæ (skjnldsv)2017-02-151-57/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-202-0/+4
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-196-2/+10
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1818-20/+492
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-176-4/+756
| |_|/ / |/| | |
* | | | Merge pull request #3515 from nextcloud/revert-3214-cache-storage-infoMorris Jobke2017-02-161-29/+5
|\ \ \ \ | | | | | | | | | | Revert "cache the storage info for 5 min"
| * | | | Revert "cache the storage info for 5 min"Morris Jobke2017-02-161-29/+5
|/ / / /
* | | | Merge pull request #3439 from nextcloud/oc-26963Lukas Reschke2017-02-161-8/+8
|\ \ \ \ | | | | | | | | | | Make sure invalid images don't flood the log file
| * | | | Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3507 from ↵Lukas Reschke2017-02-161-1/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/if-backend-implements-get-display-name-dont-force-one Don't force displayname if backend already provides one
| * | | | Don't force displayname if backend already provides oneLukas Reschke2017-02-161-1/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes. The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2287 from nextcloud/registrationEmailJohn Molakvoæ2017-02-165-8/+227
|\ \ \ \ | | | | | | | | | | Send password/activation link to new user
| * | | | add unit testsMorris Jobke2017-02-152-4/+166
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add l10nRoeland Jago Douma2017-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix setup issue and refine error messagesMorris Jobke2017-02-156-36/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | use random password if "password link" is enabledtobiasKaminsky2017-02-151-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | empty password only allowed if password link is senttobiasKaminsky2017-02-151-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | add setting for "send password link"tobiasKaminsky2017-02-155-21/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | send email to new user with password forgotten link to create own passwordtobiasKaminsky2017-02-151-4/+35
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-166-8/+16
| | | |
* | | | Merge pull request #2606 from temparus/masterblizzz2017-02-152-3/+13
|\ \ \ \ | | | | | | | | | | Add preLoginValidation hook
| * | | | Update license headerSandro Lutz2017-02-072-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | Merge remote-tracking branch 'nextcloud/master'Sandro Lutz2017-02-071293-19077/+36242
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | | Add missing use statement for PublicEmitterSandro Lutz2017-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | | Fix typo for UserManager variableSandro Lutz2017-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>