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
5,540 Commits 117 Branches 1,511 Tags
Commit Graph

5540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
36a0844fdd Followed @mattwrd18 suggestion 2019-09-12 09:30:47 +02:00
Wolfgang Huß
199079cff8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-12 08:46:36 +02:00
mattwr18
6ff532ab4a
Merge pull request #1517 from Human-Connection/better_maintenance_page 
Better maintenance page
 2019-09-11 18:25:21 +02:00
mattwr18
c36ec623ec Make container wider 
- the text is all jumbled up, and there is nothing else on the page
 2019-09-11 16:43:45 +02:00
Wolfgang Huß
7dc5856845 write tests and fix minor appearing and position problems with context menu 2019-09-11 15:13:31 +02:00
Wolfgang Huß
0e39f1de86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-11 13:56:50 +02:00
Robert Schäfer
a01c73536f
Merge pull request #1542 from Human-Connection/1538_test-filter-by-followed-by 
Test filter by followed by
 2019-09-11 13:29:00 +02:00
Robert Schäfer
5273f8b9fa
Merge pull request #1533 from Human-Connection/293-fix-follower-counter 
[WIP] 🍰 Update follower count on follow/unfollow
 2019-09-11 12:33:56 +02:00
mattwr18
030ff32b13 Fix lint 2019-09-11 09:16:06 +02:00
roschaefer
f3a9996962 Copy package.json from webapp/ 
This will install the dependencies of the webapp/ folder first and then
overwrite the package.json to use different scripts. If we would track
dependencies in a separate package.json we would have to update it
with dependabot. We don't want that because of our precious build
server time.
 2019-09-11 08:43:26 +02:00
roschaefer
5804b1352c Remove old docker files 2019-09-11 08:43:26 +02:00
roschaefer
d6b7374ddb Change strategy, only build docker image 
I couldnt' get the local build to run with the alternative
`nuxt.config.js`. So I'm building docker only now.
 2019-09-11 08:43:26 +02:00
roschaefer
61e583e31b Translatable, mobile-responsive maintenance page 2019-09-11 08:43:26 +02:00
mattwr18
04113a1d60
Merge pull request #1516 from Human-Connection/remove_nodemon 
Remove nodemon, use `nuxt` cli tools
 2019-09-11 08:39:56 +02:00
mattwr18
9487d0491e
Merge pull request #1546 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp
 2019-09-11 08:22:04 +02:00
mattwr18
e7cbdb4adc
Merge pull request #1545 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.3.0 
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend
 2019-09-11 08:21:46 +02:00
Wolfgang Huß
379f7d1ed7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/CommentForm/CommentForm.spec.js
#	webapp/components/CommentForm/CommentForm.vue
#	webapp/components/EditCommentForm/EditCommentForm.vue
#	webapp/store/editor.js
 2019-09-11 07:58:40 +02:00
dependabot-preview[bot]
1239071fab
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-11 04:20:54 +00:00
dependabot-preview[bot]
99c9d0d45e
Bump eslint-config-prettier from 6.2.0 to 6.3.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-11 04:20:41 +00:00
roschaefer
5cf82d5e18 Fix build 
Here are the issues
* webapp was built with `NODE_ENV=production` but started with
`NODE_ENV=development`
* using the provided `docker-compose.travis.yml` the command `yarn run
start` would look in the wrong folder
* removed duplicate environment definition
 2019-09-11 02:22:08 +02:00
Robert Schäfer
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02:00
aonomike
785b59f96e Test filter by followed by 2019-09-10 23:32:55 +03:00
mattwr18
3712a5d2cf
Merge pull request #1513 from Human-Connection/bugfix_about_me_not_saved_on_signup_verification 
Bugfix: `about me` not saved on signup
 2019-09-10 17:37:22 +02:00
roschaefer
8bf11b18aa Remove dead code 2019-09-10 16:37:13 +02:00
roschaefer
656834fa0b Remove nodemon, use nuxt cli tools 
@appinteractive can you tell me why we had the custom code in
`server/index.js`?
 2019-09-10 16:37:13 +02:00
