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

10168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
33b8b001d7
- remove yarn run dev command since its part of the dockerfile for the production stage 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
cbf799d265
- build community edition of neo4j 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
0715310089
- refactor neo4j dockerfile 
- support build stages community & enterprise
 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
c9a5df0cd6
- fixed build version in webapp and backend 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
a662fed961
- override all image names for development 
- structuring comment for service blocks
 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
b25af045db
- include maintenance in production environment 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
7cc003602f
- docker-compose definition order 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
2518e38582
- webapp Dockerfile 
- cleanup backend Dockerfile
- docker-compose cleanup
- docker-compose networks
- docker-compose for production, docker-compose.override for development
- security
- todos
 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
269e38b56e
backend dockerfile and compose seem to be pretty solid now 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
0523c88bb8
- fixed docker compose for backend 
- changed backend port to 4000
- removed volume from development build stage
 2021-01-19 23:18:52 +01:00
Ulf Gebhardt
a4e4d5d74e
New Dockerfile for the backend 2021-01-19 23:18:52 +01:00
Brandon Tripp
da99ee596e Linting for code changes. 2021-01-19 14:51:19 -07:00
Brandon Tripp
4c8eeb506e A charmap added for slug to transliterate the german umlauts and the spanish enya. The package was updated but does not accept the setting properly. 2021-01-19 14:51:19 -07:00
Brandon Tripp
9d19eab35b linting adjustment. 2021-01-19 14:51:19 -07:00
Brandon Tripp
a5da718bb0 A slight change to the test cases to make sure the encoding is working for German and Spanish. 2021-01-19 14:51:19 -07:00
Brandon Tripp
e22e15bc77 Changed the uniqueSlug setting to include the deutsch locale to properly handle umlauts and tests. 2021-01-19 14:51:19 -07:00
Moriz Wahl
df327c6a3d remove categories: clean up backend 2021-01-19 17:40:02 +01:00
Moriz Wahl
c179b0a12f remove categories: clean up 2021-01-19 17:40:02 +01:00
Moriz Wahl
f73c40c252 removed categories from posts 2021-01-19 17:40:02 +01:00
Moriz Wahl
2777e337f8 invite codes. typo in factory 2021-01-19 17:22:36 +01:00
Moriz Wahl
f34f66fe82 invite codes: fixed typo, createdAt and ID is required 2021-01-19 17:15:28 +01:00
Moriz Wahl
fcf6b95121
Merge pull request #4146 from Ocelot-Social-Community/revert-tipptapp-extensions 
Revert "Bump tiptap-extensions from 1.28.8 to 1.34.0 in /webapp"
 2021-01-19 03:28:50 +01:00
Moriz Wahl
44f43663b0 Revert "Bump tiptap-extensions from 1.28.8 to 1.34.0 in /webapp" 
This reverts commit a72e3e3747b37f66b4a6033ee719e324e5dea278.
 2021-01-18 18:55:01 +01:00
Moriz Wahl
ea3a97f5bc Merge branch '4124-switch-user-role' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4124-switch-user-role 2021-01-18 17:38:37 +01:00
Moriz Wahl
190f9ba322 setup for switch iser role as admin 2021-01-18 17:37:57 +01:00
Moriz Wahl
88c9bf00d4 Merge branch '4124-switch-user-role' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4124-switch-user-role 2021-01-18 17:32:53 +01:00
Moriz Wahl
78ed32fa4b setup for switch iser role as admin 2021-01-18 17:32:19 +01:00
Moriz Wahl
a98170487b inviteCodes: explaination added, test for lower case 2021-01-18 17:23:55 +01:00
Moriz Wahl
dca61c2f6a
Merge pull request #4145 from Ocelot-Social-Community/fix-of-docker-compose-live-reload 
chore: 🍰 Quick Fix Of Live Reload By Nuxt For Docker-Compose
 2021-01-18 16:04:02 +01:00
