summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
| | | | | | | | |
* | | | | | | | | Merge pull request #3480 from nextcloud/screensharing-iconMorris Jobke2017-02-145-0/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add screensharing icon
| * | | | | | | | | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-143-1/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix DI of the cloud id manager into apps
| * | | | | | | | Fix DI of the cloud id manager into appsJoas Schilling2017-02-143-1/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #3341 from nextcloud/transparent-white-checkboxJan-Christoph Borchardt2017-02-143-8/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Transparent white checkbox
| * | | | | | | | Transparent white checkboxJohn Molakvoæ (skjnldsv)2017-01-313-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-1419-138/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Always enable avatars
| * | | | | | | | | Always enable avatarsMorris Jobke2017-02-1319-138/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we introduced this setting in the begining because our avatar support caused some performance issues, but we fixed them and should only provide one way how Nextcloud looks Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-145-3/+97
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Add option to enable locking debug logging
| * | | | | | | | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | | | | Add comment about log.conditionMorris Jobke2017-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | | Add option to enable locking debug loggingRobin Appelman2017-02-132-3/+58
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1468-206/+1094
| | | | | | | | |
* | | | | | | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-133-3/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Recognize .bat and .cmd files
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 22:13:01 +0000