Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move capabilities to share by mail app | Bjoern Schiessle | 2017-04-10 | 5 | -21/+98 |
| | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | Merge pull request #4250 from nextcloud/disable-lookupserver-upload | Björn Schießle | 2017-04-10 | 5 | -4/+61 |
|\ | | | | | allow admin to disable lookupserver upload | ||||
| * | simplify return statement | Bjoern Schiessle | 2017-04-10 | 1 | -4/+4 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | allow to disable upload to lookup server, by default it is enabled | Bjoern Schiessle | 2017-04-07 | 5 | -1/+58 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars | Lukas Reschke | 2017-04-10 | 8 | -7/+280 |
|\ \ | | | | | | | don't remove owner property for public calendars | ||||
| * | | don't remove owner property for public calendars | Georg Ehrke | 2017-04-09 | 8 | -7/+280 |
| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-10 | 8 | -4/+36 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-09 | 20 | -16/+94 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-08 | 18 | -38/+44 |
| | | |||||
* | | Merge pull request #4136 from nextcloud/expire-date-for-all-shares | Morris Jobke | 2017-04-07 | 18 | -80/+524 |
|\ \ | | | | | | | Unified sharing options | ||||
| * | | adjust to changes in the theming app | Bjoern Schiessle | 2017-04-07 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | update unit tests | Bjoern Schiessle | 2017-04-07 | 5 | -42/+12 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | update capabilities | Bjoern Schiessle | 2017-04-07 | 2 | -6/+31 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | setting to disable sending password by mail | Bjoern Schiessle | 2017-04-03 | 7 | -3/+189 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | set expire date for all share types | Bjoern Schiessle | 2017-04-03 | 2 | -20/+27 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | allow password protected mail shares | Bjoern Schiessle | 2017-04-03 | 5 | -13/+185 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | fix share provider id | Bjoern Schiessle | 2017-04-03 | 1 | -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 Schiessle | 2017-04-03 | 5 | -11/+95 |
| | | | | | | | | | | | | | | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | Merge pull request #4244 from nextcloud/welcome-email | Morris Jobke | 2017-04-07 | 5 | -233/+163 |
|\ \ \ | | | | | | | | | New layout for welcome email | ||||
| * | | | Add support for theming | Lukas Reschke | 2017-04-07 | 5 | -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-info | Morris Jobke | 2017-04-07 | 2 | -16/+37 |
|\ \ \ | |/ / |/| | | Allow to change account info via provisioning api | ||||
| * | | Allow to change account info via provisioning api | Joas Schilling | 2017-04-07 | 2 | -16/+37 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-07 | 18 | -30/+70 |
| | | | |||||
* | | | Merge pull request #4153 from nextcloud/fix-upload | Joas Schilling | 2017-04-06 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix upload of folders in Chrome | ||||
| * | | | Fix upload of folders in Chrome | Morris Jobke | 2017-04-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint | Morris Jobke | 2017-04-05 | 2 | -16/+4 |
|\ \ \ \ | | | | | | | | | | | Don't list on public calendar endpoints | ||||
| * | | | | Don't list on public calendar endpoints | Lukas Reschke | 2017-04-05 | 2 | -16/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to allow listing here. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-06 | 28 | -48/+224 |
|/ / / / | |||||
* | | | | Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages | Roeland Jago Douma | 2017-04-05 | 1 | -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 list | Joas Schilling | 2017-03-30 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-05 | 32 | -56/+402 |
| | | | | |||||
* | | | | fix fseek against string not resource by removing append support | Arthur Schiwon | 2017-04-04 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12 | Roeland Jago Douma | 2017-04-04 | 2 | -18/+34 |
|\ \ \ \ | | | | | | | | | | | Make public links work with master key | ||||
| * | | | | Use master key for public links as well | Vincent Petry | 2017-03-24 | 2 | -23/+35 |
| | | | | | |||||
| * | | | | Add tests for null user | Vincent Petry | 2017-03-24 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Fix public link for master key | Vincent Petry | 2017-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead. | ||||
* | | | | | Some more hardening | Joas Schilling | 2017-04-04 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | file-upload.js modified : Remaining upload time corrected | SarthikaDhawan | 2017-04-04 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-04 | 22 | -38/+404 |
| | | | | | |||||
* | | | | | Merge pull request #3620 from ↵ | Morris Jobke | 2017-04-03 | 5 | -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\CustomPropertiesBackend | Georg Ehrke | 2017-03-27 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | | | | | allow sharees to edit certain calendar properties for themselves | Georg Ehrke | 2017-03-27 | 4 | -13/+205 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
* | | | | | | Merge pull request #4166 from ↵ | Roeland Jago Douma | 2017-04-03 | 1 | -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 calendar | Joas Schilling | 2017-03-30 | 1 | -2/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-03 | 20 | -8/+170 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-02 | 12 | -2/+56 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-01 | 22 | -168/+362 |
| | | | | | |||||
* | | | | | Merge pull request #3438 from nextcloud/external-storage-user-folder | Roeland Jago Douma | 2017-03-31 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow using '/' as external storage mountpoint | ||||
| * | | | | | Allow using '/' as external storage root | Robin Appelman | 2017-03-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-31 | 44 | -148/+382 |
| |/ / / / |/| | | | |