summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3693 from nextcloud/get-user-folder-of-correct-userRoeland Jago Douma2017-03-093-51/+68
|\ | | | | Get the user folder of the correct user for mention notifications
| * Get the user folder of the correct userJoas Schilling2017-03-093-51/+68
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3621 from kuimovvg/masterRoeland Jago Douma2017-03-091-0/+1
|\ \ | |/ |/| don't setted status when file is lock
| * don't setted status when file is lockvkuimov2017-02-251-0/+1
| |
* | Merge pull request #3611 from nextcloud/announce-trsuted-server-endpointsBjörn Schießle2017-03-091-0/+14
|\ \ | | | | | | Announce trusted server endpoints
| * | add new routes for trusted servers which are more align with the other ↵Bjoern Schiessle2017-03-091-0/+14
| | | | | | | | | | | | | | | | | | end-points Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #3360 from nextcloud/dav-searchRobin Appelman2017-03-083-0/+572
|\ \ \ | | | | | | | | Implement webdav SEARCH
| * | | add tests for filesearchbackendRobin Appelman2017-03-012-7/+303
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Implement webdav SEARCHRobin Appelman2017-03-012-6/+206
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | add icewind/searchdavRobin Appelman2017-02-281-0/+76
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-lockingRoeland Jago Douma2017-03-082-0/+2
|\ \ \ \ | | | | | | | | | | Add new user agent of windows 10 dav backend
| * | | | Set a status code when setting a bodyJoas Schilling2017-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add new user agent of windows 10 dav backendJoas Schilling2017-03-071-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Thanks Microsoft Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3725 from ↵Roeland Jago Douma2017-03-082-1/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-fac-55-mimetype-detection-on-public-uploads Fix mimetype detection on public uploads for the workflow engine
| * | | | Fix admin panel missing some JS filesJoas Schilling2017-03-061-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix mimetype detection on public uploads for the workflow engineJoas Schilling2017-03-061-1/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-086-4/+52
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-072-8/+8
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-03-0610-6/+214
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-0512-16/+336
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-0414-2/+320
| | |
* | | Merge pull request #3597 from nextcloud/remove-data-from-lookup-serverRoeland Jago Douma2017-03-031-19/+30
|\ \ \ | | | | | | | | add posibility to remove all personal data from lookup server
| * | | add posibility to remove all personal data from lookup serverBjoern Schiessle2017-02-231-19/+30
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #3607 from nextcloud/api-to-resend-welcome-messageRoeland Jago Douma2017-03-033-1/+619
|\ \ \ \ | | | | | | | | | | OCS API endpoint to resend welcome message
| * | | | OCS API endpoint to resend welcome messageMorris Jobke2017-02-283-1/+619
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger the welcome message to be send * fixes #3367 example curl statement: curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H "OCS-APIRequest: true" -u admin:password -X POST Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3678 from ↵Roeland Jago Douma2017-03-034-55/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3677-caldav-sharing-permission-problem CalDAV sharing permissions should not depend on the order
| * | | | | Make sure shares use read-write when availableJoas Schilling2017-03-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Don't waste energy unless necessaryJoas Schilling2017-03-022-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add a unit test for the broken caseJoas Schilling2017-03-022-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Unit test cleanupJoas Schilling2017-03-021-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3689 from nextcloud/cleanup-legacy-classesJoas Schilling2017-03-031-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup not used legacy classes
| * | | | | | Cleanup not used legacy classesMorris Jobke2017-03-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Person was removed via #2170 * other lcasses/interfaces are not used at all Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3687 from nextcloud/proper-transfer-ownership-dateJoas Schilling2017-03-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use a proper date format for transfer ownership
| * | | | | | | Use a proper date format for transfer ownershipMorris Jobke2017-03-021-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * on Windows : is not allowed as filename and doesn't get synced then * uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3686 from nextcloud/downstream-27282Joas Schilling2017-03-032-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | filelist only refreshed if directory changes
| * | | | | | | filelist only refreshed if directory changesnoveens2017-03-022-0/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check introduced at another method comment added to explain one check comment added to explain one check unit tests added small fixes in unit tests missing semicolon added Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3681 from nextcloud/dav-nonexisting-ownerMorris Jobke2017-03-021-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | handle non existing owners when handling dav requests
| * | | | | | | handle non existing owners when handling dav requestsRobin Appelman2017-03-021-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-0318-6/+348
| |/ / / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-02156-18/+9830
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3676 from individual-it/trash_problemJoas Schilling2017-03-021-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix for #3201
| * | | | | | fix for #3201Artur Neumann2017-03-021-2/+3
| | | | | | |
| * | | | | | Revert "fix mouse pointer"Artur Neumann2017-03-021-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a4e2dc3033e40b58e5e72e2bda85a327ff092464.
* | | | | | | Transifex config for theming appMorris Jobke2017-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-022-0/+4
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-018-22/+78
| |/ / / / |/| | | |
* | | | | Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uriRoeland Jago Douma2017-02-281-41/+121
|\ \ \ \ \ | | | | | | | | | | | | Fix saving backup codes by using a correct data uri
| * | | | | Fix saving backup codes by using a correct data uriChristoph Wurst2017-02-281-41/+121
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #3651 from ↵Morris Jobke2017-02-281-76/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | nextcloud/refactor/provisioning-usercontroller-test Refactor provision api app's UserControllerTest
| * | | | | Refactor provision api app's UserControllerTestChristoph Wurst2017-02-281-76/+67
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace deprecated getMock with createMock * Use createMock consistently * Use php's ::class references Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>