1511 Commits

Author SHA1 Message Date
Robert Schäfer
a8cfe96f60 Don't chane the filterPostsMenu with state
@mattwr18 state is the root of all evil
2019-08-09 17:11:55 +02:00
Robert Schäfer
3261237b48
Merge pull request #1169 from Human-Connection/964-filter-posts-by-followers
Move filter by followers functionality to filter dropdown
2019-08-09 11:57:17 +02:00
Matt Rider
0cee0ecccb Fix bug, maintain filters across page changes
- filter was a bit off for categories, clear the filter if there are no categories
- a user should maintain their filter until they clear it
2019-08-08 08:32:43 +02:00
Matt Rider
c00ab4450b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 964-filter-posts-by-followers 2019-08-08 07:24:13 +02:00
Matt Rider
39a94a8aac Refactor
- follow PR review by @roschaefer
2019-08-07 14:55:32 +02:00
Matt Rider
1c0112e9d8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 19:00:14 +02:00
Alexander Friedland
9b74fd2480
Merge pull request #1174 from Human-Connection/A-1001-Page-for-Data-Privacy
Add static page for data privacy
2019-08-06 15:56:45 +02:00
Matt Rider
f3dc5c6a68 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 964-filter-posts-by-followers 2019-08-06 10:31:29 +02:00
Matt Rider
e08e150742 Fix bug with lost filter when sorting
- add filtered state to vuex, so as to maintain filter
- filter is reset when visiting other pages, so reset the active buttons in the filter posts dropdown
- maybe we want to maintain the filters between page transitions and only clear when the user requests to?
2019-08-06 10:29:16 +02:00
Matt Rider
9613250710 Fix German translation, mobile responsive tweak
- follow @Tirokk's PR review suggestions
2019-08-06 08:13:02 +02:00
Matt Rider
1593eab9cf Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 08:07:39 +02:00
Matt Rider
cb7217f5a7 Fix bug
- apollo query fetchPolicy set to no-cache so that it will refetch a post's emotions count on page transition
2019-08-06 08:05:35 +02:00
Wolfgang Huß
e8d5bed901
Merge pull request #952 from Human-Connection/storybook
Storybook
2019-08-06 07:50:09 +02:00
Robert Schäfer
a67cfa88be Refactor terms-and-conditions
* DRY template
* avoid numeric translations keys - if you can, use telling translations
keys
* fix links! @ogerly so many hrefs pointing to http://localhost:3000/...
how is that possible?
2019-08-06 00:50:58 +02:00
ogerly
8757402564 add v-html on element, fixed lint 2019-08-06 00:37:17 +02:00
ogerly
8f67c60f73 Fix terms and conditions template, english and german 2019-08-06 00:30:18 +02:00
Robert Schäfer
71707dc940 Implement a German-only static data-privacy page
Okay, so the data privacy section needs to be updated @datenbrei:
We have two sections mentioning the Vimeo and Youtube plugins. After we
have the Embeds in place, we have many many more embedded code of 3rd
parties. Can we simply remove the two sections?

Also regarding the translations: I would wait until we have functional
components and we can write translations enriched by markup. Until then
I think it's sufficient to have German-only data privacy page.
2019-08-06 00:14:41 +02:00
Robert Schäfer
a6f5fe8ea3 Rename privacy->data-privacy 2019-08-05 23:19:20 +02:00
ogerly
330b2fb590 edit layout default for gasts 2019-08-05 23:19:20 +02:00
Robert Schäfer
4b2a1d93f5 Refactor code-of-conduct
* Add link in footer
* DRY template
* Structure translations into sections with a telling name
* Fix typos and links
2019-08-05 22:56:36 +02:00
Robert Schäfer
56100010ec DRY template, restructure translations 2019-08-05 22:56:36 +02:00
ogerly
80d80f9c61 change add v-html, fixed lint 2019-08-05 22:56:36 +02:00
ogerly
29dc306187 add page code-of-conduct, english and german 2019-08-05 22:56:36 +02:00
Robert Schäfer
49acea9767 Improve changelog and translations
* remove unnecessary markup
* remove manual translations of dates (we have a helper for that)
* fix typos and English translations
2019-08-05 20:45:40 +02:00
Matt Rider
32796bfa0d Fix failing build 2019-08-05 19:08:53 +02:00
Matt Rider
1cd3ba907b Set vuex state to reset active button
- when a user clicks on the logo or changes pages, the filter is reset, but the active button didn't update
- still a bug with the active categoryIds since it's not so easy to set the state of an array in vuex
- dry out code for toggleFilters
- fix bug where user clicks on filter by users followed, then filters for categories of those users, then clicks to remove category filter
2019-08-05 14:39:45 +02:00
ogerly
aba21a9c70 changes and history template, english, german 2019-08-05 09:26:51 +02:00
Matt Rider
751bbbf889 Make mobile responsive 2019-08-02 16:10:19 +02:00
Matt Rider
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +02:00
Matt Rider
3da986518e Write component tests, refactor 2019-08-02 10:52:36 +02:00
Matt Rider
76a720caec Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 08:02:54 +02:00
Robert Schäfer
b6a59460bd Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 12:22:09 +02:00
Matt Rider
08899a4af9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-01 09:22:57 +02:00
Matt Rider
8d7c55c97d Use a link's username, open separate window on click 2019-08-01 07:34:52 +02:00
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
2019-08-01 00:28:22 +02:00
Matt Rider
5423412958 Set up UI 2019-07-31 14:58:05 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II
375 sorting (II)
2019-07-31 14:49:37 +02:00
Matt Rider
88a14ebd4f Add tests, fix typo 2019-07-23 10:55:07 -03:00
Alina Beck
d1cb72b9a0 disable save button when link has not been changed 2019-07-23 14:51:45 +02:00
Alina Beck
fcc6a4a084 center arrow icon in list 2019-07-23 14:48:28 +02:00
Alina Beck
ee43d4aaa7 refactor frontend tests 2019-07-23 14:25:52 +02:00
Matt Rider
c8a6792627 Add parent class for css selector on cypress/component 2019-07-22 06:50:58 -03:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
ogerly
47324d4905 example II - lint ok, test local ok 2019-07-17 09:57:08 +02:00
Alina Beck
972425fb09 fix lint errors 2019-07-16 14:00:30 +02:00
Alina Beck
05b6c63006 add component tests 2019-07-16 12:01:10 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address
# Conflicts:
#	webapp/layouts/default.vue
2019-07-16 08:44:42 +02:00
Robert Schäfer
b97f7e464f
Merge pull request #969 from Human-Connection/967-filter-post-by-category
Filter posts by category
2019-07-16 00:50:56 +02:00
Robert Schäfer
2736738c36 Fix @Tirokk's suggestions
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
2019-07-15 18:26:23 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00