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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
7c78a5f889
Bump apollo-server-express from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-express@2.8.2...apollo-server-express@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:27 +00:00
dependabot-preview[bot]
d4f43b6264
Bump graphql from 14.5.0 to 14.5.3 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.0 to 14.5.3.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.0...v14.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:00 +00:00
roschaefer
f464ee93e0 Setup database on Travis CI 2019-08-25 13:03:46 +02:00
roschaefer
67f5dd53e2 Remove the custom entrypoint from the docker image 
.. add documentation how to setup indices manually.
 2019-08-25 13:03:46 +02:00
Alina Beck
dc70da8826 make optional extensions a computed property 2019-08-24 12:42:34 +01:00
Alina Beck
6b452a2217 refactor duplicate code 2019-08-24 11:59:59 +01:00
Alina Beck
af985ba95c rename suggestions menu to suggestion list 2019-08-24 10:44:37 +01:00
Alina Beck
62775a93d6 put link input in separate component 2019-08-24 10:42:24 +01:00
Alina Beck
2c0b2ed482 place tippy popup in renderless component 2019-08-23 23:21:24 +01:00
Alina Beck
fbe4de347b extract suggestions menu into separate component 2019-08-23 22:30:05 +01:00
roschaefer
894a59ecc7 Fix flickering create-button 2019-08-23 20:05:08 +02:00
ogerly
63549c1101 Tests for create users with terms and conditions are ok 2019-08-23 19:37:23 +02:00
Alina Beck
cbb0d79331 put link bubble back in (wip) 2019-08-23 17:37:17 +01:00
Robert Schäfer
6cfa5fbdfc
Merge pull request #1371 from Human-Connection/fix_sentry_when_context_user_null 
Fix "cannot read property id of null" in staging
 2019-08-23 18:06:51 +02:00
Alina Beck
ee00a3b3df replace floating and bubble menu with menu bar 2019-08-23 15:49:20 +01:00
Wolfgang Huß
b8e391894e
Merge pull request #1372 from Human-Connection/451-lokalise-unlocalised-texts-20190823 
🍰 454 Lokalise unlocalised texts and fixes texts
 2019-08-23 16:26:26 +02:00
Wolfgang Huß
2600c69185 Change code after @mattwr18 suggestions 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-23 15:57:31 +02:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
roschaefer
123c30b301 Fix "cannot read property id of null" in staging 2019-08-23 14:53:52 +02:00
Wolfgang Huß
be981c7b78 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190823 2019-08-23 14:52:44 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00
Robert Schäfer
b82743463e
Merge pull request #1368 from Human-Connection/1352-fix-update-post-resolver 
Fix UpdatePost resolver/validations
 2019-08-23 13:37:16 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
Robert Schäfer
9e3df325ab
Merge pull request #1370 from Human-Connection/test-es6-syntax 
Use ES6 syntax to avoid repetition
 2019-08-23 13:19:38 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
Matt Rider
79e6b56396 Use ES6 syntax to avoid repetition 2019-08-23 12:35:53 +02:00
Matt Rider
8555148e53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1352-fix-update-post-resolver 2019-08-23 12:19:19 +02:00
Matt Rider
cd5e492569 Await relation be added 2019-08-23 12:18:53 +02:00
Robert Schäfer
f4f98a95c9
Merge pull request #1356 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.1 
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend
 2019-08-23 11:46:57 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
Matt Rider
abbfc6d757 Remove commented out, unneeded code 2019-08-23 11:30:20 +02:00
ogerly
f34cef22f2 Graphical changes 2019-08-23 11:02:24 +02:00
ogerly
54750e39b8 Missing translations added + code checked with Lint 2019-08-23 11:02:24 +02:00
ogerly
0bb71cfbb3 Specs tests run through cleanly 2019-08-23 11:02:24 +02:00
ogerly
c00f281e6c Translations and style adapted 2019-08-23 11:02:24 +02:00
roschaefer
036e2605b7 Implement accept terms and conditions flow 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
2b634b8706 BUGFIX: 'email' attribute is the ID 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Matt Rider
773779e5f1 Fix UpdatePost resolver/validations 2019-08-23 10:57:11 +02:00
Robert Schäfer
fb8468dc8b
Merge pull request #1358 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.0 
Bump graphql from 14.4.2 to 14.5.0 in /webapp
 2019-08-23 10:52:36 +02:00
mattwr18
239e4f92d7
Merge pull request #1366 from Human-Connection/update_vue_izitoast 
Update vue-izitoast after they released v1.2.0!
 2019-08-23 10:46:49 +02:00
mattwr18
728f3c22d3
Merge pull request #1354 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.14.1 
Bump cypress-cucumber-preprocessor from 1.14.0 to 1.14.1
 2019-08-23 08:39:55 +02:00
mattwr18
6e0f77fc5a
Merge pull request #1338 from Human-Connection/1335-filter_bubble_indicator 
Implement visual feedback if filter is active
 2019-08-23 08:38:42 +02:00
roschaefer
3123041726 Update vue-izitoast after they released v1.2.0! 
See https://github.com/arthurvasconcelos/vue-izitoast/pull/20#issuecomment-524131102
 2019-08-23 08:35:04 +02:00
dependabot-preview[bot]
6550bd33ff
Bump graphql from 14.4.2 to 14.5.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.2 to 14.5.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.2...v14.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 06:33:35 +00:00
mattwr18
28e2364af9
Merge pull request #1348 from Human-Connection/update_transitive_dependencies 
Update transitive dependencies
 2019-08-23 08:30:56 +02:00
mattwr18
d5cbc4a07a
Merge pull request #1350 from Human-Connection/fix_contributions_count 
Fix post count always showing 0
 2019-08-23 08:27:43 +02:00
mattwr18
8eeef1f68d
Merge pull request #1349 from Human-Connection/fix_expiration_dates 
Fix expiration dates of JWT and cookie
 2019-08-23 08:27:09 +02:00
dependabot-preview[bot]
417339b7cc
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 14.0.0 to 14.0.1.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v14.0.0...v14.0.1)

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