summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* add a copy to the owners trash bin if another user moves a file out of a ↵Bjoern Schiessle2016-12-212-10/+67
| | | | | | shared folder Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #2758 from nextcloud/only-one-dav-backendLukas Reschke2016-12-214-25/+36
|\ | | | | Register only one dav backend
| * Fix error when $view is null when being passed into some pluginsThomas Müller2016-12-192-24/+27
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix "Call to a member function getUID() on null"Thomas Müller2016-12-191-0/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * No challenge within federated authThomas Müller2016-12-191-0/+8
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Allow registration of federated authThomas Müller2016-12-191-4/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Register only one dav auth backendThomas Citharel2016-12-191-4/+4
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2016-12-216-2/+6
| |
* | Merge pull request #2273 from nextcloud/fix_invalid_calendarLukas Reschke2016-12-205-0/+452
|\ \ | | | | | | Add DAV repair step to fix calendar data
| * | Add DAV repair step to fix calendar dataRoeland Jago Douma2016-11-245-0/+452
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Add SMB tests and execute files_external testsLukas Reschke2016-12-207-261/+81
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2016-12-2072-142/+660
| | |
* | | remove frequent, unimportant log messageArthur Schiwon2016-12-191-5/+0
| | | | | | | | | | | | | | | | | | Fixes #2585 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | When grouping shares, sort by stime then id (#26777)Vincent Petry2016-12-191-1/+1
| |/ |/| | | | | | | | | | | If share times are equal, the first share should still win instead of having the shares swapped. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2689 from andreas-p/fix-remote-conflictLukas Reschke2016-12-191-1/+12
|\ \ | | | | | | Fix showConflict
| * | Fix showConflictpflug2016-12-191-1/+12
| | | | | | | | | | | | | | | | | | | | | use getFullFileName to show conflicting file add original.directory to make fileExists happy Signed-off-by: Andreas Pflug <dev@admin4.org>
* | | Merge pull request #2504 from nextcloud/downstream-ldap-15Roeland Jago Douma2016-12-161-22/+122
|\ \ \ | | | | | | | | Downstream LDAP Range Support
| * | | adjust: sanitizeDN resides in HelperArthur Schiwon2016-12-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Extract lowercase conversion out of the loopJuan Pablo Villafáñez2016-12-051-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | range support for LDAP read operationsArthur Schiwon2016-12-051-22/+121
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #2550 from nextcloud/smb-notify-renameLukas Reschke2016-12-161-3/+5
|\ \ \ \ | | | | | | | | | | Fix order of parameters when getting notified of smb renames
| * | | | Fix order of parameters when getting notified of smb renamesRobin Appelman2016-12-071-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #1678 from nextcloud/smb-stat-rootLukas Reschke2016-12-161-2/+44
|\ \ \ \ \ | | | | | | | | | | | | Fix mtimes for share root
| * | | | | Fix mtimes for share rootRobin Appelman2016-10-111-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activityLukas Reschke2016-12-168-10/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove leading slash from sharing activity
| * | | | | | Remove leading slash from sharing activityJoas Schilling2016-12-158-10/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Fix TodoTestRoeland Jago Douma2016-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #2625 from nextcloud/fix-todo-filterRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix the Todos filter
| * | | | | | Fix the Todos filterJoas Schilling2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmaskedLukas Reschke2016-12-153-3/+37
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | use unmasked permissions in shared scanner
| * | | | | | use unmasked permissions in shared scannerRobin Appelman2016-12-143-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #2674 from nextcloud/lookup-server-connector-12Morris Jobke2016-12-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | mark nc12 as supported for the lookup_server_connector
| * | | | | | | mark nc12 as supporterRobin Appelman2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #2665 from nextcloud/remove-db-class-and-interfaceRoeland Jago Douma2016-12-141-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove IDb interface which was deprecated for 3 years already
| * | | | | | | | Remove IDb interface which was deprecated for 3 years alreadyJoas Schilling2016-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Don't set Content-Disposition header if one already existsLukas Reschke2016-12-141-2/+4
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients. Fixes https://github.com/nextcloud/server/issues/1992 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | Merge pull request #2654 from nextcloud/increase-master-versionRoeland Jago Douma2016-12-1420-40/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update app versions and requirements
| * | | | | | | | Update app versions and requirementsJoas Schilling2016-12-1320-40/+40
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / / / / / / Fix overwriting parameterRoeland Jago Douma2016-12-131-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2641 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #2637 from nextcloud/mount-cache-storageidLukas Reschke2016-12-131-15/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | also compare storage ids when checking for changed mounts
| * | | | | | | reuse cacheentryRobin Appelman2016-12-131-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #2615 from nextcloud/daita-sharecontrollerLukas Reschke2016-12-121-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Download a file in a subfolder in a sharedlink is not working
| * | | | | | | | update phpdocMaxence Lange2016-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@pontapreta.net>
| * | | | | | | | Download a file in a subfolder in a sharedlink is not workingMaxence Lange2016-12-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
* | | | | | | | | Merge pull request #2620 from nextcloud/theming-externalfilesLukas Reschke2016-12-121-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Show theming icons on external storage folders
| * | | | | | | | Show theming icons on external storage foldersJulius Haertl2016-12-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | | | | | improve wording of admin settings to enable search on the public address bookBjoern Schiessle2016-12-121-1/+1
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-1210-6/+68
| |/ / / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-112-0/+16
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendarsLukas Reschke2016-12-102-0/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not add invites into read-only calendars