ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,992 Commits 117 Branches 1,511 Tags
Commit Graph

4006 Commits

Author SHA1 Message Date
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
Wolfgang Huß
d4012ee3ca Fix error 'window is undefined' that may appear 
- Avoid possible errors, because of 'window' is only defined on browser side but not in NodeJS on client side. Check for 'typeof window' is neccessary, because if it's not defined at all you can't check for 'window !== undefined' without the same error 'window is undefined'.
 2021-08-09 14:02:48 +02:00
Wolfgang Huß
0ec33fe3a3 Try to implement the logo on maintenance page, uncommented and hints 2021-08-09 11:58:10 +02:00
Wolfgang Huß
edcde1f08d Get maintenance page to work 2021-08-09 11:04:00 +02:00
Wolfgang Huß
41252785d2 Fix tests 2021-08-05 17:57:48 +02:00
Wolfgang Huß
e3ea3e1733 Fix error 'window is undefined' that appears sometimes 
- Avoid possible errors, because of 'window' is only defined on browser side but not in NodeJS on client side. Check for 'typeof window' is neccessary, because if it's not defined at all you can't check for 'window !== undefined' without the same error 'window is undefined'.
 2021-08-05 16:54:20 +02:00
Wolfgang Huß
4fccb6e788 Remove tryout data 2021-08-05 16:32:00 +02:00
Wolfgang Huß
37cb8a2afb Fix linting 2021-08-05 16:24:50 +02:00
Wolfgang Huß
b848aeb579 Fix tests by using toBeTruthy() instead of toBe(true) 2021-08-05 16:23:31 +02:00
Wolfgang Huß
b7018ffefb Implement mixins in internal pages 2021-08-05 16:05:55 +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ß
e8a0a5d13c Refactor pageParams, second step 2021-08-03 20:07:39 +02:00
Wolfgang Huß
97fdb7cd5c Refactor pageParams 2021-08-03 15:30:58 +02:00
Wolfgang Huß
a3d3656bf1 Implement login-button 2021-08-02 16:17:35 +02:00
Wolfgang Huß
df1e622094 Implement internal page component, first step 2021-08-02 13:48:57 +02:00
Wolfgang Huß
59dd7ba104 Implement configuration of footer link list 2021-07-29 16:54:52 +02:00
Wolfgang Huß
0b1bdc495f Implement configuration of internal pages 2021-07-29 16:54:20 +02:00
Wolfgang Huß
0bdedfc5bc Create sender.fm internal organization page 2021-07-28 15:15:59 +02:00
dependabot[bot]
5ffa2f0275
Bump eslint-plugin-prettier from 3.1.4 to 3.4.0 in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.4 to 3.4.0.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-28 10:12:12 +00:00
dependabot[bot]
4718908123
Bump vue-scrollto from 2.17.1 to 2.20.0 in /webapp 
Bumps [vue-scrollto](https://github.com/rigor789/vue-scrollto) from 2.17.1 to 2.20.0.
- [Release notes](https://github.com/rigor789/vue-scrollto/releases)
- [Commits](https://github.com/rigor789/vue-scrollto/compare/v2.17.1...v2.20.0)

---
updated-dependencies:
- dependency-name: vue-scrollto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-28 04:31:09 +00:00
Wolfgang Huß
cbc6f73893
Merge pull request #4299 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/node-notifier-8.0.2 
[Security] Bump node-notifier from 6.0.0 to 8.0.2 in /webapp
 2021-07-27 12:17:31 +02:00
Wolfgang Huß
06480df1eb
Merge pull request #4570 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-6.3.6 
Bump @storybook/addon-a11y from 5.3.21 to 6.3.6 in /webapp
 2021-07-27 12:16:42 +02:00
Wolfgang Huß
c7e4e6d2b2 Remove superfluous package-lock.json 2021-07-27 11:19:06 +02:00
Wolfgang Huß
74dbad7f19 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/node-notifier-8.0.2 
# Conflicts:
#	webapp/package-lock.json
 2021-07-27 10:40:01 +02:00
Wolfgang Huß
9932796d23 Delete superfluous and always conflicting file package-lock.json 2021-07-27 10:39:13 +02:00