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
11,165 Commits 5 Branches 2 Tags
Commit Graph

11165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
e58b452a7d Write Cypress tests 2021-09-27 12:15:18 +02:00
Wolfgang Huß
d5468e5123 Add db mutation for adding sendNotificationEmails property to each user 2021-09-23 15:03:11 +02:00
Wolfgang Huß
550a06e6fa Add text and link to the e-mail content to change e-mail notification settings 2021-09-23 14:41:39 +02:00
Wolfgang Huß
a87cc524a6 Translate e-mail subject 2021-09-23 14:04:58 +02:00
Wolfgang Huß
d8b23d9df2 Fix locales sorting 2021-09-22 14:11:03 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
bd10149e05 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4326-send-notification-email 2021-09-22 11:41:44 +02:00
Wolfgang Huß
3920d4441f
Merge pull request #4357 from Ocelot-Social-Community/4265-move-sort-newsfeed-menu-into-filter-menu 
feat: 🍰 Implement Progress Bar Again
 2021-09-22 11:08:22 +02:00
Wolfgang Huß
9515217567 Correct comment 2021-09-21 21:41:20 +02:00
Wolfgang Huß
1f775050b1 Fix CUR_JOB to start with Zero 2021-09-21 20:07:51 +02:00
Wolfgang Huß
1eb57ecd3b Revert fullstack tests parallel jobs 2021-09-21 19:32:00 +02:00
Wolfgang Huß
4f0e33524f Refactor parallel-features.sh to a general solution 2021-09-21 19:13:47 +02:00
Wolfgang Huß
ea521263a5 Follow Ulfs review suggestions 2021-09-21 14:09:51 +02:00
Wolfgang Huß
8295ec5827 Change donations db migration from CREATE to MERGE to work in all circumstances 2021-09-20 11:05:41 +02:00
Wolfgang Huß
66eaf1a478 Fix Cypress parallel jobs error for the additional job 2021-09-17 10:45:06 +02:00
Wolfgang Huß
5ee5dc05ab Reduce backends min_coverage, because of testing problems 2021-09-16 15:08:51 +02:00
Wolfgang Huß
af8b7ba367 Fix backend test 2021-09-16 13:59:58 +02:00
Wolfgang Huß
ec9c35a7c4 Fix tests in DonationInfo.spec.js 2021-09-16 11:36:44 +02:00
Wolfgang Huß
df7e8ed3bb Cleanup 2021-09-16 11:30:37 +02:00
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ß
915e1143c7 Implement cypress tests 2021-09-16 10:52:36 +02:00
Wolfgang Huß
1c74234b9a Remove HV 2021-09-16 10:51:38 +02:00
Wolfgang Huß
df3d3812cc Cleanup donations.spec.js 2021-09-16 10:51:21 +02:00
Wolfgang Huß
34554f1539 Refine and cleanup test 'webapp/pages/admin/donations.spec.js' 2021-09-15 14:22:26 +02:00
Wolfgang Huß
8251877bd9 Merge branch '4265-move-sort-newsfeed-menu-into-filter-menu-moriz' 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/pages/admin/donations.spec.js
 2021-09-15 13:53:10 +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ß
56268bb7d4
Merge pull request #4531 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/nodemailer-html-to-text-3.2.0 
Bump nodemailer-html-to-text from 3.1.0 to 3.2.0 in /backend
 2021-09-15 10:55:25 +02:00
Wolfgang Huß
8e321fb9b3 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/nodemailer-html-to-text-3.2.0 2021-09-14 12:34:55 +02:00
Wolfgang Huß
4bee0ec8e1
Merge pull request #4401 from Ocelot-Social-Community/dependabot/npm_and_yarn/codecov-3.8.2 
Bump codecov from 3.7.1 to 3.8.2
 2021-09-14 12:12:08 +02:00
Wolfgang Huß
131efa9536 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/codecov-3.8.2 
# Conflicts:
#	yarn.lock
 2021-09-14 08:55:32 +02:00
Somesh Ranjan
8e35faa701
Merge pull request #4660 from Ocelot-Social-Community/4641-fixcentred-login-form 
Centered the login-form
 2021-09-13 18:48:58 +05:30
Wolfgang Huß
198d24ecb1 Fix test pages/registration.spec.js 2021-09-13 09:33:22 +02:00
Wolfgang Huß
e9189a3c58 Fix linting 2021-09-12 08:28:56 +02:00
somesh202
fa6d3bb95d centered-login-form 2021-09-11 11:30:30 +05:30
Wolfgang Huß
866f1154a7
Merge pull request #4654 from Ocelot-Social-Community/update_readme 
Spelling Change
 2021-09-05 19:25:09 +02:00
AayushSaini101
eb44525381 SpellingChange 2021-09-05 21:28:37 +05:30
Wolfgang Huß
8877776506
Merge pull request #4629 from Ocelot-Social-Community/release-v1.0.5 
chore: 💥 Release v1.0.5
 2021-08-12 10:41:33 +02:00
Wolfgang Huß
5e56473b0e Add note 2021-08-12 07:27:12 +02:00
Wolfgang Huß
ea8a4be283 release-v1.0.5 2021-08-11 15:03:23 +02:00
Wolfgang Huß
5ffbad9c15
Merge pull request #4599 from Ocelot-Social-Community/4595-refactor-landing-and-other-internal-pages 
feat: 🍰 Landing Page And Other Internal Pages
 2021-08-11 14:57:45 +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ß
33280d094a
Merge pull request #4577 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.4.0 
Bump eslint-plugin-prettier from 3.1.4 to 3.4.0 in /webapp
 2021-08-11 08:54:33 +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ß
dfb7731f68 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4326-send-notification-email 2021-08-11 06:39:18 +02:00
Wolfgang Huß
9d85b5dac2 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.4.0 2021-08-11 06:32:54 +02:00
Wolfgang Huß
49c70c1183
Merge pull request #4592 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/vue-scrollto-2.20.0 
Bump vue-scrollto from 2.17.1 to 2.20.0 in /webapp
 2021-08-11 06:30:58 +02:00
Wolfgang Huß
e15a071991 Fulfill the suggestions of Ulf 2021-08-10 18:48:02 +02:00