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

2944 Commits

Author SHA1 Message Date
Ulf Gebhardt
8a0b3a2826
- build test images 2021-01-30 19:25:39 +01:00
Ulf Gebhardt
309c89ecf8
Merge pull request #4179 from Ocelot-Social-Community/statistics-test 
bug: DB Reset At Start Of Statistics Test In Backend
 2021-01-29 12:06:03 +01:00
Moriz Wahl
65d33ccdae db reset at start of statistics test in backend must be async 2021-01-28 20:29:54 +01:00
Moriz Wahl
9a6759aae4 db reset at start of statistics test in backend 2021-01-28 20:26:49 +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
13c8b85c78
refactor backend config 2021-01-28 17:47:55 +01:00
Ulf Gebhardt
3b8646b44e
- lint fix 2021-01-28 00:51:03 +01:00
Ulf Gebhardt
f4bab1997d
-fixed test to work in docker and local environment 2021-01-28 00:46:11 +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
4842c5d7fe
Fixed no-env-warning to be more precise 2021-01-23 21:45:02 +01:00
Ulf Gebhardt
52842c51bb
- working production docker-compose setup 2021-01-23 03:10:07 +01:00
Ulf Gebhardt
c420e18543
- lint fixes 2021-01-22 17:38:54 +01:00
Ulf Gebhardt
cd42824502
force NODE_ENV=test also on backend tests 2021-01-22 17:33:33 +01:00
Ulf Gebhardt
4b04a6bb5c
- fixed webfinger test to work with docker(hackfix) 
- fixed permissions middleware to properly authenticate users
 2021-01-22 16:53:13 +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
Brandon Tripp
e33da64c10
Merge pull request #4104 from Ocelot-Social-Community/bgt-german-umlaut-slug 
[WIP] fix: 🍰 Issue #3504 umlaut encoding #3676
 2021-01-21 15:39:52 -07:00
Moriz Wahl
ca74c91fc9
language detect: remove unwanted db fields 2021-01-21 13:30:56 +01:00
Moriz Wahl
250d231a74
auto detect language. Input field in contribution form removed. 2021-01-21 13:30:56 +01:00
Moriz Wahl
5559a9bc06
detect languages removes html tags before detection 2021-01-21 13:25:46 +01:00
Moriz Wahl
3bd8a531f1
basic tests for language detection 2021-01-21 13:25:46 +01:00
Moriz Wahl
f3847e5c97
setup middleware for language detection 2021-01-21 13:25:46 +01:00
Wolfgang Huß
e7243261f2 Fix lint 2021-01-21 13:10:58 +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
Brandon Tripp
00e0ccd7a4 The uniqueSlug charmap option was set to the multicharmap in order to keep the modified german umlaut settings to overide the internal settings for other diacritics. The test cases strings were extended to improve coverage of diacritic removal. 2021-01-20 18:49:04 -07:00
Moriz Wahl
9130b2bb50
Merge pull request #4154 from Ocelot-Social-Community/hot-fix.invite-codes 
bug: hotfix for invite codes
 2021-01-20 22:20:02 +01:00
Moriz Wahl
828ba7547f
Merge pull request #4134 from Ocelot-Social-Community/remove-categories 
refactor: Disable Categories
 2021-01-20 18:54:26 +01:00
Moriz Wahl
95a423a33a hotfix for invite codes 2021-01-20 18:49:51 +01:00
Ulf Gebhardt
87db5ae31e
- corrected docu 
- run unit test correctly for backend
 2021-01-20 14:24:15 +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
Moriz Wahl
8a4f64e030
Merge pull request #4125 from Ocelot-Social-Community/invite-codes 
feat: Invite codes
 2021-01-20 12:47:11 +01:00
Brandon Tripp
c8ac972e20 Linting fix. 2021-01-19 15:38:21 -07: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
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
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