Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #2266 from nextcloud/avatar_image | Morris Jobke | 2016-11-23 | 2 | -7/+41 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | VCARDS don't hold binary data | Roeland Jago Douma | 2016-11-23 | 2 | -7/+41 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2275 from nextcloud/harden-cookies | Lukas Reschke | 2016-11-23 | 3 | -3/+110 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Harden cookies more appropriate | Lukas Reschke | 2016-11-23 | 3 | -3/+110 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2262 from nextcloud/specify-parameters-on-public-download | Lukas Reschke | 2016-11-23 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Specify the parameters on public download | Joas Schilling | 2016-11-22 | 1 | -3/+9 | |
* | | | | | | | | Merge pull request #2263 from nextcloud/remove91_migration | Lukas Reschke | 2016-11-23 | 4 | -234/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove 9.1 migration steps in app dav (#25654) | Thomas Müller | 2016-11-22 | 4 | -234/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-acti... | Lukas Reschke | 2016-11-23 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Only do stuff when its a remote-share activity | Joas Schilling | 2016-11-22 | 1 | -2/+3 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2239 from nextcloud/cleanup-settings-application-again | Joas Schilling | 2016-11-23 | 1 | -136/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Clean up the Application class again | Joas Schilling | 2016-11-22 | 1 | -136/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2250 from nextcloud/check-if-data-is-defined | Joas Schilling | 2016-11-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Check if data is defined | Lukas Reschke | 2016-11-22 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field | Morris Jobke | 2016-11-22 | 1 | -28/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove superfluous email input field | Lukas Reschke | 2016-11-22 | 1 | -28/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-ac... | Lukas Reschke | 2016-11-22 | 2 | -8/+62 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | document new variable | Morris Jobke | 2016-11-22 | 1 | -0/+3 | |
| * | | | | | | Use the display name for files activities again | Joas Schilling | 2016-11-22 | 2 | -8/+59 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2229 from nextcloud/select2-fix-bis | Lukas Reschke | 2016-11-22 | 2 | -5/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix select2 input on retina - fixes #2226 | Morris Jobke | 2016-11-22 | 1 | -3/+3 | |
| * | | | | | | Fix systemtagsfilelist unwanted margin and clean aera a bit | John Molakvoæ | 2016-11-22 | 1 | -1/+1 | |
| * | | | | | | Remove unwanted padding | John Molakvoæ | 2016-11-22 | 1 | -1/+0 | |
* | | | | | | | Merge pull request #2241 from nextcloud/make-it-a-beta | Lukas Reschke | 2016-11-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Make it 11.0 beta | Lukas Reschke | 2016-11-22 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2238 from nextcloud/fix_systemtags | Joas Schilling | 2016-11-22 | 1 | -4/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix undefined systemtags stuff | Roeland Jago Douma | 2016-11-22 | 1 | -4/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2234 from nextcloud/add-subadmin-middleware-back | Joas Schilling | 2016-11-22 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Add SubAdminMiddleware back | Lukas Reschke | 2016-11-22 | 1 | -0/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #1972 from nextcloud/invalid-files-from-scanner | Roeland Jago Douma | 2016-11-22 | 7 | -27/+138 | |
|\ \ \ \ | ||||||
| * | | | | Move the validation into one place only | Joas Schilling | 2016-11-21 | 6 | -42/+106 | |
| * | | | | Make sure we don't scan files that can not be accessed | Joas Schilling | 2016-11-21 | 2 | -0/+47 | |
* | | | | | Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api | Joas Schilling | 2016-11-22 | 6 | -363/+425 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Update systemtags activity to new API | Joas Schilling | 2016-11-17 | 6 | -363/+425 | |
* | | | | | Merge pull request #2165 from nextcloud/sharing-activities-update | Roeland Jago Douma | 2016-11-22 | 16 | -609/+1645 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move file sharing activities to the new API | Joas Schilling | 2016-11-16 | 16 | -609/+1645 | |
* | | | | | | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element | Roeland Jago Douma | 2016-11-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use app ID instead of object | Lukas Reschke | 2016-11-22 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #2154 from nextcloud/comments-activities-update | Morris Jobke | 2016-11-22 | 14 | -380/+468 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Update test | Joas Schilling | 2016-11-18 | 1 | -1/+3 | |
| * | | | | | | Fix wrong copyright headers | Joas Schilling | 2016-11-16 | 5 | -22/+21 | |
| * | | | | | | Use the display name for users | Joas Schilling | 2016-11-16 | 1 | -4/+41 | |
| * | | | | | | Move comments activities to the new API | Joas Schilling | 2016-11-16 | 8 | -357/+407 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-22 | 66 | -638/+666 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #2215 from nextcloud/add-setup-page-integration-test | Lukas Reschke | 2016-11-21 | 5 | -14/+85 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add integration test for web based installer | Morris Jobke | 2016-11-21 | 5 | -14/+85 | |
* | | | | | | Merge pull request #2221 from nextcloud/from-is-featured-to-featured | Lukas Reschke | 2016-11-21 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Cast "isFeatured" to "featured" | Lukas Reschke | 2016-11-21 | 1 | -0/+3 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests | Lukas Reschke | 2016-11-21 | 2 | -8/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix PropPatch requests on calendars | Georg Ehrke | 2016-11-21 | 2 | -8/+19 | |
| | |_|_|/ / | |/| | | | |