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

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
52ba63e8fd
Merge pull request #2705 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.9.5 
build(deps): bump metascraper-image from 5.9.4 to 5.9.5 in /backend
 2020-01-09 10:07:48 +01:00
mattwr18
7bb8a97b6b
Merge pull request #2704 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.9.5 
build(deps): bump metascraper-youtube from 5.8.13 to 5.9.5 in /backend
 2020-01-09 10:07:35 +01:00
mattwr18
d41ff2aa79
Merge pull request #2702 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.9.0 
build(deps-dev): bump date-fns from 2.8.1 to 2.9.0
 2020-01-09 10:07:19 +01:00
mattwr18
63a87d0454
Merge pull request #2693 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.9.5 
build(deps): bump metascraper-soundcloud from 5.9.0 to 5.9.5 in /backend
 2020-01-09 10:06:48 +01:00
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30
dependabot-preview[bot]
21fc4bff3a
build(deps): bump @sentry/node from 5.10.2 to 5.11.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.10.2 to 5.11.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.10.2...5.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:19:17 +00:00
dependabot-preview[bot]
1a15dd4db5
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp 
Bumps node from 13.5.0-alpine to 13.6.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:19:10 +00:00
dependabot-preview[bot]
7078f31d47
build(deps): bump metascraper-audio from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:18:46 +00:00
dependabot-preview[bot]
96ccff4bc9
build(deps): bump metascraper-image from 5.9.4 to 5.9.5 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.9.4 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.4...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:17:56 +00:00
dependabot-preview[bot]
7e35b861d3
build(deps): bump metascraper-youtube from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:17:14 +00:00
dependabot-preview[bot]
28de6b16d8
build(deps-dev): bump date-fns from 2.8.1 to 2.9.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.1 to 2.9.0.
- [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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:16:32 +00:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
mattwr18
c61e15c50d
Merge pull request #2698 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.9.5 
build(deps): bump metascraper-date from 5.8.13 to 5.9.5 in /backend
 2020-01-08 15:33:24 +01:00
dependabot-preview[bot]
7f045ccbbb
build(deps): bump metascraper-soundcloud from 5.9.0 to 5.9.5 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.9.0 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 13:27:05 +00:00
dependabot-preview[bot]
64f97a610e
build(deps): bump metascraper-date from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 13:26:51 +00:00
mattwr18
e526d4fac4
Merge pull request #2696 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.11.4 
build(deps): bump neo4j-graphql-js from 2.11.3 to 2.11.4 in /backend
 2020-01-08 14:26:02 +01:00
mattwr18
c15007b666
Merge pull request #2695 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.9.5 
build(deps): bump metascraper-video from 5.8.13 to 5.9.5 in /backend
 2020-01-08 14:25:43 +01:00
mattwr18
d52fe6b17b
Merge pull request #2692 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.9.5 
build(deps): bump metascraper-publisher from 5.8.13 to 5.9.5 in /backend
 2020-01-08 14:25:14 +01:00
mattwr18
03a7b0061f
Merge pull request #2691 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.9.5 
build(deps): bump metascraper-author from 5.8.13 to 5.9.5 in /backend
 2020-01-08 14:24:58 +01:00
mattwr18
dce63f8e20
Merge pull request #2689 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.9.5 
build(deps): bump metascraper from 5.9.4 to 5.9.5 in /backend
 2020-01-08 14:24:43 +01:00
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30
Alina Beck
53a504010c allow overflow for notifications counter 2020-01-08 14:28:21 +05:30
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
Alina Beck
cc38fa2b0a make content-menu clickable on post-card 2020-01-08 13:49:07 +05:30
dependabot-preview[bot]
498661068e
build(deps): bump neo4j-graphql-js from 2.11.3 to 2.11.4 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.11.3 to 2.11.4.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 04:22:26 +00:00
dependabot-preview[bot]
6a8111ddaa
build(deps): bump metascraper-video from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 04:22:02 +00:00
dependabot-preview[bot]
7e229d1cbe
build(deps): bump metascraper-publisher from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 04:20:38 +00:00
dependabot-preview[bot]
63be50199a
build(deps): bump metascraper-author from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 04:20:08 +00:00
dependabot-preview[bot]
aeb1262ffe
build(deps): bump metascraper from 5.9.4 to 5.9.5 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.9.4 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.4...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-08 04:19:12 +00:00
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup 
Changes Text For SignUp
 2020-01-07 21:47:20 +01:00
Alexander Friedland
9c3f0f3d29
Merge pull request #2655 from Human-Connection/erhardtstiefel-patch-10-1 
Update de.json
 2020-01-07 21:45:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
mattwr18
df4c469c5c
Merge pull request #2682 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.7 
build(deps): bump neode from 0.3.6 to 0.3.7 in /backend
 2020-01-07 14:24:31 +01:00
dependabot-preview[bot]
a9b78ced7f
build(deps): bump neode from 0.3.6 to 0.3.7 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.6 to 0.3.7.
- [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>
 2020-01-07 11:33:15 +00:00
mattwr18
e2f99dbf51
Merge pull request #2546 from Human-Connection/update_neo4j_driver 
Update neo4j-driver
 2020-01-07 12:31:12 +01:00
mattwr18
303558d173 Merge branch 'master' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2020-01-07 11:38:01 +01:00
mattwr18
1c4651aa3f Merge branch 'update_neo4j_driver' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2020-01-07 11:09:16 +01:00
mattwr18
0d589cb4f9
Merge pull request #2681 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.6 
build(deps): bump merge-graphql-schemas from 1.7.5 to 1.7.6 in /backend
 2020-01-07 10:12:18 +01:00
mattwr18
076456e67f
Merge pull request #2680 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.11.3 
build(deps): bump neo4j-graphql-js from 2.11.2 to 2.11.3 in /backend
 2020-01-07 10:11:48 +01:00
mattwr18
f78fd9a762
Merge pull request #2679 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.7 
build(deps-dev): bump neode from 0.3.6 to 0.3.7
 2020-01-07 10:08:57 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0 remove console 2020-01-07 06:02:19 +01:00
ogerly
9aa680ce50 Fix lint 2020-01-07 05:40:09 +01:00
dependabot-preview[bot]
c956ed2cd9
build(deps): bump merge-graphql-schemas from 1.7.5 to 1.7.6 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/1.7.5...1.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 04:18:19 +00:00