2193 Commits

Author SHA1 Message Date
Wolfgang Huß
850f3c15ac Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu
# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/components/DonationInfo/DonationInfo.vue
#	webapp/pages/index.vue
2021-09-16 11:30:05 +02:00
Wolfgang Huß
73ca174e6e Change name of emailMiddleware to loginMiddleware 2021-09-15 13:18:54 +02:00
Wolfgang Huß
05c171d9fa Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4326-send-notification-email 2021-09-15 13:01:29 +02:00
Wolfgang Huß
5e56473b0e Add note 2021-08-12 07:27:12 +02:00
Wolfgang Huß
f3bf730a12 Refine translated e-mail templates 2021-08-11 14:46:59 +02:00
Wolfgang Huß
7e72a0bf03 Implement sending of first translated templates 2021-08-11 10:29:19 +02:00
Wolfgang Huß
0c8287ab03 Delete test Cypher statement 2021-08-11 07:50:29 +02:00
Wolfgang Huß
5dfa6913c3 Refactor 'sendMail' to a general helper 2021-08-11 07:48:49 +02:00
Wolfgang Huß
5fe07c1133 Implement e-mail notification, first step 2021-08-10 16:13:51 +02:00
Wolfgang Huß
f20643af3b Investigate the graph-ql middleware 2021-08-10 10:56:12 +02:00
Wolfgang Huß
aa454893ce Refactor pageParams, third step
- Implement emails.js in backend as well.
- Move backend links.js into emails.js, because code is not a duplicate of webapp anymore.
2021-08-05 14:44:54 +02:00
Wolfgang Huß
0b1bdc495f Implement configuration of internal pages 2021-07-29 16:54:20 +02:00
Wolfgang Huß
8085c4188e
Merge pull request #4565 from Ocelot-Social-Community/4543-quick-fix-refactor-backend-tests
fix: 🍰 Quick Fix For backend Tests
2021-07-28 10:44:18 +02:00
Wolfgang Huß
0154d3d4c4
Merge pull request #4555 from Ocelot-Social-Community/4549-landing-page-def-route+have-internal
🍰 feat: Landing Page etc.
2021-07-26 20:58:32 +02:00
Wolfgang Huß
62de9a158e Fix as quick fix for all reminding tests 2021-07-26 11:36:42 +02:00
Wolfgang Huß
f60ddda230 Fix as quick fix for first backend tests 2021-07-22 13:34:49 +02:00
Wolfgang Huß
629a8da241 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu
# Conflicts:
#	backend/src/schema/resolvers/donations.spec.js
2021-07-21 11:22:34 +02:00
Wolfgang Huß
7620d9b4da Fix linting to this new prettier 2021-07-20 18:30:43 +02:00
Wolfgang Huß
5fed1a6e0f Change comments 2021-07-20 16:50:31 +02:00
Wolfgang Huß
69fdd94be4 Fix linting 2021-07-20 16:44:44 +02:00
Wolfgang Huß
688af4b8c1 Refine comments 2021-07-20 11:49:26 +02:00
Wolfgang Huß
3b214c9db9 Implement HTML internal support and organization pages 2021-07-20 11:34:01 +02:00
Wolfgang Huß
6632622b4e Implement route of landing page 2021-07-19 15:44:59 +02:00
Wolfgang Huß
af5e255aad Fix several problems with admins setting of donations info
- Use 'toString' to care for setting the values of the donation progress bar.
2021-06-15 13:55:08 +02:00
Wolfgang Huß
621b3f5e8d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 2021-06-14 15:16:00 +02:00
6819c8e5dd
wrong default value 2021-06-08 12:23:33 +02:00
7da0ba1f51
fixed wrong env variable 2021-06-08 11:50:34 +02:00
Wolfgang Huß
d7b888f7b2 Extend and change links 2021-06-02 20:10:30 +02:00
Wolfgang Huß
ff6cc306af Refactor logos, first step 2021-05-18 17:04:48 +02:00
Wolfgang Huß
da951c6fb6 Clean up 2021-05-06 16:37:31 +02:00
Wolfgang Huß
59dfb4662e Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 2021-05-06 16:04:09 +02:00
Wolfgang Huß
924f34be5f Migrate database by adding the donation info as node 2021-05-06 16:03:16 +02:00
Wolfgang Huß
548df0a753 Fix tests 2021-05-06 16:02:42 +02:00
Wolfgang Huß
d40dd94868 Implement showDonations in the database
- Add to backend tests.
2021-04-15 10:51:01 +02:00
cba299827d
lint fixes backend 2021-04-12 13:24:52 +02:00
99e75066f9
fixed backend unit tests 2021-04-12 13:24:52 +02:00
3edf5c56e4
Admin.TagOverview.feature
backend lint fixes
2021-04-12 13:24:52 +02:00
d29cff193c
Notification.Mention.feature
Regex for URL matches "I am on page ..."
Fixed some category/search related errors
2021-04-12 13:24:51 +02:00
Wolfgang Huß
60695cd82b Refactor e-mail templates 2021-04-07 09:15:45 +02:00
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
3d67ccb7e1
Merge pull request #4330 from Ocelot-Social-Community/jwt_expiretime
jwt_expiretime
2021-04-04 18:30:29 +02:00
f6c070a3cb
removed config warning
cleaned up test.yml workflow
try to run without .env files
2021-04-03 04:23:31 +02:00
a8b0699ebb
make jwt expire time configurable like in the frontend 2021-04-01 02:32:30 +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
Wolfgang Huß
066505bcdb Fix emails backend tests 2021-03-22 15:36:19 +01:00
Wolfgang Huß
5b789401bc Refactor signup e-mail link 2021-03-22 14:08:16 +01:00
Wolfgang Huß
4c8fb83dcd Refactor use of .env variables after Moriz suggestions 2021-03-19 13:23:15 +01:00