Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 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 | 44 | -192/+1037 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 #4116 from nextcloud/swift-cache-token | Roeland Jago Douma | 2017-03-29 | 2 | -10/+62 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | serialize the token to json instead of using php's serialize | Robin Appelman | 2017-03-28 | 1 | -10/+36 | |
| * | | | | | | | | | cache swift tokens in memcache | Robin Appelman | 2017-03-28 | 1 | -10/+36 | |
| * | | | | | | | | | update rackspace/opencloud to 1.16.0 | Robin Appelman | 2017-03-28 | 1 | -0/+0 | |
* | | | | | | | | | | 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 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Replace unecessary unescaped prints with print | Lukas Reschke | 2017-03-29 | 2 | -2/+2 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4129 from nextcloud/remove-verbose-error-message | Joas Schilling | 2017-03-29 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove verbose error message | Lukas Reschke | 2017-03-29 | 1 | -2/+3 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge pull request #4091 from nextcloud/Rudloff-manifest | Morris Jobke | 2017-03-28 | 10 | -113/+129 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix unit tests | Morris Jobke | 2017-03-28 | 7 | -113/+113 | |
| * | | | | | | | | | | | Web app manifest | Pierre Rudloff | 2017-03-28 | 3 | -0/+16 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-29 | 52 | -76/+418 | |
* | | | | | | | | | | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activity | Morris Jobke | 2017-03-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Change the order on merging activities so the newest item is first | Joas Schilling | 2017-03-28 | 1 | -4/+4 | |
* | | | | | | | | | | | | | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar | Morris Jobke | 2017-03-28 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Better styling of the empty content messages in the sidebar | Joas Schilling | 2017-03-28 | 3 | -6/+6 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policy | Morris Jobke | 2017-03-28 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Update legacy CSP policy | Lukas Reschke | 2017-03-28 | 1 | -1/+3 | |
* | | | | | | | | | | | | | Merge pull request #4121 from nextcloud/split-sharing-integration-tests | Morris Jobke | 2017-03-28 | 3 | -710/+728 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Split long running features/sharing-v1.feature into two smaller parts | Morris Jobke | 2017-03-28 | 3 | -710/+728 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4070 from nextcloud/gzip_scss_js | Morris Jobke | 2017-03-28 | 8 | -35/+327 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix controller tests | Roeland Jago Douma | 2017-03-28 | 2 | -2/+134 | |
| * | | | | | | | | | | | | Fix tests | Roeland Jago Douma | 2017-03-28 | 3 | -29/+117 | |
| * | | | | | | | | | | | | Allow to gzip CSS/JS files | Roeland Jago Douma | 2017-03-28 | 4 | -5/+77 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4054 from nextcloud/inlinejsfirst | Joas Schilling | 2017-03-28 | 3 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Moving the inline js before the CSS | Roeland Jago Douma | 2017-03-28 | 3 | -15/+15 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #4004 from nextcloud/backport-27172 | Roeland Jago Douma | 2017-03-28 | 6 | -1/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | fix shared storage numeric id | Robin Appelman | 2017-03-27 | 3 | -0/+11 | |
| * | | | | | | | | | | do not remove the method and only keep the tests | Morris Jobke | 2017-03-23 | 1 | -0/+8 | |
| * | | | | | | | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it | Vincent Petry | 2017-03-23 | 5 | -9/+62 | |
* | | | | | | | | | | | Merge pull request #4112 from nextcloud/swift-config | Robin Appelman | 2017-03-28 | 1 | -5/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | better error messages for invalid regions, urltypes and service names | Robin Appelman | 2017-03-28 | 1 | -4/+63 | |
| * | | | | | | | | | | better error messages when swift authentication fails | Robin Appelman | 2017-03-28 | 1 | -1/+17 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4101 from nextcloud/header-detail | Morris Jobke | 2017-03-28 | 1 | -6/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | show active indicator on current app even when hovering other icons | Jan-Christoph Borchardt | 2017-03-27 | 1 | -6/+1 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | |