| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add an icon to the federated sharing notification | Joas Schilling | 2016-11-28 | 2 | -5/+9 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #2335 from nextcloud/grouping-for-activities | Morris Jobke | 2016-11-28 | 1 | -109/+84 |
| |\ | | | | | Bring back grouping for activities | ||||
| | * | Add an event merger and use it for the files activities | Joas Schilling | 2016-11-25 | 1 | -1/+16 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Working towards groups | Joas Schilling | 2016-11-25 | 1 | -108/+68 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | bring back permissions for mail shares | Bjoern Schiessle | 2016-11-28 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api | Björn Schießle | 2016-11-28 | 4 | -258/+181 |
| |\ \ | | | | | | | Move ShareByMail activities to new API | ||||
| | * | | Correctly match the subjects to the parameters | Joas Schilling | 2016-11-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | Remove old test | Joas Schilling | 2016-11-25 | 1 | -68/+0 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | Get user name from contacts if available | Joas Schilling | 2016-11-25 | 1 | -2/+34 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | Move ShareByMail activities to new API | Joas Schilling | 2016-11-24 | 3 | -195/+154 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | [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 |
| |\ \ \ | | | | | | | | | [Minor] Fix link to external storage settings on error notification | ||||
| | * | | | Fix link to external storage settings on error notification | Felix A. Epp | 2016-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de> | ||||
| * | | | | [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 |
| | | | | | | | | | | | | | | | | | | | * Add tests for Key * Add tests for Manager * Add tests for Signer * Removed URLGenerator from Signer Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | 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 | ||||
| | * | | Don't log the user password in case something goes wrong | Joas Schilling | 2016-11-24 | 2 | -9/+21 |
| | |/ | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * / | fix some outdated naming | Jan-Christoph Borchardt | 2016-11-24 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | 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 | ||||
| | * | Fix some language issues in the federation admin panel | Joas Schilling | 2016-11-24 | 1 | -3/+3 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Fix placeholder typo in public link activity | Joas Schilling | 2016-11-23 | 1 | -1/+1 |
| |/ | | | https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/ | ||||
| * | Add tests | Lukas Reschke | 2016-11-23 | 7 | -1/+268 |
| | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | restore ldap_password_pr | root | 2016-11-23 | 11 | -6/+240 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de> remove notification part Signed-off-by: Roger Szabo <roger.szabo@web.de> blizzz comments Signed-off-by: Roger Szabo <roger.szabo@web.de> morris comment Signed-off-by: Roger Szabo <roger.szabo@web.de> improved error message for changing password Signed-off-by: Roger Szabo <roger.szabo@web.de> blizz comments 20161013 Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de> Adjust HintException usage Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de> | ||||
| * | Merge pull request #2281 from nextcloud/fix-translation | Morris Jobke | 2016-11-23 | 2 | -4/+4 |
| |\ | | | | | Fix language typo | ||||
| | * | Fix language typo | Joas Schilling | 2016-11-23 | 2 | -4/+4 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #2232 from nextcloud/imagescale-fix | Lukas Reschke | 2016-11-23 | 1 | -1/+3 |
| |\ \ | | | | | | | Workaround for PHP bug when calling imagescale | ||||
| | * | | Workaround for PHP bug when calling imagescale | Julius Haertl | 2016-11-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| * | | | Merge pull request #2278 from nextcloud/filelist-share-visible | Lukas Reschke | 2016-11-23 | 1 | -3/+9 |
| |\ \ \ | | | | | | | | | make the share icon in the filelist visible again | ||||
| | * | | | improved style of shared entry | Morris Jobke | 2016-11-23 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | make the share icon in the filelist visible again | Robin Appelman | 2016-11-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key | Lukas Reschke | 2016-11-23 | 4 | -0/+59 |
| |\ \ \ \ | | | | | | | | | | | init Session/privateKeys on Master Key | ||||
| | * | | | | check if session is initialized | Bjoern Schiessle | 2016-11-23 | 5 | -3/+59 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | | init Session/privateKeys on Master Key | Maxence Lange | 2016-11-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | I can't find another way to init the session ... | ||||
| * | | | | | Merge pull request #2266 from nextcloud/avatar_image | Morris Jobke | 2016-11-23 | 2 | -7/+41 |
| |\ \ \ \ \ | | | | | | | | | | | | | VCARDS don't hold binary data | ||||
| | * | | | | | VCARDS don't hold binary data | Roeland Jago Douma | 2016-11-23 | 2 | -7/+41 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We need to base64 encode the avatar! * Switched to vcard v4 * User proper data uri Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | 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 | ||||
| | * | | | | Specify the parameters on public download | Joas Schilling | 2016-11-22 | 1 | -3/+9 |
| | | |_|/ | |/| | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Merge pull request #2263 from nextcloud/remove91_migration | Lukas Reschke | 2016-11-23 | 4 | -234/+0 |
| |\ \ \ \ | | | | | | | | | | | Remove migration steps in app dav | ||||
| | * | | | | 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 |
| |/ / / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #2246 from ↵ | Lukas Reschke | 2016-11-22 | 2 | -8/+62 |
| |\ \ \ | | | | | | | | | | | | | | | | | nextcloud/display-name-for-files-and-tagging-activities-again Use the display name for files activities again | ||||
| | * | | | document new variable | Morris Jobke | 2016-11-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Use the display name for files activities again | Joas Schilling | 2016-11-22 | 2 | -8/+59 |
| | |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #2229 from nextcloud/select2-fix-bis | Lukas Reschke | 2016-11-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Select2 fix bis | ||||
| | * | | | Fix systemtagsfilelist unwanted margin and clean aera a bit | John Molakvoæ | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | | Fix undefined systemtags stuff | Roeland Jago Douma | 2016-11-22 | 1 | -4/+2 |
| | |/ / |/| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | 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 | ||||
| | * | | Update systemtags activity to new API | Joas Schilling | 2016-11-17 | 6 | -363/+425 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |