summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notificationsRoeland Jago Douma2016-11-282-5/+9
|\
| * Add an icon to the federated sharing notificationJoas Schilling2016-11-282-5/+9
* | Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-no...blizzz2016-11-282-31/+106
|\ \
| * | Adjust testsJoas Schilling2016-11-231-18/+56
| * | Use the comment icon for the notificationsJoas Schilling2016-11-231-0/+1
| * | Set the rich object string for comment notificationsJoas Schilling2016-11-231-13/+49
* | | Merge pull request #2378 from nextcloud/fix-preview-image_srcMorris Jobke2016-11-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix image_src linkLukas Reschke2016-11-281-1/+1
* | | Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-281-109/+84
|\ \ \ | |/ / |/| |
| * | Add an event merger and use it for the files activitiesJoas Schilling2016-11-251-1/+16
| * | Working towards groupsJoas Schilling2016-11-251-108/+68
* | | bring back permissions for mail sharesBjoern Schiessle2016-11-281-0/+1
* | | Merge pull request #2312 from nextcloud/move-sharebymail-to-new-apiBjörn Schießle2016-11-284-258/+181
|\ \ \
| * | | Correctly match the subjects to the parametersJoas Schilling2016-11-251-2/+2
| * | | Remove old testJoas Schilling2016-11-251-68/+0
| * | | Get user name from contacts if availableJoas Schilling2016-11-251-2/+34
| * | | Move ShareByMail activities to new APIJoas Schilling2016-11-243-195/+154
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-282-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-2824-4/+120
* | | | Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirectJoas Schilling2016-11-271-1/+1
|\ \ \ \
| * | | | Fix link to external storage settings on error notificationFelix A. Epp2016-11-261-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2734-32/+274
|/ / / /
* | / / [tx-robot] updated from transifexNextcloud bot2016-11-26128-696/+1644
| |/ / |/| |
* | | Add Identityproof testsRoeland Jago Douma2016-11-241-1/+0
* | | Merge pull request #2306 from nextcloud/dont-log-user-passwordMorris Jobke2016-11-242-9/+21
|\ \ \
| * | | Don't log the user password in case something goes wrongJoas Schilling2016-11-242-9/+21
| |/ /
* / / fix some outdated namingJan-Christoph Borchardt2016-11-241-1/+1
|/ /
* | Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-sectionLukas Reschke2016-11-241-3/+3
|\ \
| * | Fix some language issues in the federation admin panelJoas Schilling2016-11-241-3/+3
* | | Fix placeholder typo in public link activityJoas Schilling2016-11-231-1/+1
|/ /
* | Add testsLukas Reschke2016-11-237-1/+268
* | restore ldap_password_prroot2016-11-2311-6/+240
* | Merge pull request #2281 from nextcloud/fix-translationMorris Jobke2016-11-232-4/+4
|\ \
| * | Fix language typoJoas Schilling2016-11-232-4/+4
| |/
* | Merge pull request #2232 from nextcloud/imagescale-fixLukas Reschke2016-11-231-1/+3
|\ \
| * | Workaround for PHP bug when calling imagescaleJulius Haertl2016-11-221-1/+3
* | | Merge pull request #2278 from nextcloud/filelist-share-visibleLukas Reschke2016-11-231-3/+9
|\ \ \
| * | | improved style of shared entryMorris Jobke2016-11-231-3/+8
| * | | make the share icon in the filelist visible againRobin Appelman2016-11-231-0/+1
* | | | Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_keyLukas Reschke2016-11-234-0/+59
|\ \ \ \
| * | | | check if session is initializedBjoern Schiessle2016-11-235-3/+59
| * | | | init Session/privateKeys on Master KeyMaxence Lange2016-11-221-0/+3
* | | | | Merge pull request #2266 from nextcloud/avatar_imageMorris Jobke2016-11-232-7/+41
|\ \ \ \ \
| * | | | | VCARDS don't hold binary dataRoeland Jago Douma2016-11-232-7/+41
| | |/ / / | |/| | |
* | | | | Merge pull request #2262 from nextcloud/specify-parameters-on-public-downloadLukas Reschke2016-11-231-3/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Specify the parameters on public downloadJoas Schilling2016-11-221-3/+9
| | |_|/ | |/| |
* | | | Merge pull request #2263 from nextcloud/remove91_migrationLukas Reschke2016-11-234-234/+0
|\ \ \ \
| * | | | Remove 9.1 migration steps in app dav (#25654)Thomas Müller2016-11-224-234/+0
| |/ / /
* / / / Only do stuff when its a remote-share activityJoas Schilling2016-11-221-2/+3
|/ / /
* | | Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-ac...Lukas Reschke2016-11-222-8/+62
|\ \ \