summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-12-2820-34/+336
|
* [tx-robot] updated from transifexNextcloud bot2016-12-2726-0/+82
|
* [tx-robot] updated from transifexNextcloud bot2016-12-26300-2186/+942
|
* Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patchLukas Reschke2016-12-234-57/+19
|\ | | | | [downstream] Fix maindetailsview favorite star patch
| * OC.Uploader does not have a 'state' method, therefore theChristoph Wurst2016-12-231-31/+0
| | | | | | | | | | | | dead code can be removed Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Fix indentationLukas Reschke2016-12-191-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Style modifications of favorite star on main detail view (#26658)Michael Jobst2016-12-193-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | * Style modifications of favorite star on main detail view * Removed unused opacity change on mouse over * favorite star title fixed * favorite star opacity should always be .7 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2819 from nextcloud/trash-ext-link-uselinkownerRoeland Jago Douma2016-12-231-0/+10
|\ \ | | | | | | Fallback to share link owner when no owner found
| * | Fallback to share link owner when no owner foundVincent Petry2016-12-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating link shares from external storage, the filesystem cannot find an owner in some scenarios (ex: system-wide mounts). In such cases, fall back to using the current user's trashbin which happens to also be the user who created the link share. Fixes an issue where this scenario made deletion impossible due to missing user information. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2816 from nextcloud/changing_how_favorites_are_serializedRoeland Jago Douma2016-12-231-1/+5
|\ \ \ | | | | | | | | Return explicit values instead of boolean from sabre (#26654)
| * | | Return explicit values instead of boolean from sabre (#26654)Sergio Bertolín2016-12-221-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2833 from nextcloud/downstream-26750Lukas Reschke2016-12-234-18/+113
|\ \ \ \ | | | | | | | | | | Introduce group display name support (#26750)
| * | | | fix testsArthur Schiwon2016-12-221-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Use group display name in sharing API + UIVincent Petry2016-12-224-16/+112
| | | | |
* | | | | Testing app switch to force-enable test user backendVincent Petry2016-12-232-2/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #2820 from nextcloud/testing-md5homeLukas Reschke2016-12-234-0/+112
|\ \ \ \ \ | |/ / / / |/| | | | Testing md5home (#26854)
| * | | | Testing md5home (#26854)Vincent Petry2016-12-224-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow clearing default user backends in config.php When specifying "user_backends" in config.php, a new option "default" when set to false will prevent the default user backend to be registered. The default one is the database backend. This makes it possible to select exclusive user backends from apps. * Testing app provides test user backend for alternative homes The backend provide md5 result to getHome() * Only md5 the user home when it's not the admin Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #2815 from nextcloud/fix-plural-filesMorris Jobke2016-12-221-37/+3
|\ \ \ \ \ | | | | | | | | | | | | Just use moment to comupte the time left for the upload - translation…
| * | | | | Just use moment to comupte the time left for the upload - translations are ↵Thomas Müller2016-12-221-37/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delivered as part of moment.js - fixes #26804 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2633 from nextcloud/2fa-activitiesMorris Jobke2016-12-2210-3/+623
|\ \ \ \ \ \ | | | | | | | | | | | | | | two-factor activities
| * | | | | | fix typoChristoph Wurst2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | catch specific BadMethodCallExceptionChristoph Wurst2016-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | fix minor issuesChristoph Wurst2016-12-195-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | push activity when backup codes are generatedChristoph Wurst2016-12-195-4/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | Publish, parse and filter 2FA activitiesChristoph Wurst2016-12-197-0/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-linkMorris Jobke2016-12-222-48/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Remove config change hook that deletes link shares (#26612)
| * | | | | | Remove config change hook that deletes link shares (#26612)Vincent Petry2016-12-192-48/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems broken. But also if link shares are not allowed, the link shares will continue to exist but will be denied. A future cleanup could be done through a background job. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2802 from nextcloud/trash-improvementsMorris Jobke2016-12-222-10/+81
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | let the owner restore files if they where moved out of a shared folder
| * | | | | make code more robustBjoern Schiessle2016-12-211-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | check for class name in case class is not loadedBjoern Schiessle2016-12-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | 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 #2803 from nextcloud/hide-notification-for-updatesJoas Schilling2016-12-221-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Hide update notification if notification center is enabled
| * | | | | Hide update notification if notification center is enabledMorris Jobke2016-12-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * then the notification center already contains this info Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #2808 from alantygel/patch-1Morris Jobke2016-12-221-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Translation string corrected > 1 user
| * | | | | Translation string corrected > 1 userAlan Tygel2016-12-211-1/+1
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2016-12-224-2/+4
|/ / / /
* | | | 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