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

3541 Commits

Author SHA1 Message Date
Moriz Wahl
e9a433e203
Merge pull request #4193 from Ocelot-Social-Community/disable-filters 
refactor: Disbale Emoji, Language And Catgeory Filter
 2021-02-03 15:43:19 +01:00
Moriz Wahl
8664c94c9c disbale emoji, language and catgeory filter 2021-02-03 12:27:04 +01:00
Moriz Wahl
3f7933bdf7 removed catgeories from post teaser, kept placeholder 2021-02-02 13:31:43 +01:00
Ulf Gebhardt
0d3863fb9a
Merge pull request #4186 from Ocelot-Social-Community/ci_improvements 
Backend Unit Tests via CI & Run tests in parallel
 2021-02-02 02:45:48 +01:00
Ulf Gebhardt
8a0b3a2826
- build test images 2021-01-30 19:25:39 +01:00
Ulf Gebhardt
e37d9f34bc
- lint fixes 2021-01-29 20:48:12 +01:00
Ulf Gebhardt
9bf90bc880
- make cookie time configurable (default: 2 years) 
- make cookie https setting configurable (default true in production)
- ensure cookie is set to `path: /` to fix redirect problem
 2021-01-29 20:45:54 +01:00
Ulf Gebhardt
35cfcfc1a2
Merge pull request #4133 from Ocelot-Social-Community/refactor_config 
Refactor config
 2021-01-28 20:22:21 +01:00
Moriz Wahl
5d14ebc113
Merge pull request #4144 from Ocelot-Social-Community/2144-Add_Search_Results_Page 
feat: 🍰 Search Results Page
 2021-01-28 20:00:32 +01:00
Ulf Gebhardt
a6bd42856a
- fixed config import 
- default for STYLEGUIDE_DEV config
 2021-01-28 17:47:55 +01:00
Ulf Gebhardt
9f549371f7
fixed dockerfile for maintenance with new config 2021-01-28 17:47:55 +01:00
Ulf Gebhardt
7d66431049
introduced config file for webapp 2021-01-28 17:47:55 +01:00
Wolfgang Huß
a69a310ff0 Refactor SearchInput.vue storybook, but couldn't fix it 
- If I run 'yarn storybook' and chose 'SearchInput' the error 'undefined is not an object (evaluating '$i18n.locale')' still occurs.
 2021-01-26 09:54:07 +01:00
Wolfgang Huß
cf9eafa2eb Refactor TabNavigator.vue storybook entry 2021-01-26 09:50:10 +01:00
Wolfgang Huß
3ef41adfb1 Refactor TabNavigator.story.js 2021-01-25 15:28:07 +01:00
Wolfgang Huß
1f8fdb78fd Write unit test for TabNavigator.vue 2021-01-25 11:00:08 +01:00
Wolfgang Huß
7ffd8c59cb Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-25 08:24:47 +01:00
Ulf Gebhardt
52842c51bb
- working production docker-compose setup 2021-01-23 03:10:07 +01:00
Ulf Gebhardt
d8d22015d0
- fixed webapp tests 
- corrected docker image name
 2021-01-22 17:29:58 +01:00
Ulf Gebhardt
289e62ddb4
corrected image & service names 2021-01-22 14:14:34 +01:00
Ulf Gebhardt
9c7761eb1e
maintenance docu port corrected 2021-01-22 14:03:46 +01:00
Wolfgang Huß
9194c58176 Implement TabNavigation test, start 2021-01-22 11:27:45 +01:00
Wolfgang Huß
9dbe8bd257 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into fix_docker 2021-01-22 11:21:19 +01:00
Wolfgang Huß
ae09aee91c Renamed NewTabNavigation to TabNavigation 
- Renamed old TabNavigation to OldTabNavigation.
 2021-01-21 20:27:13 +01:00
Wolfgang Huß
9ce1e089fa Fix lint 2021-01-21 16:38:55 +01:00
Moriz Wahl
4e423e6965 detect languages linting 2021-01-21 13:50:49 +01:00
Moriz Wahl
250d231a74
auto detect language. Input field in contribution form removed. 2021-01-21 13:30:56 +01:00
Wolfgang Huß
101b50486c Cleanup comments 2021-01-21 13:03:32 +01:00
Wolfgang Huß
830eb1010c Refactored SearchResults.spec.js to new tab component 2021-01-21 11:36:39 +01:00
Wolfgang Huß
16c3d2ab87 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-21 08:01:40 +01:00
Wolfgang Huß
3de2e3c003 Add again accidental removed 'deleteUser' function on user profile 2021-01-21 07:53:25 +01:00
Ulf Gebhardt
c41d32d527
- fixed node_modules running out of sync since they are on a volume for development docker builds 2021-01-20 13:43:22 +01:00
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
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
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
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
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
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
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
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
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
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
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
Ulf Gebhardt
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ß
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