summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* We should always show permanent actionsRoeland Jago Douma2016-12-011-7/+3
* Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-ma...Lukas Reschke2016-12-013-3/+19
|\
| * Display link share icon when toggling shareRoeland Jago Douma2016-11-301-1/+10
| * Add an icon when the file is shared by mailJoas Schilling2016-11-301-0/+2
| * Also get infos about email sharesJoas Schilling2016-11-301-1/+2
| * Make sure the app is loaded in davJoas Schilling2016-11-301-1/+5
* | [tx-robot] updated from transifexNextcloud bot2016-12-0114-212/+274
* | Merge pull request #2422 from nextcloud/text-preview-debugRobin Appelman2016-11-301-5/+1
|\ \
| * | remove js debug statements in sidebar text preview generatorRobin Appelman2016-11-301-5/+1
* | | [tx-robot] updated from transifexNextcloud bot2016-11-3016-0/+180
|/ /
* | Merge pull request #2406 from nextcloud/move-dav-activities-to-new-apiRoeland Jago Douma2016-11-3019-436/+1702
|\ \
| * | Add tests for the base providerJoas Schilling2016-11-302-1/+190
| * | Move generic tests into namespaceJoas Schilling2016-11-302-4/+4
| * | Deduplicate the provider codeJoas Schilling2016-11-304-171/+133
| * | Add unit tests for ISetting instancesJoas Schilling2016-11-301-0/+121
| * | Add tests for the filtersJoas Schilling2016-11-303-0/+278
| * | Move event and todo parsing to new APIJoas Schilling2016-11-297-319/+387
| * | Deduplicate icon assignmentJoas Schilling2016-11-291-18/+3
| * | Move calendar activity parsing to new APIJoas Schilling2016-11-293-73/+288
| * | Move CalDAV activity settings to new APIJoas Schilling2016-11-295-23/+303
| * | Move CalDAV activity filters to new APIJoas Schilling2016-11-294-25/+193
* | | Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-302-6/+4
|\ \ \
| * | | Update sharedbymail templateMorris Jobke2016-11-301-3/+2
| * | | Fix mail header logo [fixes #1326]Felix Epp2016-11-301-3/+2
| |/ /
* | | Merge pull request #2414 from nextcloud/version_previewsLukas Reschke2016-11-304-11/+56
|\ \ \
| * | | Fix js testsRoeland Jago Douma2016-11-292-11/+11
| * | | Show mimeicon when versions don't have a previewRoeland Jago Douma2016-11-293-3/+48
| |/ /
* | | Merge pull request #2409 from nextcloud/fix-1470Roeland Jago Douma2016-11-301-8/+11
|\ \ \
| * | | log exception about user not present on LDAP on login only if loglevel is set...Arthur Schiwon2016-11-291-8/+11
* | | | Merge pull request #2105 from nextcloud/focus-tags-input-on-toggleRoeland Jago Douma2016-11-301-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Focus the input after clicking the "Tags" labelJoas Schilling2016-11-141-2/+3
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-3016-4/+136
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-292-0/+14
* | | | Merge pull request #2410 from nextcloud/fix-mobile-textLukas Reschke2016-11-291-1/+1
|\ \ \ \
| * | | | Fix missing text for downloads on mobileMorris Jobke2016-11-291-1/+1
| | |/ / | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2016-11-2914-2/+142
|/ / /
* | | Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
* | | Fix #2384John Molakvoæ (skjnldsv)2016-11-291-1/+2
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2016-11-29104-1474/+1348
* | 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