ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 09:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,994 Commits 101 Branches 1,536 Tags
Commit Graph

10994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sushidave
c1298dd06f
Update data-privacy.html 
Paragraph about changes of the privacy policy added.
 2022-01-13 21:40:03 +01:00
sushidave
3189a97abc
Update data-privacy.html 
Small corrections
 2022-01-13 20:34:49 +01:00
sushidave
d95eeedef9
Update data-privacy.html 
As discussed today with my fellows.
 2022-01-13 20:13:28 +01:00
sushidave
635908d765
Update data-privacy.html 
As discussed today with Andreas.
 2021-12-21 19:16:55 +01:00
sushidave
8367486490
Update data-privacy.html 
As discussed this week with Andreas
 2021-12-16 18:07:52 +01:00
sushidave
3c465d958a
Update data-privacy.html 
As per today's discussion with Andreas.
 2021-12-02 17:22:55 +01:00
sushidave
6491965235
Update data-privacy.html 
As discussed yesterday with Andreas.
 2021-12-01 13:46:13 +01:00
sushidave
bfabb0bad7
Update data-privacy.html 
As per yesterday's review with Andreas.
 2021-11-26 10:44:56 +01:00
sushidave
be66036301
Update data-privacy.html 
As discussed yesterday with Andreas
 2021-11-17 10:05:43 +01:00
sushidave
017f4c5523
Update data-privacy.html 
As discussed today
 2021-11-11 19:01:19 +01:00
sushidave
d5fc84d300
Update data-privacy.html 
Changes as discussed today
 2021-11-09 18:14:52 +01:00
Wolfgang Huß
6912431775 Refaktor text 2021-11-08 16:28:51 +01:00
Wolfgang Huß
ffe68682b0 Refaktor data-privacy and imprint 2021-11-02 17:08:20 +01:00
Wolfgang Huß
de479880d7 Fix imprint link 2021-10-18 16:40:02 +02:00
Wolfgang Huß
1dbd4627dd Enter linebreak after each english text 2021-10-18 08:37:54 +02:00
Wolfgang Huß
9a67e4399e Refactor CSS on internal pages after Davids suggestions 2021-10-18 08:26:20 +02:00
Wolfgang Huß
78a44971d6 Refactor CSS on internal pages 2021-10-14 13:06:37 +02:00
Wolfgang Huß
f9f355e8b7 Finish data-privacy.html 2021-10-14 11:04:29 +02:00
Wolfgang Huß
62ee5d4e62 Refine info pages 2021-10-12 09:16:02 +02:00
Wolfgang Huß
b180537be2 Implement info pages, first step 2021-10-12 08:18:24 +02:00
Wolfgang Huß
869f856897 Set basic data for the tryout 2021-10-11 14:07:15 +02:00
Wolfgang Huß
d7484716ee Set basic data for the tryout 2021-10-11 13:57:03 +02:00
Wolfgang Huß
a41846b3a5
Merge pull request #4690 from Ocelot-Social-Community/4689-set-sendNotificationEmails-init-admin 
chore: 🍰 Set 'sendNotification' Emails Init Admin
b1.0.6-160 1.0.6 		2021-10-04 12:21:59 +02:00
Wolfgang Huß
ee0feab744 Fix linting 2021-09-29 11:50:57 +02:00
Wolfgang Huß
dc719bc1fb Release v1.0.6 2021-09-29 10:52:52 +02:00
Wolfgang Huß
327628320a Add maintenance 'package.json' to 'yarn release' script 2021-09-29 10:51:39 +02:00
Wolfgang Huß
49e4111def Fix to set 'sendNotificationEmails' on admin of db init 
- Set other missing properties on admin of db init.
- Additionally set default donations `progress` value to `7000` to have a better looking design on the news feed for devs and testers.
- Fix test in `pages/admin/donations.spec.js`.
 2021-09-29 10:32:51 +02:00
Wolfgang Huß
df4a5b7390
Merge pull request #4623 from Ocelot-Social-Community/4326-send-notification-email 
feat: 🍰 Send Notification E-Mail
b1.0.5-159 		2021-09-29 08:31:39 +02:00
Wolfgang Huß
a836872471 Cleanup 2021-09-27 12:36:58 +02:00
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
b1.0.5-158 		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