roschaefer
99fe0b001f Fix German signup mail, follow @mattwr18's review 
https://github.com/Human-Connection/Human-Connection/pull/1512#pullrequestreview-285968139
 2019-09-10 16:24:43 +02:00
Robert Schäfer
6cebb61d0f
Merge pull request #1490 from Human-Connection/1488-filter-posts-by-emotion 
Filter posts by emotions
 2019-09-10 15:53:05 +02:00
roschaefer
22af1399b3 Follow @mattwr18's review 2019-09-10 15:40:10 +02:00
mattwr18
77eb8274f3 Improve English grammar in test descriptions 
- Fix typo
- use gender neutral pronoun
- fix third-person conjugation
 2019-09-10 15:39:34 +02:00
roschaefer
b656b5aeb9 Check that about actually gets saved 2019-09-10 15:39:34 +02:00
roschaefer
0cd7ac3d32 Refactor slugifyMiddleware 
* eliminate GraphQL from spec
* much better error handling
* add EmailAdress factory
 2019-09-10 15:39:34 +02:00
mattwr18
42add14856
Merge pull request #1531 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.3 
Bump neode from 0.3.2 to 0.3.3 in /backend
 2019-09-10 15:06:25 +02:00
mattwr18
153bd918bc
Merge pull request #1528 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.16 
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend
 2019-09-10 15:06:09 +02:00
mattwr18
7618318a8a
Merge pull request #1526 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.0 
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:56 +02:00
mattwr18
c7b590d6b0
Merge pull request #1523 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend
 2019-09-10 15:05:34 +02:00
mattwr18
c7b20306a0
Merge pull request #1522 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.6.1 
Bump @babel/node from 7.5.5 to 7.6.1 in /backend
 2019-09-10 15:05:20 +02:00
mattwr18
1fda99e198
Merge pull request #1540 from Human-Connection/remove_editor_store 
Remove obsolete code
 2019-09-10 15:04:46 +02:00
mattwr18
2b1590aae1 Add German translation to email template, _ for unused variables 2019-09-10 10:30:17 +02:00
mattwr18
0c83d276bb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-10 09:32:45 +02:00
mattwr18
72ae2a4e44 Improve CSS 
- filter by users followed button was slightly higher than emotions
buttons
 2019-09-10 09:31:59 +02:00
dependabot-preview[bot]
1ee2ebe8e7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:32 +00:00
dependabot-preview[bot]
02ad873427
Bump @babel/cli from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
dependabot-preview[bot]
00b45b8016
Bump @babel/node from 7.5.5 to 7.6.1 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.5.5 to 7.6.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:34:07 +00:00
mattwr18
b91fab7a3c
Merge pull request #1541 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.21 
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp
 2019-09-10 08:32:57 +02:00
mattwr18
1b677b6cb4
Merge pull request #1532 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.0 
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp
 2019-09-10 08:32:29 +02:00
dependabot-preview[bot]
53baad9f4d
Bump neode from 0.3.2 to 0.3.3 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.2 to 0.3.3.
- [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-09-10 06:32:06 +00:00
mattwr18
aeaa637ff0
Merge pull request #1530 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.0 
Bump @babel/core from 7.5.5 to 7.6.0 in /backend
 2019-09-10 08:32:04 +02:00
mattwr18
e6716302a3
Merge pull request #1529 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-jest-3.0.5 
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp
 2019-09-10 08:31:45 +02:00
dependabot-preview[bot]
d0ff75cca6
Bump apollo-link-http from 1.5.15 to 1.5.16 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.15 to 1.5.16.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.15...apollo-link-http@1.5.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 06:31:39 +00:00
mattwr18
d44b515e92
Merge pull request #1527 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.1.0 
Bump date-fns from 2.0.1 to 2.1.0 in /webapp
 2019-09-10 08:31:23 +02:00