ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 11:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,996 Commits 104 Branches 1,559 Tags
Commit Graph

4030 Commits

Author SHA1 Message Date
sushidave
3aeb7daad7
Update data-privacy.html 
Code streamlined
 2022-01-31 22:51:54 +01:00
sushidave
478540ac2f
Update data-privacy.html 
Last changes of 1st version as discussed today with @Tirokk
 2022-01-31 22:43:08 +01:00
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ß
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ß
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ß
e58b452a7d Write Cypress tests 2021-09-27 12:15:18 +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ß
9515217567 Correct comment 2021-09-21 21:41:20 +02:00
Wolfgang Huß
ea521263a5 Follow Ulfs review suggestions 2021-09-21 14:09:51 +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ß
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ß
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ß
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ß
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ß
e15a071991 Fulfill the suggestions of Ulf 2021-08-10 18:48:02 +02:00
Wolfgang Huß
531f7316fa Change hint to 'page-params-link' on maintenance page 2021-08-09 14:26:10 +02:00
Wolfgang Huß
b37c05ef14 Add hint to 'page-params-link' on maintenance page 2021-08-09 14:19:04 +02:00
Wolfgang Huß
2ec692b0e8 Add empty line at end of all 'webapp/locales/html/*/organization.html' 2021-08-09 14:10:32 +02:00