summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-1152-86/+102
|
* Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-101-1/+30
|\ | | | | Allow getting the unread comment count for an entire folder at once
| * Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-301-1/+30
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilitiesRoeland Jago Douma2017-04-105-21/+98
|\ \ | | | | | | move share by mail capabilities to the share provider
| * | move capabilities to share by mail appBjoern Schiessle2017-04-105-21/+98
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-101-3/+5
|\ \ \ | |/ / |/| | Allow searching file by fileid
| * | Allow searching file by fileidRobin Appelman2017-04-051-3/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4250 from nextcloud/disable-lookupserver-uploadBjörn Schießle2017-04-105-4/+61
|\ \ \ | | | | | | | | allow admin to disable lookupserver upload
| * | | simplify return statementBjoern Schiessle2017-04-101-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | allow to disable upload to lookup server, by default it is enabledBjoern Schiessle2017-04-075-1/+58
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendarsLukas Reschke2017-04-108-7/+280
|\ \ \ \ | | | | | | | | | | don't remove owner property for public calendars
| * | | | don't remove owner property for public calendarsGeorg Ehrke2017-04-098-7/+280
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-108-4/+36
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0920-16/+94
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0818-38/+44
| | | |
* | | | Merge pull request #4136 from nextcloud/expire-date-for-all-sharesMorris Jobke2017-04-0718-80/+524
|\ \ \ \ | | | | | | | | | | Unified sharing options
| * | | | adjust to changes in the theming appBjoern Schiessle2017-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | update unit testsBjoern Schiessle2017-04-075-42/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | update capabilitiesBjoern Schiessle2017-04-072-6/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | setting to disable sending password by mailBjoern Schiessle2017-04-037-3/+189
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | set expire date for all share typesBjoern Schiessle2017-04-032-20/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | allow password protected mail sharesBjoern Schiessle2017-04-035-13/+185
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | fix share provider idBjoern Schiessle2017-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add new password column to the share table in order to set passwords for ↵Bjoern Schiessle2017-04-035-11/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #4244 from nextcloud/welcome-emailMorris Jobke2017-04-075-233/+163
|\ \ \ \ \ | | | | | | | | | | | | New layout for welcome email
| * | | | | Add support for themingLukas Reschke2017-04-075-233/+163
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Add support for theming in generated emails and simplify API Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4221 from nextcloud/provisioning-api-for-account-infoMorris Jobke2017-04-072-16/+37
|\ \ \ \ \ | |/ / / / |/| | | | Allow to change account info via provisioning api
| * | | | Allow to change account info via provisioning apiJoas Schilling2017-04-072-16/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0718-30/+70
| | | | |
* | | | | Merge pull request #4153 from nextcloud/fix-uploadJoas Schilling2017-04-061-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix upload of folders in Chrome
| * | | | | Fix upload of folders in ChromeMorris Jobke2017-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpointMorris Jobke2017-04-052-16/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't list on public calendar endpoints
| * | | | | | Don't list on public calendar endpointsLukas Reschke2017-04-052-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to allow listing here. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0628-48/+224
|/ / / / / /
* | | | | | Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storagesRoeland Jago Douma2017-04-051-5/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Also add the root of external storages to the file id list
| * | | | | Also add the root of external storages to the file id listJoas Schilling2017-03-301-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0532-56/+402
| | | | | |
* | | | | | fix fseek against string not resource by removing append supportArthur Schiwon2017-04-041-7/+4
| |_|_|/ / |/| | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12Roeland Jago Douma2017-04-042-18/+34
|\ \ \ \ \ | | | | | | | | | | | | Make public links work with master key
| * | | | | Use master key for public links as wellVincent Petry2017-03-242-23/+35
| | | | | |
| * | | | | Add tests for null userVincent Petry2017-03-241-1/+5
| | | | | |
| * | | | | Fix public link for master keyVincent Petry2017-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead.
* | | | | | Some more hardeningJoas Schilling2017-04-041-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | file-upload.js modified : Remaining upload time correctedSarthikaDhawan2017-04-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0422-38/+404
| | | | | |
* | | | | | Merge pull request #3620 from ↵Morris Jobke2017-04-035-15/+207
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/1463/editable_color_name_for_shared_calendars allow sharees to edit certain calendar properties for themselves
| * | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackendGeorg Ehrke2017-03-273-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | allow sharees to edit certain calendar properties for themselvesGeorg Ehrke2017-03-274-13/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #4166 from ↵Roeland Jago Douma2017-04-031-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | nextcloud/issue-4165-invalid-int-for-transparency-on-calendars Make sure transparency is an integer when saving a calendar
| * | | | | | Make sure transparency is an integer when saving a calendarJoas Schilling2017-03-301-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>