Wolfgang Huß
2495f4fa72 Fixed live reload of Nuxt for docker-compose 
- If code was changed by the developer in backend and webapp live reload was not executed.
 2021-01-18 15:53:08 +01:00
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Moriz Wahl
2ffab3a0a4
Merge pull request #3999 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.15.0 
Bump eslint-config-prettier from 6.10.1 to 6.15.0 in /webapp
 2021-01-15 18:05:48 +01:00
dependabot-preview[bot]
51822e181c
Bump eslint-config-prettier from 6.10.1 to 6.15.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.10.1 to 6.15.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.10.1...v6.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 16:51:48 +00:00
Moriz Wahl
64731f2d95
Merge pull request #4074 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-standard-5.0.0 
Bump eslint-plugin-standard from 4.0.1 to 5.0.0 in /webapp
 2021-01-15 17:47:28 +01:00
dependabot-preview[bot]
20daae43bf
Bump eslint-plugin-standard from 4.0.1 to 5.0.0 in /webapp 
Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard) from 4.0.1 to 5.0.0.
- [Release notes](https://github.com/standard/eslint-plugin-standard/releases)
- [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.0.1...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 16:32:40 +00:00
Moriz Wahl
d6556fe0e2
Merge pull request #4115 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.34.0 
Bump tiptap-extensions from 1.28.8 to 1.34.0 in /webapp
 2021-01-15 17:27:36 +01:00
dependabot-preview[bot]
a72e3e3747
Bump tiptap-extensions from 1.28.8 to 1.34.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/ueberdosis/tiptap) from 1.28.8 to 1.34.0.
- [Release notes](https://github.com/ueberdosis/tiptap/releases)
- [Commits](https://github.com/ueberdosis/tiptap/compare/tiptap-extensions@1.28.8...tiptap-extensions@1.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 16:17:03 +00:00
Moriz Wahl
16cff934de
Merge pull request #4126 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/sass-loader-10.1.1 
Bump sass-loader from 8.0.2 to 10.1.1 in /webapp
 2021-01-15 17:09:43 +01:00
dependabot-preview[bot]
0fb61e1549
Bump sass-loader from 8.0.2 to 10.1.1 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.2 to 10.1.1.
- [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/v8.0.2...v10.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 15:53:34 +00:00
Moriz Wahl
829fa2e44e
Merge pull request #4006 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/faker-5.1.0 
Bump faker from 4.1.0 to 5.1.0 in /webapp
 2021-01-15 16:42:41 +01:00
dependabot-preview[bot]
738b440c27
Bump faker from 4.1.0 to 5.1.0 in /webapp 
Bumps [faker](https://github.com/Marak/Faker.js) from 4.1.0 to 5.1.0.
- [Release notes](https://github.com/Marak/Faker.js/releases)
- [Changelog](https://github.com/Marak/faker.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Marak/Faker.js/compare/v4.1.0...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 15:34:10 +00:00
Moriz Wahl
ffd358dfea
Merge pull request #4093 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/node-notifier-8.0.1 
[Security] Bump node-notifier from 8.0.0 to 8.0.1 in /webapp
 2021-01-15 16:30:32 +01:00
dependabot-preview[bot]
3dbc1ca70a
[Security] Bump node-notifier from 8.0.0 to 8.0.1 in /webapp 
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-15 15:17:52 +00:00
Moriz Wahl
26c3107750 setup for switch iser role as admin 2021-01-15 15:39:51 +01:00
Moriz Wahl
cbf50014ed removed categories from posts 2021-01-15 00:36:55 +01:00
Moriz Wahl
c0221dae20
Merge pull request #3996 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/slug-4.0.2 
Bump slug from 2.1.1 to 4.0.2 in /backend
 2021-01-15 00:07:45 +01:00
Moriz Wahl
c6ff0723ee inviteCodes: tests are working as expected, fixed factory 2021-01-14 22:34:53 +01:00
Ulf Gebhardt
2b8996a898
Merge pull request #4121 from Ocelot-Social-Community/start_on_registration 
start_on_register
 2021-01-14 15:15:46 +01:00
Moriz Wahl
f20e17dcc1 query for validation of invite code 2021-01-12 21:25:25 +01:00
Moriz Wahl
0c141b631f factory and seeding for invite codes 2021-01-12 20:11:47 +01:00