Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add an event merger and use it for the files activities | Joas Schilling | 2016-11-25 | 1 | -1/+16 | |
| * | | | Working towards groups | Joas Schilling | 2016-11-25 | 1 | -108/+68 | |
* | | | | bring back permissions for mail shares | Bjoern Schiessle | 2016-11-28 | 1 | -0/+1 | |
* | | | | Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api | Björn Schießle | 2016-11-28 | 4 | -258/+181 | |
|\ \ \ \ | ||||||
| * | | | | Correctly match the subjects to the parameters | Joas Schilling | 2016-11-25 | 1 | -2/+2 | |
| * | | | | Remove old test | Joas Schilling | 2016-11-25 | 1 | -68/+0 | |
| * | | | | Get user name from contacts if available | Joas Schilling | 2016-11-25 | 1 | -2/+34 | |
| * | | | | Move ShareByMail activities to new API | Joas Schilling | 2016-11-24 | 3 | -195/+154 | |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-28 | 2 | -2/+2 | |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-28 | 24 | -4/+120 | |
* | | | | | Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect | Joas Schilling | 2016-11-27 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix link to external storage settings on error notification | Felix A. Epp | 2016-11-26 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-27 | 34 | -32/+274 | |
|/ / / / / | ||||||
* | / / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-26 | 128 | -696/+1644 | |
| |/ / / |/| | | | ||||||
* | | | | Add Identityproof tests | Roeland Jago Douma | 2016-11-24 | 1 | -1/+0 | |
* | | | | Merge pull request #2306 from nextcloud/dont-log-user-password | Morris Jobke | 2016-11-24 | 2 | -9/+21 | |
|\ \ \ \ | ||||||
| * | | | | Don't log the user password in case something goes wrong | Joas Schilling | 2016-11-24 | 2 | -9/+21 | |
| |/ / / | ||||||
* / / / | fix some outdated naming | Jan-Christoph Borchardt | 2016-11-24 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section | Lukas Reschke | 2016-11-24 | 1 | -3/+3 | |
|\ \ \ | ||||||
| * | | | Fix some language issues in the federation admin panel | Joas Schilling | 2016-11-24 | 1 | -3/+3 | |
* | | | | Fix placeholder typo in public link activity | Joas Schilling | 2016-11-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Add tests | Lukas Reschke | 2016-11-23 | 7 | -1/+268 | |
* | | | restore ldap_password_pr | root | 2016-11-23 | 11 | -6/+240 | |
* | | | Merge pull request #2281 from nextcloud/fix-translation | Morris Jobke | 2016-11-23 | 2 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Fix language typo | Joas Schilling | 2016-11-23 | 2 | -4/+4 | |
| |/ / | ||||||
* | | | Merge pull request #2232 from nextcloud/imagescale-fix | Lukas Reschke | 2016-11-23 | 1 | -1/+3 | |
|\ \ \ | ||||||
| * | | | Workaround for PHP bug when calling imagescale | Julius Haertl | 2016-11-22 | 1 | -1/+3 | |
* | | | | Merge pull request #2278 from nextcloud/filelist-share-visible | Lukas Reschke | 2016-11-23 | 1 | -3/+9 | |
|\ \ \ \ | ||||||
| * | | | | improved style of shared entry | Morris Jobke | 2016-11-23 | 1 | -3/+8 | |
| * | | | | make the share icon in the filelist visible again | Robin Appelman | 2016-11-23 | 1 | -0/+1 | |
* | | | | | Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key | Lukas Reschke | 2016-11-23 | 4 | -0/+59 | |
|\ \ \ \ \ | ||||||
| * | | | | | check if session is initialized | Bjoern Schiessle | 2016-11-23 | 5 | -3/+59 | |
| * | | | | | init Session/privateKeys on Master Key | Maxence Lange | 2016-11-22 | 1 | -0/+3 | |
* | | | | | | 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 #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 | |
| |/ / / / | ||||||
* / / / / | Only do stuff when its a remote-share activity | Joas Schilling | 2016-11-22 | 1 | -2/+3 | |
|/ / / / | ||||||
* | | | | 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 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix systemtagsfilelist unwanted margin and clean aera a bit | John Molakvoæ | 2016-11-22 | 1 | -1/+1 | |
* | | | | | Fix undefined systemtags stuff | Roeland Jago Douma | 2016-11-22 | 1 | -4/+2 | |
| |/ / / |/| | | | ||||||
* | | | | 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 | 15 | -604/+1645 | |
|\ \ \ \ | ||||||
| * | | | | Move file sharing activities to the new API | Joas Schilling | 2016-11-16 | 15 | -604/+1645 |