summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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>
| * | | | Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-012-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | Change where preLogin hook gets calledSandro Lutz2017-02-012-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | Remove preLoginValidation hookSandro Lutz2017-02-012-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | Fix indentationSandro Lutz2017-02-012-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | | Add preLoginValidation hookSandro Lutz2017-02-012-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
* | | | | Merge pull request #3495 from nextcloud/dav-protectedRoeland Jago Douma2017-02-151-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Make it easier to subclass DAV storage
| * | | | | Make it easier to subclass DAV storageRobin Appelman2017-02-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3449 from nextcloud/notify-subfolder-self-testRoeland Jago Douma2017-02-151-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the notify self test for subfolders more reliable
| * | | | | | fix self test for non leading slashRobin Appelman2017-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Make the notify self test for subfolders more reliableRobin Appelman2017-02-101-1/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3447 from nextcloud/getmetadata-permissions-maskRoeland Jago Douma2017-02-152-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | also apply permissions mask in getMetaData
| * | | | | | also apply permissions mask in getMetaDataRobin Appelman2017-02-102-1/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3262 from nextcloud/jail-scanner-storage-idRoeland Jago Douma2017-02-153-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure we use the correct storage id and parent id when scanning a jailed storage
| * | | | | | Make sure we use the correct storage id when scanning a jailed storageRobin Appelman2017-01-253-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #2704 from nextcloud/2fa-fix-backup-codes-printRoeland Jago Douma2017-02-151-9/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | print the backup codes tab and not the current one
| * | | | | | add title to backup codes print pageChristoph Wurst2017-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | print and close the new tab, not the current one when printing backup codesChristoph Wurst2017-01-171-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #3421 from espro/freeipa-uuid-fixMorris Jobke2017-02-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update uuidAttributes list to include FreeIPA's ipauniqueid
| * | | | | | | Update uuidAttributes list to include FreeIPA's ipauniqueidBrent Bloxam2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
* | | | | | | | Merge pull request #3485 from nextcloud/Popovermenu-files-css-fixblizzz2017-02-151-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Popovermenu files css fix
| * | | | | | | | Css fixJohn Molakvoæ (skjnldsv)2017-02-151-4/+0
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #3473 from nextcloud/fix-addressbook-deletionblizzz2017-02-154-3/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Address book data lost when any user receiving a share is deleted
| * | | | | | | | this is publicJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | Test fixJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | testsJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | getUsersOwnAddressBooksJohn Molakvoæ (skjnldsv)2017-02-142-1/+28
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #3487 from nextcloud/fix-files-header-nameblizzz2017-02-153-13/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix app name of files app
| * | | | | | | | Fix app name of files appMorris Jobke2017-02-143-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 21:03:23 +0000