9853 Commits

Author SHA1 Message Date
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
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
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
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
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
2b8996a898
Merge pull request #4121 from Ocelot-Social-Community/start_on_registration
start_on_register
2021-01-14 15:15:46 +01:00
5284e05dc5
Merge pull request #4117 from Ocelot-Social-Community/docu_design
updates on some designs
2021-01-12 02:25:48 +01:00
Wolfgang Huß
5cf1796c0a
Merge pull request #4099 from Ocelot-Social-Community/3941-white-labeling-and-reminders-of-new-deployment
chore: 🍰 White-Labeling And Reminders Of New Deployment
2021-01-11 09:31:31 +01:00
81e42d6f58
- start with register page
- on logout force to go to login page
2021-01-10 00:12:29 +01:00
Wolfgang Huß
fbdad163ab Fix linting 2021-01-07 15:35:52 +01:00
Wolfgang Huß
774616857e Anonymize maintenance screen shot 2021-01-07 15:35:52 +01:00
Wolfgang Huß
6957f64f2a Change icon to a transparent background 2021-01-07 15:35:52 +01:00
Wolfgang Huß
5a40601f46 Add image to maintenance mode README.md 2021-01-07 15:35:52 +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ß
d3737b2acf Change registration svg 2021-01-07 15:33:26 +01:00
Wolfgang Huß
259a58cab9 Change svg's width and height from 100% to explicit px of viewBox
- Set a link on password-reset image.
2021-01-07 15:33:26 +01:00
Wolfgang Huß
b778d3eda5 Change some logos to ocelot.social white branded 2021-01-07 15:33:26 +01:00
Wolfgang Huß
5705ebac36 Better white logo
- Put the white watermark in the background.
2021-01-07 15:33:26 +01:00
Wolfgang Huß
7c2c8d3368 Implement new ocelot.social logos 2021-01-07 15:33:26 +01:00
Wolfgang Huß
35e9404e8c Correct docker-compose.yml 2021-01-07 15:33:26 +01:00
Wolfgang Huß
156d54e3e7
Merge pull request #4119 from Ocelot-Social-Community/fix-cookie-test
Mock Cookie In Auth.test.js
2021-01-07 15:21:21 +01:00
Moriz Wahl
c8d04a1604 mock cookie for testing 2021-01-07 14:26:10 +01:00
838d01a015
updates on some designs 2021-01-07 04:24:03 +01:00
Moriz Wahl
27d3e81f91
Merge pull request #4112 from Ocelot-Social-Community/4107-database-migration-readme
chore: 🍰 Database Initialisation Readme After First Deployment
2021-01-05 17:36:10 +01:00
Wolfgang Huß
c0f843c3fe Correct Readme.md for deployment database initialization 2021-01-05 15:01:33 +01:00
Wolfgang Huß
c7ace3c567 Correct backend Readme.md 2021-01-05 14:57:27 +01:00
Wolfgang Huß
bde9ea5308 Create Readme.md entry for deployment database initialization 2021-01-05 14:49:20 +01:00
Wolfgang Huß
0af713f65f Correct backend Readme.md 2021-01-05 14:47:19 +01:00
Wolfgang Huß
cfafa7e0bb Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4107-database-migration-readme 2021-01-05 11:00:08 +01:00
Wolfgang Huß
5e396d1458
Merge pull request #4084 from Ocelot-Social-Community/4012-default-admin
feat: 🍰 Create Default Admin User
2021-01-04 17:50:28 +01:00
Wolfgang Huß
818ce5795d Correct docker-compose volume paths for override 2021-01-04 15:49:45 +01:00
cd98098ef0
Merge pull request #4102 from Ocelot-Social-Community/docu_design
docu_design
2020-12-26 12:59:19 +01:00
72b8c22634
design data up to now 2020-12-23 13:45:16 +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