IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,783 Commits 5 Branches 2 Tags
Commit Graph

4783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
bae2c63c78
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.10 to 5.1.11.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:11:45 +00:00
mattwr18
7c7ddfb4d8
Merge pull request #1249 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.1.11 
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 10:08:55 +02:00
mattwr18
b1ef575329
Merge pull request #1248 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.1 
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend
 2019-08-13 10:08:09 +02:00
dependabot-preview[bot]
459099f1e1
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.1.10 to 5.1.11.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:57 +00:00
dependabot-preview[bot]
b56cabb8a4
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:43 +00:00
Robert Schäfer
e46d8559ee
Merge pull request #1234 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend
 2019-08-12 18:23:57 +02:00
Robert Schäfer
d5c7f78615
Merge pull request #1237 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp
 2019-08-12 18:23:14 +02:00
dependabot-preview[bot]
e34c7f196f
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:58:45 +00:00
Robert Schäfer
02dc30ea43
Merge pull request #1235 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.13.1 
Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1
 2019-08-12 16:57:33 +02:00
dependabot-preview[bot]
db0cd54dbc
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:56:59 +00:00
Robert Schäfer
79f7e421ad
Merge pull request #1238 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-7.2.0 
Bump sass-loader from 7.1.0 to 7.2.0 in /webapp
 2019-08-12 16:56:52 +02:00
Robert Schäfer
98a6c333e9
Merge pull request #1236 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /backend
 2019-08-12 16:55:13 +02:00
Robert Schäfer
b79951adb0
Merge pull request #1239 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp
 2019-08-12 16:54:38 +02:00
Wolfgang Huß
2d67ffd3fe
Merge pull request #1233 from Human-Connection/1231-fix_filters 
🍰 [Bugfix] Fix filter menu and refactor default layout
 2019-08-12 12:24:45 +02:00
Robert Schäfer
9026157018 Better hasMore: Don't wait until length == 0 
follow @Tirokk
 2019-08-12 11:50:23 +02:00
dependabot-preview[bot]
b02321b80d
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:34:10 +00:00
dependabot-preview[bot]
8741ed567d
Bump sass-loader from 7.1.0 to 7.2.0 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v7.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:33:06 +00:00
dependabot-preview[bot]
0fa3333d86
Bump apollo-client from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:25 +00:00
dependabot-preview[bot]
dcb7af1aef
Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.13.0...v1.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:15 +00:00
Robert Schäfer
0b96b300d3 Implement hasMore feature on the index page 2019-08-10 03:50:24 +02:00
Robert Schäfer
0e707cdd4c Massive refactoring 
Fix #1231 the filter menu once and for all...
 2019-08-10 03:41:38 +02:00
Robert Schäfer
196cced8cf Implement+test postsFilter 
I think it's much cleaner to have just the filter object in the store
and to implement convenience methods to safely update the filter object.
 2019-08-10 03:02:02 +02:00
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
cea206d118
Merge pull request #1225 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.2.0 
Bump vue-sweetalert-icons from 4.1.0 to 4.2.0 in /webapp
 2019-08-09 14:13:55 +02:00
Robert Schäfer
5d57f7b376 No global import - Thank you @JorgenVatle! ❤️ 
In version `v4.2.0` of `vue-sweetalert-icons` the local import is back, see:
https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3#issuecomment-519497796
 2019-08-09 13:21:54 +02:00
Robert Schäfer
62098bb8cf
Merge pull request #1227 from Human-Connection/dependabot/docker/webapp/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /webapp
 2019-08-09 11:58:03 +02:00
Robert Schäfer
425b53a53f
Merge pull request #1228 from Human-Connection/dependabot/docker/backend/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /backend
 2019-08-09 11:57:50 +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
Wolfgang Huß
bf92a88bf9
Merge pull request #1223 from Human-Connection/remove-mocks 
Remove obsolete "MOCKS"
 2019-08-09 10:31:42 +02:00
