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

5005 Commits

Author SHA1 Message Date
Wolfgang Huß
ae206e8302 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/linkify-it-3.0.2 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 15:47:26 +02:00
Wolfgang Huß
350648d198 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/websocket-extensions-0.1.4 2021-07-22 15:31:52 +02:00
Wolfgang Huß
05d98bceec Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/v-tooltip-2.1.3 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 15:26:28 +02:00
Wolfgang Huß
6b9e3122da Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/y18n-3.2.2 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 13:43:47 +02:00
Wolfgang Huß
fa688bd7d2 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/v-tooltip-2.1.3 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 11:41:15 +02:00
Wolfgang Huß
365965ea8f Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.0 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 11:38:52 +02:00
Wolfgang Huß
bed20cc667 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/elliptic-6.5.4 
# Conflicts:
#	webapp/package-lock.json
 2021-07-22 10:41:59 +02:00
Wolfgang Huß
3c1a40a593
Merge pull request #4076 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/stack-utils-2.0.3 
Bump stack-utils from 2.0.1 to 2.0.3 in /webapp
 2021-07-21 18:13:16 +02:00
Wolfgang Huß
247d612bbc Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/stack-utils-2.0.3 2021-07-21 16:22:25 +02:00
dependabot[bot]
d1429ca43b
Bump date-fns from 2.12.0 to 2.22.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.12.0 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.12.0...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 11:13:10 +00:00
Wolfgang Huß
2edb45ba4d
Merge pull request #4561 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.5 
Bump cookie-universal-nuxt from 2.1.4 to 2.1.5 in /webapp
 2021-07-21 13:03:27 +02:00
Wolfgang Huß
c491ddf1d8 Overtake @Mogge suggestion for 'DonationInfo.spec.js' 2021-07-21 12:53:30 +02:00
Wolfgang Huß
98982010f7 Fix linting 2021-07-21 11:54:56 +02: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ß
d2f2aeeebc Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/graphql-14.7.0 
# Conflicts:
#	webapp/package-lock.json
 2021-07-21 10:18:53 +02:00
dependabot[bot]
74624cc1c0
Bump cookie-universal-nuxt from 2.1.4 to 2.1.5 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.4...v2.1.5)

---
updated-dependencies:
- dependency-name: cookie-universal-nuxt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-21 04:37:36 +00:00
Wolfgang Huß
5fed1a6e0f Change comments 2021-07-20 16:50:31 +02:00
Wolfgang Huß
e42fe3869e Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4549-landing-page-def-route+have-internal 2021-07-20 16:29:25 +02:00
Wolfgang Huß
00ad0fae0e
Merge pull request #4556 from Ocelot-Social-Community/3673-post-editor-legend--fix-console-warning 
fix: 🍰 Fix Menu Legend Menu Bar Button Without Click Event
 2021-07-20 16:27:52 +02:00
Wolfgang Huß
374a0f1502
Merge pull request #4534 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-promise-4.3.1 
Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /webapp
 2021-07-20 15:24:56 +02:00
Wolfgang Huß
8b46704c71 Fix menu legend menu bar button without click event 2021-07-20 15:10:09 +02:00
Wolfgang Huß
688af4b8c1 Refine comments 2021-07-20 11:49:26 +02:00
Wolfgang Huß
aaecab810c Fix linting 2021-07-20 11:48:55 +02:00
Wolfgang Huß
3b214c9db9 Implement HTML internal support and organization pages 2021-07-20 11:34:01 +02:00
Wolfgang Huß
65450d289d Add dot at line ends of HTML internal pages 2021-07-20 11:04:44 +02:00
Wolfgang Huß
c3a5efcc72 Fix error for not viewing FAQs page without login 2021-07-20 10:14:15 +02:00
Wolfgang Huß
cd6f4d8078 Refined HTML of internal pages 2021-07-19 15:51:26 +02:00
Wolfgang Huß
6632622b4e Implement route of landing page 2021-07-19 15:44:59 +02:00
Wolfgang Huß
e77848abf9
Merge pull request #4492 from Ocelot-Social-Community/3673_post_editor_legend 
feat: 🍰 Post Editor Legend
 2021-07-19 10:52:36 +02:00
Wolfgang Huß
fdf14b2cfd Change minor design and text issues 
- Remove the split line under the last list item.
- Enter spaces.
- Partial swapping of upper and lower case letters.
 2021-07-12 16:48:54 +02:00
Moriz Wahl
5699620c85 suggested solutions 2021-07-12 12:20:08 +02:00
dependabot[bot]
3cda3e563c
Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /webapp 
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-11 16:12:44 +00:00
Blargian
77245dc82e tests failing - try remove added dependency 2021-06-30 14:05:16 +02:00
Blargian
646b7d2af4 fix for failing cypress test @ Report a post from various pages 2021-06-30 13:23:29 +02:00
Blargian
8e66f1e52a sort locales 2021-06-27 12:28:36 +02:00
Blargian
fea734c225 added localization and on hover 2021-06-27 11:58:45 +02:00
Blargian
651e578071 fixed rendering issue 2021-06-24 21:27:35 +02:00
Blargian
7a6b856390 localisation in progress 2021-06-24 21:10:32 +02:00
Wolfgang Huß
7618e18294 Test frontend, next try 2021-06-23 15:30:47 +02:00
Blargian
e493a4d4bd display legend on click 2021-06-22 19:47:16 +02:00
Blargian
906de07f8e Created editor legend component 2021-06-19 17:21:30 +02:00
Wolfgang Huß
5a1eda272b Test frontend, little try 2021-06-16 08:06:56 +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
Blargian
514e7ff411 🚧 added basic legend component 2021-06-09 20:41:41 +02:00
dependabot-preview[bot]
d2b8477ca9
Bump graphql from 14.6.0 to 14.7.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.6.0 to 14.7.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.6.0...v14.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-08 13:17:41 +00:00
Wolfgang Huß
ee4338f3c9 Release v1.0.4 2021-06-08 14:12:14 +02:00
dependabot-preview[bot]
2e7eb6896f
Bump apollo-cache-inmemory from 1.6.5 to 1.6.6 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.5 to 1.6.6.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.5...apollo-cache-inmemory@1.6.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-07 20:14:32 +00:00
Wolfgang Huß
263853f440 Correct short name 2021-06-07 20:01:00 +02:00
Wolfgang Huß
9894abb29a Revert remove of '${DOCKER_WORKDIR}' 2021-06-07 19:03:55 +02:00