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,942 Commits 117 Branches 1,511 Tags
Commit Graph

3113 Commits

Author SHA1 Message Date
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ß
af8b7ba367 Fix backend test 2021-09-16 13:59:58 +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ß
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ß
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ß
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
dependabot[bot]
d12f841dd5
Bump metascraper-description from 5.11.6 to 5.23.1 in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-description) from 5.11.6 to 5.23.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-description/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.23.1/packages/metascraper-description)

---
updated-dependencies:
- dependency-name: metascraper-description
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-29 06:17:42 +00:00
Wolfgang Huß
b9835e9adf
Merge pull request #4587 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-lang-5.23.1 
Bump metascraper-lang from 5.11.8 to 5.23.1 in /backend
 2021-07-29 08:14:14 +02:00
Wolfgang Huß
a95262e4c3
Merge pull request #4591 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/eslint-plugin-promise-4.3.1 
Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /backend
 2021-07-28 12:04:22 +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
dependabot[bot]
b96e469b19
Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /backend 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.2.1 to 4.3.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/compare/v4.2.1...v4.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-28 04:28:52 +00:00
Wolfgang Huß
69fdd37a66
Merge pull request #4583 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.15.0 
Bump eslint-config-prettier from 6.10.1 to 6.15.0 in /backend
 2021-07-27 18:53:01 +02:00
dependabot[bot]
dd4ea93c4a
Bump metascraper-lang from 5.11.8 to 5.23.1 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-lang) from 5.11.8 to 5.23.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-lang/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.23.1/packages/metascraper-lang)

---
updated-dependencies:
- dependency-name: metascraper-lang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 14:52:56 +00:00
Wolfgang Huß
756f368045
Merge pull request #4584 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/subscriptions-transport-ws-0.9.19 
Bump subscriptions-transport-ws from 0.9.16 to 0.9.19 in /backend
 2021-07-27 16:40:58 +02:00
Wolfgang Huß
0627ef4db8
Merge pull request #4579 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-youtube-5.23.0 
Bump metascraper-youtube from 5.11.8 to 5.23.0 in /backend
 2021-07-27 15:28:37 +02:00
dependabot[bot]
17d23d39cd
Bump eslint-config-prettier from 6.10.1 to 6.15.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.10.1 to 6.15.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.10.1...v6.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 10:24:25 +00:00
dependabot[bot]
76d40adfe8
Bump subscriptions-transport-ws from 0.9.16 to 0.9.19 in /backend 
Bumps [subscriptions-transport-ws](https://github.com/apollostack/subscriptions-transport-ws) from 0.9.16 to 0.9.19.
- [Release notes](https://github.com/apollostack/subscriptions-transport-ws/releases)
- [Changelog](https://github.com/apollographql/subscriptions-transport-ws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollostack/subscriptions-transport-ws/commits)

---
updated-dependencies:
- dependency-name: subscriptions-transport-ws
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 10:23:43 +00:00
dependabot[bot]
4c84b30c8d
Bump metascraper-youtube from 5.11.8 to 5.23.0 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-youtube) from 5.11.8 to 5.23.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-youtube/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.23.0/packages/metascraper-youtube)

---
updated-dependencies:
- dependency-name: metascraper-youtube
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:33:23 +00:00
dependabot[bot]
3094a888f8
Bump metascraper-publisher from 5.11.8 to 5.23.0 in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-publisher) from 5.11.8 to 5.23.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-publisher/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.23.0/packages/metascraper-publisher)

---
updated-dependencies:
- dependency-name: metascraper-publisher
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:33:09 +00:00
Wolfgang Huß
6554add691
Merge pull request #4576 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.23.0 
Bump metascraper-soundcloud from 5.11.8 to 5.23.0 in /backend
 2021-07-27 11:29:12 +02:00
Wolfgang Huß
bfdaa02c71
Merge pull request #4522 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/cross-env-7.0.3 
Bump cross-env from 7.0.2 to 7.0.3 in /backend
 2021-07-27 11:26:00 +02:00
dependabot[bot]
51ce357118
Bump nodemailer-html-to-text from 3.1.0 to 3.2.0 in /backend 
Bumps [nodemailer-html-to-text](https://github.com/andris9/nodemailer-html-to-text) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/andris9/nodemailer-html-to-text/releases)
- [Changelog](https://github.com/andris9/nodemailer-html-to-text/blob/master/CHANGELOG.md)
- [Commits](https://github.com/andris9/nodemailer-html-to-text/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: nodemailer-html-to-text
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 08:32:34 +00:00
Wolfgang Huß
e371a256ff
Merge pull request #4444 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/browserslist-4.16.6 
[Security] Bump browserslist from 4.9.1 to 4.16.6 in /backend
 2021-07-27 10:29:35 +02:00
dependabot[bot]
bd2af6b603
Bump metascraper-soundcloud from 5.11.8 to 5.23.0 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-soundcloud) from 5.11.8 to 5.23.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-soundcloud/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.23.0/packages/metascraper-soundcloud)

---
updated-dependencies:
- dependency-name: metascraper-soundcloud
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 04:28:49 +00: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ß
28457c1407 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/browserslist-4.16.6 2021-07-26 17:20:28 +02:00
dependabot[bot]
e81e2b373e
Bump cross-env from 7.0.2 to 7.0.3 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-26 14:17:34 +00:00
Wolfgang Huß
62de9a158e Fix as quick fix for all reminding tests 2021-07-26 11:36:42 +02:00
Wolfgang Huß
c498cbc299 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4543-quick-fix-refactor-backend-tests 2021-07-26 09:50:26 +02:00
Wolfgang Huß
319f89b4df Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/y18n-4.0.3 2021-07-24 10:46:51 +02:00
Wolfgang Huß
2e9d5eae09 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/yargs-parser-18.1.3 2021-07-22 13:47:13 +02:00
Wolfgang Huß
f60ddda230 Fix as quick fix for first backend tests 2021-07-22 13:34:49 +02:00
Wolfgang Huß
30f5d3107f Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/mustache-4.2.0 2021-07-22 11:45:11 +02:00
dependabot[bot]
d955d96a9a
Bump date-fns from 2.11.1 to 2.22.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.22.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.11.1...v2.22.1)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-21 16:20:48 +00: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ß
deb0bc39e7
Merge pull request #4530 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/prettier-2.3.2 
Bump prettier from 2.2.0 to 2.3.2 in /backend
 2021-07-20 22:41:52 +02:00
Wolfgang Huß
c33ad2ff87 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.8 2021-07-20 19:34:58 +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
dependabot[bot]
8a3acf10cd
Bump prettier from 2.2.0 to 2.3.2 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.0...2.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 13:34:03 +00: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
Wolfgang Huß
ee4338f3c9 Release v1.0.4 2021-06-08 14:12:14 +02:00
Ulf Gebhardt
6819c8e5dd
wrong default value 2021-06-08 12:23:33 +02:00