dependabot-preview[bot]
f9bb12f0af
Bump node from 12.7-alpine to 12.8-alpine in /backend 
Bumps node from 12.7-alpine to 12.8-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 04:31:08 +00:00
dependabot-preview[bot]
4de284ca36
Bump node from 12.7-alpine to 12.8-alpine in /webapp 
Bumps node from 12.7-alpine to 12.8-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 04:30:49 +00:00
dependabot-preview[bot]
295c7bcb39
Bump vue-sweetalert-icons from 4.1.0 to 4.2.0 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v4.1.0...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 04:29:02 +00:00
Robert Schäfer
2eaf66378a
Merge pull request #1133 from Human-Connection/384-emotions-on-posts 
Emotions on posts
 2019-08-09 00:37:38 +02:00
Robert Schäfer
963cbbef32 RemovePostEmotions should return deleted object 
@mattwr18 I prefer (I believe it's even best practice) that a delete
mutation should return the deleted object. If you run the delete
mutation again, it should return `null` because there is no object like
that anymore. That way the client knows if a delete mutation has changed
any state in the database.

Also I fixed another bug in the resolver. If your graphql mutation looks
like this:

```gql
mutation {
  RemovePostEmotions(to:{ id:"p15"}, data:{emotion: angry}) {
    from {
      id
      name
    }
    to {
      id
      title
    }
    emotion
  }
}
```

Then you get errors because your resolver does not return the name for
the user or the title for the post anymore. Just use spread operator...
and it's fixed.
 2019-08-08 23:51:26 +02:00
Robert Schäfer
f3e545a913 Fix bug: Only add emotions for authenticated user 2019-08-08 23:10:01 +02:00
Robert Schäfer
ff7143dcb1 Remove obsolete "MOCKS" 
It's unused code after all and I think we can improve the code base by
removing confusing code.
 2019-08-08 20:18:32 +02:00
Robert Schäfer
ee6dcf3877
Merge pull request #1212 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.1.0 
Bump vue-sweetalert-icons from 4.0.0 to 4.1.0 in /webapp
 2019-08-08 20:03:22 +02:00
Robert Schäfer
1231010ba9
Merge pull request #1215 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.15.0 
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /webapp
 2019-08-08 20:02:54 +02:00
Alexander Friedland
f7b7091d23
Merge pull request #1220 from Human-Connection/roschaefer-patch-1 
Fix expired discord link
 2019-08-08 13:56:59 +02:00
Robert Schäfer
276b4a3a29
Merge pull request #1210 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.26.1 
Bump tiptap-extensions from 1.26.0 to 1.26.1 in /webapp
 2019-08-08 11:20:34 +02:00
Robert Schäfer
566651fea9
Merge pull request #1217 from Human-Connection/fix-vue-console-errors-sweetalert-icons 
Stub sweetalert-icon in tests which use
 2019-08-08 11:16:29 +02:00
Robert Schäfer
e1ba51a3ec
Merge pull request #1218 from Human-Connection/fix-mentions-in-seeds 
Add data-mention-id to seeds mentions
 2019-08-08 10:54:18 +02:00
Robert Schäfer
d762cdc2dc
Merge pull request #1213 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/style-resources-1.0.0 
Bump @nuxtjs/style-resources from 0.1.2 to 1.0.0 in /webapp
 2019-08-08 10:53:34 +02:00
Robert Schäfer
c4a77fbea4 Update badge link too 2019-08-08 10:51:06 +02:00
Robert Schäfer
51639f3af4
Fix expired discord link 2019-08-08 10:43:54 +02:00
dependabot-preview[bot]
0c1bf45968
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.1 to 22.15.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.14.1...v22.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 08:29:30 +00:00
Robert Schäfer
700717011d
Merge pull request #1211 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.0 
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /backend
 2019-08-08 10:27:03 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +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