ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,742 Commits 117 Branches 1,511 Tags
Commit Graph

4742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Robert Schäfer
3eab519760 Reduce the size of the emotion buttons 
In my browser, the icons are so large that they overlap with the texts
below. I think a less intrusive size does the job equally well.
 2019-08-06 22:37:36 +02:00
Robert Schäfer
1a21884081 Merge remote-tracking branch 'fatherJS/polish-locales' 2019-08-06 22:01:25 +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
Matt Rider
b8e1ae0a1c Update user ids 2019-08-06 18:57:27 +02:00
Matt Rider
53af29b5a2 Refactor backend tests 
- to use neode and apollo-server-testing
 2019-08-06 18:26:39 +02:00
Robert Schäfer
b2771a2708
Merge pull request #1171 from Human-Connection/deprecation-warning 
Fix depreciation warnings
 2019-08-06 16:39:29 +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
Robert Schäfer
9b6d4deef5
Merge pull request #1194 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.4 
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /webapp
 2019-08-06 15:40:46 +02:00
Robert Schäfer
d80a1adf83
Merge pull request #1195 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.4 
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend
 2019-08-06 15:40:30 +02:00
Piotr Kowalski
f64a8cd96f polish locales 
pl.json file corrected
 2019-08-06 15:37:04 +02:00
Robert Schäfer
1574fc0f56
Merge pull request #791 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-3.2.1 
Bump vue-sweetalert-icons from 3.2.0 to 3.2.1 in /webapp
 2019-08-06 14:37:36 +02:00
Robert Schäfer
3f3c85a694
Merge pull request #1196 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/dotenv-1.4.0 
Bump @nuxtjs/dotenv from 1.3.0 to 1.4.0 in /webapp
 2019-08-06 12:50:59 +02:00
Robert Schäfer
1032a399bb
Merge pull request #1193 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.1 
Bump neode from 0.3.0 to 0.3.1 in /backend
 2019-08-06 12:50:34 +02:00
Robert Schäfer
27163b8d79 Install vue-sweetalert-icon globally 
Updating the package to `v4.0.0` still gives me this warning:
```
 WARN  Compiled with 1 warnings
 WARN  in ./components/PasswordReset/ChangePassword.vue?vue&type=script&lang=js&
"export 'SweetalertIcon' was not found in 'vue-sweetalert-icons'
```

According to this thread https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3
I copy+pasted the example configuration:
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/nuxt.config.js
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/plugins/vue-sweetalert-icons.js

And now the compile warnings are gone. I'm going to ask the maintainer if the
local import is not possible with `v4.0.0` anymore.
 2019-08-06 11:03:12 +02:00
dependabot-preview[bot]
b43f1cdc92 Bump vue-sweetalert-icons from 3.2.0 to 3.2.1 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 11:01:03 +02:00
Matt Rider
d795ee50a9 Add backend tests for custom queries 2019-08-06 10:58:30 +02:00
Matt Rider
f7152703bc Upgrade node-fetch, use pageTransition 2019-08-06 08:23:32 +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
dependabot-preview[bot]
a87616b2b1
Bump @nuxtjs/dotenv from 1.3.0 to 1.4.0 in /webapp 
Bumps [@nuxtjs/dotenv](https://github.com/nuxt-community/dotenv-module) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/nuxt-community/dotenv-module/releases)
- [Changelog](https://github.com/nuxt-community/dotenv-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/dotenv-module/compare/v1.3.0...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 05:52:40 +00:00
dependabot-preview[bot]
5a15e371d1
Bump neode from 0.3.0 to 0.3.1 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 05:52:14 +00:00
Wolfgang Huß
e8d5bed901
Merge pull request #952 from Human-Connection/storybook 
Storybook
 2019-08-06 07:50:09 +02:00
mattwr18
2afc62645c
Merge pull request #1192 from Human-Connection/dependabot/npm_and_yarn/webapp/vuex-i18n-1.13.1 
Bump vuex-i18n from 1.13.0 to 1.13.1 in /webapp
 2019-08-06 07:05:47 +02:00
mattwr18
dcb723ae3c
Merge pull request #1191 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.1 
Bump neode from 0.3.0 to 0.3.1
 2019-08-06 07:05:18 +02:00
dependabot-preview[bot]
8080e38d1b
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.3 to 2.0.0-beta.4.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.3...v2.0.0-beta.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 04:23:35 +00:00
dependabot-preview[bot]
3e3617bb92
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.3 to 2.0.0-beta.4.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.3...v2.0.0-beta.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 04:23:27 +00:00