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

3113 Commits

Author SHA1 Message Date
Ulf Gebhardt
c9a5df0cd6
- fixed build version in webapp and backend 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
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
190f9ba322 setup for switch iser role as admin 2021-01-18 17:37:57 +01:00
Moriz Wahl
a98170487b inviteCodes: explaination added, test for lower case 2021-01-18 17:23:55 +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
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
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
Moriz Wahl
9449a55d42 qyery for generated invite codes 2021-01-12 16:43:34 +01:00
Moriz Wahl
dd6cafed4c basic specs for inviteCodes 2021-01-11 21:25:02 +01:00
Wolfgang Huß
11aabf0b16 Change maintenance svg 
- Add 'Readme.md' for maintenance mode.
- Refine other Readme's.
 2021-01-07 15:35:52 +01:00
Wolfgang Huß
d8a2d56aa8 Refine some package.json 2021-01-07 15:33:26 +01:00
Moriz Wahl
a1967815bf further invite code 2021-01-07 13:30:11 +01:00
Wolfgang Huß
c7ace3c567 Correct backend Readme.md 2021-01-05 14:57:27 +01:00
Wolfgang Huß
0af713f65f Correct backend Readme.md 2021-01-05 14:47:19 +01:00
Wolfgang Huß
6ee23eda48 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4012-default-admin 2020-12-23 13:30:32 +01:00
Wolfgang Huß
78982f18ca
Update backend/README.md 2020-12-21 10:44:40 +01:00
Moriz Wahl
75485fe237 linting 2020-12-21 10:07:43 +01:00
Moriz Wahl
3f02ade329 createdAt converted toString in Email 2020-12-21 09:52:45 +01:00
Moriz Wahl
cee3317918 default user can login 2020-12-18 09:40:04 +01:00
Moriz Wahl
4fd136c625 Default user is created but cannot login sofar 2020-12-17 19:56:41 +01:00
Moriz Wahl
c948f9460b improved 2020-12-17 11:28:56 +01:00
Moriz Wahl
269a50903e fixed typo 2020-12-17 11:27:00 +01:00
Moriz Wahl
6773a184c6 Added a hint how to use different node versions. Recommend usage of node 12.19.0 2020-12-17 11:24:54 +01:00
dependabot-preview[bot]
06f57f94bd
Bump slug from 2.1.1 to 4.0.2 in /backend 
Bumps [slug](https://github.com/Trott/slug) from 2.1.1 to 4.0.2.
- [Release notes](https://github.com/Trott/slug/releases)
- [Changelog](https://github.com/Trott/slug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Trott/slug/compare/v2.1.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-14 08:34:37 +00:00
Mogge
5e23d63b39
Merge pull request #4055 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/uuid-8.3.2 
Bump uuid from 7.0.3 to 8.3.2 in /backend
 2020-12-14 09:32:17 +01:00
dependabot-preview[bot]
0c36ef8a6e
[Security] Bump ini from 1.3.5 to 1.3.8 in /backend 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-14 08:09:03 +00:00
dependabot-preview[bot]
3904de2a30
Bump uuid from 7.0.3 to 8.3.2 in /backend 
Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.3 to 8.3.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.3...v8.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-09 05:51:23 +00:00
Wolfgang Huß
c286b556f2 Downgrade Node version to v12.19.0-alpine3.10 
- Testing if this solves the failing build.
 2020-12-02 18:34:06 +01:00
Wolfgang Huß
d2d257bc1c Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling 
# Conflicts:
#	backend/Dockerfile
#	webapp/Dockerfile
#	webapp/Dockerfile.maintenance
#	webapp/components/LoginForm/LoginForm.vue
#	webapp/package.json
 2020-12-02 11:11:26 +01:00
Mogge
55ab977366
Merge pull request #4008 from Ocelot-Social-Community/dependabot/docker/backend/node-15.3.0-alpine3.10 
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /backend
 2020-12-01 18:27:00 +01:00
Mogge
2e14c9e2df
Merge pull request #4024 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-audio-5.14.26 
Bump metascraper-audio from 5.11.8 to 5.14.26 in /backend
 2020-12-01 18:02:29 +01:00
Mogge
d51e75873f
Merge pull request #4025 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-url-5.14.26 
Bump metascraper-url from 5.11.8 to 5.14.26 in /backend
 2020-12-01 17:52:13 +01:00
dependabot-preview[bot]
93a9c0117b
Bump metascraper-logo from 5.11.6 to 5.14.26 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.11.6 to 5.14.26.
- [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.11.6...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:53:09 +00:00
dependabot-preview[bot]
81076429a3
Bump metascraper-url from 5.11.8 to 5.14.26 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.11.8 to 5.14.26.
- [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.11.8...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:40:46 +00:00
dependabot-preview[bot]
1ec5293319
Bump metascraper-audio from 5.11.8 to 5.14.26 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.11.8 to 5.14.26.
- [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.11.8...v5.14.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 05:35:12 +00:00
dependabot-preview[bot]
ff1e228fcc
Bump node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10 in /backend 
Bumps node from 12.19.0-alpine3.10 to 15.3.0-alpine3.10.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-25 04:59:48 +00:00