Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4143 from nextcloud/ldap-downstream-64 | Roeland Jago Douma | 2017-03-30 | 2 | -32/+366 |
|\ \ \ \ | | | | | | | | | | | Correctly apply quota | ||||
| * | | | | Include tests for "default" and "none" quotas | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+80 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Add comments in the updateQuota method to explain the behavior | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Add new testes to cover more cases | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+210 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Adjust current tests to match the expectations | Juan Pablo Villafáñez | 2017-03-29 | 1 | -28/+26 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Check if the user exists before trying to set the quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Correctly apply quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -6/+33 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-30 | 88 | -172/+230 |
| | | | | | |||||
* | | | | | Merge pull request #4141 from nextcloud/ldap-downstream-9 | Morris Jobke | 2017-03-29 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Convert the group limit to match the same behaviour as the user search | ||||
| * | | | | | Convert the group limit to match the same behaviour as the user search | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+5 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | Merge pull request #4145 from nextcloud/ldap-downstream-54 | Roeland Jago Douma | 2017-03-29 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add tooltips to LDAP wizard special attributtes | ||||
| * | | | | | Add tooltips to LDAP wizard special attributtes | David Toledo | 2017-03-29 | 1 | -3/+3 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | Merge pull request #4108 from nextcloud/color-variable-rename | Roeland Jago Douma | 2017-03-29 | 13 | -25/+25 |
|\ \ \ \ \ | | | | | | | | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491 | ||||
| * | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491 | Jan-Christoph Borchardt | 2017-03-29 | 13 | -25/+25 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid | Roeland Jago Douma | 2017-03-29 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Ldap no memberof with memberuid | ||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/nextcloud/server into ↵ | Andreas Pflug | 2017-01-31 | 21 | -78/+598 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | ldap_no-memberof-with-memberuid | ||||
| * | | | | | | Don't try to use memberof on posixgroups, since it doesn't support | Andreas Pflug | 2017-01-31 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memberUid attributes. Signed-off-by: Andreas Pflug <dev@admin4.org> | ||||
* | | | | | | | Merge pull request #4062 from nextcloud/downstream-26872 | Morris Jobke | 2017-03-29 | 8 | -3/+427 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Adding dav resource for avatars | ||||
| * | | | | | | Don't output jpeg if we request png | Roeland Jago Douma | 2017-03-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | Fix PHPDoc | Lukas Reschke | 2017-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | | | Fix inspection results | Roeland Jago Douma | 2017-03-29 | 3 | -22/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | Adding AvatarNodeTest | Thomas Müller | 2017-03-29 | 2 | -1/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | Adding AvatarHomeTest | Thomas Müller | 2017-03-29 | 4 | -9/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | Return last modification time to allow proper listing in cadaver | Thomas Müller | 2017-03-29 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | Adding dav resource for avatars | Thomas Müller | 2017-03-29 | 5 | -1/+233 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | | Merge pull request #4066 from nextcloud/always-fix-the-values-live | Roeland Jago Douma | 2017-03-29 | 7 | -452/+371 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Directly fix invalid values of DTEND and DTSTART | ||||
| * | | | | | | | Directly fix the values | Joas Schilling | 2017-03-26 | 7 | -452/+371 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p | Joas Schilling | 2017-03-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Replace unecessary unescaped prints with print |