IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,067 Commits 5 Branches 2 Tags
Commit Graph

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
c80b3a2128 slider jumps to enter-nonce when link contains invite-code, email and nonce and method is invite-code. Thanks @tirokk 2021-04-06 13:35:31 +02:00
Moriz Wahl
21a667eb25 linting 2021-04-06 13:35:31 +02:00
Moriz Wahl
27f0de9464 fix enail confirmation link when an invite-code is given 2021-04-06 13:35:31 +02:00
Ulf Gebhardt
b92a7a10dd
Merge pull request #4331 from Ocelot-Social-Community/readme_update 
readme_update
 2021-04-04 19:43:32 +02:00
Ulf Gebhardt
fc536e2fb0
v1.0.1 2021-04-04 18:36:02 +02:00
Ulf Gebhardt
0fc6cf3435
Changed logo size and entered it, crossed out development environment 2021-04-04 18:34:46 +02:00
Ulf Gebhardt
3d67ccb7e1
Merge pull request #4330 from Ocelot-Social-Community/jwt_expiretime 
jwt_expiretime
 2021-04-04 18:30:29 +02:00
Ulf Gebhardt
282e65aa0d
Merge pull request #4337 from Ocelot-Social-Community/clear_env_docker_workflows 
Clean env, docker & workflow
 2021-04-04 18:29:52 +02:00
Ulf Gebhardt
d40704dcb6
.env is required no way around it 2021-04-03 05:41:58 +02:00
Ulf Gebhardt
c418cb1b50
include env file loading in test compose file 2021-04-03 05:25:59 +02:00
Ulf Gebhardt
dfe6f679b3
include env files in build process 2021-04-03 05:17:13 +02:00
Ulf Gebhardt
ee4a63b606
define envs for the backend in test compose file 2021-04-03 05:01:55 +02:00
Ulf Gebhardt
742543b87a
try without .env file in production composer file 2021-04-03 04:34:14 +02:00
Ulf Gebhardt
f6c070a3cb
removed config warning 
cleaned up test.yml workflow
try to run without .env files
 2021-04-03 04:23:31 +02:00
Ulf Gebhardt
a8b0699ebb
make jwt expire time configurable like in the frontend 2021-04-01 02:32:30 +02:00
Wolfgang Huß
1066f67c5b
Merge pull request #4320 from Ocelot-Social-Community/4236-avatar-has-border 
fix: 🍰 Fixing The Avatars unwanted Border
 2021-03-31 15:45:22 +02:00
Wolfgang Huß
ab26f9fb23
Merge pull request #4321 from Ocelot-Social-Community/version_1.0.0 
v1.0.0
 2021-03-31 10:08:35 +02:00
Ulf Gebhardt
c9d0cbaab1
v1.0.0 2021-03-31 03:57:13 +02:00
Wolfgang Huß
8bd34f9de7
Merge pull request #4314 from Ocelot-Social-Community/4253-long-hashtags-not-visible 
fix: 🐛 Fix Wrong Truncation Of Hashtags In Admin List Via Adding 'truncateStr'
 2021-03-30 17:36:54 +02:00
Wolfgang Huß
f176fa5c3b Refine and remove the last very small rest of the unwanted boarder 2021-03-30 17:33:24 +02:00
Wolfgang Huß
17b5e97d76 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4253-long-hashtags-not-visible 
# Conflicts:
#	webapp/plugins/vue-filters.js
 2021-03-30 16:05:54 +02:00
Wolfgang Huß
e48a99afe6 Change background color of avatar image to white 
- Refactor the user avatar storybook.
 2021-03-30 15:53:33 +02:00
Ulf Gebhardt
9ad7dab918
Merge pull request #4270 from Ocelot-Social-Community/4092-implement-new-registration 
feat: 🍰Implement Registration Slider
 2021-03-30 05:04:32 +02:00
Wolfgang Huß
4ddc6fb07a
Implement toaster for wrong invite code and wrong nonce 2021-03-30 04:51:45 +02:00
Wolfgang Huß
4907eab095
Remove header from registration page 2021-03-30 04:51:45 +02:00
Wolfgang Huß
d38cfd2d7d
Remove h2 title and replace the first slider title with its text 2021-03-30 04:51:45 +02:00
Wolfgang Huß
3398d3b373
Cleanup locales 2021-03-30 04:51:45 +02:00
Wolfgang Huß
3ddd00f8e5
Fix registration slider storybook 2021-03-30 04:51:45 +02:00
Wolfgang Huß
e00de176e2
Cleanup in general 2021-03-30 04:51:45 +02:00
Wolfgang Huß
cad37a8666
Write test for the slider entrance controlled by URI queries 2021-03-30 04:51:45 +02:00
Wolfgang Huß
3fa7e04d48
Delete unnecessary code 2021-03-30 04:51:44 +02:00
Wolfgang Huß
3d8fe39cbe
Fix non standard locales 2021-03-30 04:51:44 +02:00
Wolfgang Huß
170a9d1531
Fix unauthenticated signup 2021-03-30 04:51:44 +02:00
Wolfgang Huß
1639726130
Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4092-implement-new-registration 2021-03-30 04:51:44 +02:00
Ulf Gebhardt
76f3f7d437
Merge pull request #4301 from Ocelot-Social-Community/invite-button 
feat: 🍰 Invite Button
 2021-03-30 04:46:08 +02:00
dependabot-preview[bot]
e1e0c7a2fb
[Security] Bump y18n from 3.2.1 to 3.2.2 in /webapp 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-29 17:57:11 +00:00
Wolfgang Huß
7f58384e65 Add empty lines 2021-03-29 15:54:57 +02:00
Wolfgang Huß
02fa718fae Remove more-info of post 
- Additionally remove take-action.
 2021-03-29 15:16:05 +02:00
Wolfgang Huß
b266e81727 Add comments to truncate functions 2021-03-29 13:03:59 +02:00
Wolfgang Huß
6f79bba69d Fix truncate via adding 'truncateStr' 
- Because the 'truncate' function uses 'trunc-html' which seem not to function anymore like expected what has to be investigated further.
 2021-03-29 11:27:27 +02:00
dependabot-preview[bot]
177ad28f18
Bump mustache from 4.0.1 to 4.2.0 in /backend 
Bumps [mustache](https://github.com/janl/mustache.js) from 4.0.1 to 4.2.0.
- [Release notes](https://github.com/janl/mustache.js/releases)
- [Changelog](https://github.com/janl/mustache.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janl/mustache.js/compare/v4.0.1...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-29 05:52:17 +00:00
Wolfgang Huß
717f224844 Implement my suggestions 2021-03-24 15:19:28 +01:00
Wolfgang Huß
7d81d3d96d Redesign after Ulf's and Moriz suggestion 2021-03-24 15:07:39 +01:00
Wolfgang Huß
7c794012e2 Design invite button 2021-03-24 11:51:48 +01:00
dependabot-preview[bot]
823b50ee11
Bump v-tooltip from 2.0.3 to 2.1.3 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.3 to 2.1.3.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.3...v2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-23 07:02:27 +00:00
Wolfgang Huß
066505bcdb Fix emails backend tests 2021-03-22 15:36:19 +01:00
Wolfgang Huß
a8cfdf8192 Fix signup component and test 2021-03-22 14:53:14 +01:00
Wolfgang Huß
a5d4dc50a6 Fix enter nonce component test 2021-03-22 14:25:57 +01:00
Wolfgang Huß
1c78f30184 Fix registration page tests 2021-03-22 14:25:34 +01:00
Wolfgang Huß
5b789401bc Refactor signup e-mail link 2021-03-22 14:08:16 +01:00