|
|
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 |
|
|
|
269e38b56e
|
backend dockerfile and compose seem to be pretty solid now
|
2021-01-19 23:18:52 +01:00 |
|
|
|
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 |
|
|
|
a4e4d5d74e
|
New Dockerfile for the backend
|
2021-01-19 23:18:52 +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 |
|
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 |
|
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 |
|
Moriz Wahl
|
e47671c52a
|
further changed requested by Tirokk
|
2020-11-24 19:10:46 +01:00 |
|
Moriz Wahl
|
5b02050efc
|
Merge branch 'white-labeling' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling
|
2020-11-23 13:44:45 +01:00 |
|
Moriz Wahl
|
16cdcc921e
|
further changes
|
2020-11-23 13:44:16 +01:00 |
|
Mogge
|
75658a2f32
|
Merge branch 'master' into white-labeling
|
2020-11-23 13:35:40 +01:00 |
|
Moriz Wahl
|
6454e686e9
|
changes requested implemented
|
2020-11-23 13:34:07 +01:00 |
|
Mogge
|
284d01840a
|
Merge pull request #3957 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/prettier-2.2.0
Bump prettier from 2.0.4 to 2.2.0 in /backend
|
2020-11-20 21:08:39 +01:00 |
|
Mogge
|
8f85c0b613
|
Merge pull request #3953 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/dot-prop-4.2.1
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /backend
|
2020-11-20 21:07:27 +01:00 |
|
Mogge
|
62261f4b92
|
Merge pull request #3954 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/object-path-0.11.5
[Security] Bump object-path from 0.11.4 to 0.11.5 in /backend
|
2020-11-20 21:01:44 +01:00 |
|
Mogge
|
19126c032a
|
Merge pull request #3955 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/migrate-1.7.0
Bump migrate from 1.6.2 to 1.7.0 in /backend
|
2020-11-20 20:53:22 +01:00 |
|
Mogge
|
e2f4b99561
|
Merge pull request #3961 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/jquery-3.5.1
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend
|
2020-11-20 20:36:39 +01:00 |
|
dependabot-preview[bot]
|
f7fdcc975b
|
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /backend
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 19:31:03 +00:00 |
|
dependabot-preview[bot]
|
43df22208a
|
Bump prettier from 2.0.4 to 2.2.0 in /backend
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.4 to 2.2.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.4...2.2.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 19:22:54 +00:00 |
|
Mogge
|
f1953385fa
|
Merge pull request #3983 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/apollo-server-2.14.2
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend
|
2020-11-20 20:00:33 +01:00 |
|
Mogge
|
588caf2f5d
|
Merge pull request #3982 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/node-fetch-2.6.1
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend
|
2020-11-20 19:59:33 +01:00 |
|
dependabot-preview[bot]
|
6445ad2e08
|
Bump migrate from 1.6.2 to 1.7.0 in /backend
Bumps [migrate](https://github.com/visionmedia/node-migrate) from 1.6.2 to 1.7.0.
- [Release notes](https://github.com/visionmedia/node-migrate/releases)
- [Changelog](https://github.com/tj/node-migrate/blob/main/History.md)
- [Commits](https://github.com/visionmedia/node-migrate/compare/v1.6.2...v1.7.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 18:48:36 +00:00 |
|
Mogge
|
f67ebe7005
|
Merge pull request #3960 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-author-5.14.22
Bump metascraper-author from 5.11.8 to 5.14.22 in /backend
|
2020-11-20 19:46:23 +01:00 |
|
dependabot-preview[bot]
|
d2d226cf0a
|
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.1. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 18:34:22 +00:00 |
|
dependabot-preview[bot]
|
6a0675c5c1
|
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend
Bumps [apollo-server](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server) from 2.11.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server@2.14.2/packages/apollo-server)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 18:28:32 +00:00 |
|
dependabot-preview[bot]
|
fe1ea862a6
|
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-11-20 18:28:32 +00:00 |
|
