Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12 | Roeland Jago Douma | 2017-04-04 | 2 | -18/+34 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
* | | | | | | Some more hardening | Joas Schilling | 2017-04-04 | 1 | -6/+7 | |
* | | | | | | file-upload.js modified : Remaining upload time corrected | SarthikaDhawan | 2017-04-04 | 1 | -1/+10 | |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-04 | 22 | -38/+404 | |
* | | | | | | Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_... | Morris Jobke | 2017-04-03 | 5 | -15/+207 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend | Georg Ehrke | 2017-03-27 | 3 | -4/+4 | |
| * | | | | | | allow sharees to edit certain calendar properties for themselves | Georg Ehrke | 2017-03-27 | 4 | -13/+205 | |
* | | | | | | | Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparen... | Roeland Jago Douma | 2017-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Make sure transparency is an integer when saving a calendar | Joas Schilling | 2017-03-30 | 1 | -2/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | [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 root | Robin Appelman | 2017-03-23 | 2 | -2/+2 | |
* | | | | | | | [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 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Include tests for "default" and "none" quotas | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+80 | |
| * | | | | | Add comments in the updateQuota method to explain the behavior | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+14 | |
| * | | | | | Add new testes to cover more cases | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+210 | |
| * | | | | | Adjust current tests to match the expectations | Juan Pablo Villafáñez | 2017-03-29 | 1 | -28/+26 | |
| * | | | | | Check if the user exists before trying to set the quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -4/+9 | |
| * | | | | | Correctly apply quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -6/+33 | |
* | | | | | | [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 | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+5 | |
| |/ / / / | ||||||
* | | | | | 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 | David Toledo | 2017-03-29 | 1 | -3/+3 | |
| |/ / / / | ||||||
* | | | | | 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 | Jan-Christoph Borchardt | 2017-03-29 | 13 | -25/+25 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid | Roeland Jago Douma | 2017-03-29 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/nextcloud/server into ldap_no-mem... | Andreas Pflug | 2017-01-31 | 21 | -78/+598 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Don't try to use memberof on posixgroups, since it doesn't support | Andreas Pflug | 2017-01-31 | 1 | -1/+3 | |
* | | | | | | | Merge pull request #4062 from nextcloud/downstream-26872 | Morris Jobke | 2017-03-29 | 8 | -3/+427 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Don't output jpeg if we request png | Roeland Jago Douma | 2017-03-29 | 1 | -1/+2 | |
| * | | | | | | Fix PHPDoc | Lukas Reschke | 2017-03-29 | 1 | -1/+1 | |
| * | | | | | | Fix inspection results | Roeland Jago Douma | 2017-03-29 | 3 | -22/+23 | |
| * | | | | | | Adding AvatarNodeTest | Thomas Müller | 2017-03-29 | 2 | -1/+48 | |
| * | | | | | | Adding AvatarHomeTest | Thomas Müller | 2017-03-29 | 4 | -9/+147 | |
| * | | | | | | Return last modification time to allow proper listing in cadaver | Thomas Müller | 2017-03-29 | 1 | -4/+9 | |
| * | | | | | | Adding dav resource for avatars | Thomas Müller | 2017-03-29 | 5 | -1/+233 | |
* | | | | | | | Merge pull request #4066 from nextcloud/always-fix-the-values-live | Roeland Jago Douma | 2017-03-29 | 7 | -452/+371 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Directly fix the values | Joas Schilling | 2017-03-26 | 7 | -452/+371 | |
* | | | | | | | | 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 | Lukas Reschke | 2017-03-29 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #4060 from nextcloud/shared_by_for_own_calendars | Morris Jobke | 2017-03-29 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix bug with shared_by for own calendars if shared | Georg Ehrke | 2017-03-25 | 2 | -0/+8 | |
* | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-29 | 12 | -76/+362 |