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
5,888 Commits 5 Branches 2 Tags
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8578cb5ab9 I had enough of --ignore-engines 
The maintainers of https://github.com/arthurvasconcelos/vue-izitoast are
not extremely responsive, so I decided to point our package to my own
fork.

This makes the flag `--ignore-engines` obsolete.
 2019-08-09 13:41:26 +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
ogerly
d545e84ce9 edit spec green 2019-08-09 07:27:38 +02:00
ogerly
f2dcb54d05 edit spec 2019-08-09 07:23:47 +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
ogerly
d1830f5bed add ceckbox, confirmed terms of use 2019-08-08 17:46:04 +02:00
Matt Rider
1930e5bafe Add some component tests, rename files 
- with new naming schema
 2019-08-08 17:04:23 +02:00
Matt Rider
ced676d315 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-08 14:06:45 +02:00
Matt Rider
7c6dbd6351 Fix failing tests, remove comments 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-08-08 14:03:59 +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
fd022c7992 Fix mentions in seeds 2019-08-08 10:19:38 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +02:00
Matt Rider
21aa729edb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-08 09:10:18 +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
dependabot-preview[bot]
49fa0844f9
Bump @nuxtjs/style-resources from 0.1.2 to 1.0.0 in /webapp 
Bumps [@nuxtjs/style-resources](https://github.com/nuxt-community/style-resources-module) from 0.1.2 to 1.0.0.
- [Release notes](https://github.com/nuxt-community/style-resources-module/releases)
- [Changelog](https://github.com/nuxt-community/style-resources-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/style-resources-module/compare/v0.1.2...v1.0.0)

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:28:00 +00:00
dependabot-preview[bot]
34a4db78f6
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /backend 
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 04:26:59 +00:00
dependabot-preview[bot]
49c8fdb74e
Bump tiptap-extensions from 1.26.0 to 1.26.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.0...tiptap-extensions@1.26.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:26:48 +00:00
Matt Rider
faa4148858 Stub sweetalert-icon in tests which use 2019-08-07 15:20:36 +02:00
Matt Rider
39a94a8aac Refactor 
- follow PR review by @roschaefer
 2019-08-07 14:55:32 +02:00
Matt Rider
fa033e69bd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-07 06:53:37 +02:00