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

6896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
804cd07444 v0.1.10 2019-11-13 12:47:02 +01:00
mattwr18
5446785f9e
Merge pull request #2127 from Human-Connection/update-contribution-guidelines 
Update contribution guidelines
 2019-11-13 10:10:07 +01:00
mattwr18
a0fe9cb94c
Merge pull request #2218 from Human-Connection/fix_locations_resolver 
fix: return `null` for missig translations
 2019-11-12 22:38:59 +01:00
mattwr18
25adced793
Merge pull request #2194 from Human-Connection/donation-info 
Add donation status and button
 2019-11-12 21:46:49 +01:00
mattwr18
4ee42e1371 Update time to reflect new earlier start 2019-11-12 21:16:28 +01:00
mattwr18
ecf0e5948b Commit to trigger build 
- prefer variables on one line
 2019-11-12 21:09:02 +01:00
mattwr18
e971aef3e8 Merge branch 'donation-info' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:05:09 +01:00
mattwr18
7ce3e25110 Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:04:54 +01:00
roschaefer
deb4b4f698 fix: return null for missig translations 
A query such as `{ notifications }` would return `null` for Locations
with a missing translation, e.g. `nameRU`. This would not happen for
queries implemented by `neo4j-graphql-js` because they nullify all
missing attributes automatically.
 2019-11-12 19:14:34 +01:00
Alina Beck
1b16dab554 make font size smaller on tiny screens 2019-11-12 19:26:23 +03:00
Alina Beck
63d223e368
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-12 18:52:38 +03:00
Alina Beck
f8b16b35aa change times to german time 2019-11-12 18:12:25 +03:00
mattwr18
797b8338be
Merge pull request #2197 from Human-Connection/2195-define-missing-getters 
Added Empty Definitions For Missing Getters And Mutations
 2019-11-12 15:54:45 +01:00
mattwr18
8b5cd48d3c Translate success message, guard clause for no Donations 2019-11-12 15:33:21 +01:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
mattwr18
444630aeb0
Merge pull request #2209 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.8.0 
build(deps): bump @sentry/node from 5.7.1 to 5.8.0 in /backend
 2019-11-12 14:05:02 +01:00
mattwr18
66fa2c1b2e
Merge pull request #2206 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.3 
build(deps-dev): bump eslint-plugin-jest from 23.0.2 to 23.0.3 in /backend
 2019-11-12 14:04:34 +01:00
mattwr18
10c932308c
Merge pull request #2204 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.15.0 
build(deps-dev): bump vue-svg-loader from 0.14.0 to 0.15.0 in /webapp
 2019-11-12 14:03:49 +01:00
mattwr18
b0dc7ce946
Merge pull request #2203 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.2 
build(deps-dev): bump async-validator from 3.2.1 to 3.2.2 in /webapp
 2019-11-12 14:03:31 +01:00
mattwr18
e19990a58b Fix lint 2019-11-12 13:43:51 +01:00
mattwr18
a215093bc3 Make Donations reactive 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 13:26:30 +01:00
Alina Beck
982a02fc4f query donations data in donation info component 2019-11-12 14:24:46 +03:00
mattwr18
71bcf814db Fix incorrect destructuring, parseInt 
- graphql schema expects an integer
 2019-11-12 12:08:19 +01:00
Alina Beck
6a98e5759f fix lint errors in backend 2019-11-12 13:50:45 +03:00
mattwr18
6305657889
Merge pull request #2216 from Human-Connection/fix-deploy-script 
Update deployment names in deploy script
 2019-11-12 11:40:31 +01:00
Moriz Wahl
d7397f5e46 posts/currentPosts now return empty array 2019-11-12 11:20:56 +01:00
Alexander Friedland
8bb8bb220d
Merge pull request #2193 from Human-Connection/Delete_BlockButton_in_MainPage_PostCard 
Fix: Delete Block Button in MainPage PostCards
 2019-11-12 11:18:42 +01:00
mattwr18
12e2682c50 Update deployment names in deploy script 2019-11-12 10:46:40 +01:00
Alina Beck
bdeb208556 pre-fill donation input fields with data from query 2019-11-12 12:45:59 +03:00
mattwr18
cbab34e83c Update test with mock $18n.locale 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 10:35:02 +01:00
mattwr18
311f2fc912 Create Donations node in seeds 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 10:20:21 +01:00
mattwr18
3c9ba12aaa
Merge pull request #2199 from Human-Connection/fix-deploy-script 
Update doctl to use default context
 2019-11-12 08:29:37 +01:00
dependabot-preview[bot]
be7a907a9e
build(deps): bump @sentry/node from 5.7.1 to 5.8.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.7.1 to 5.8.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.7.1...5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:25:16 +00:00
dependabot-preview[bot]
f8490ca006
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 to 23.0.3.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.2...v23.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:23:49 +00:00
dependabot-preview[bot]
f79aa2c185
build(deps-dev): bump vue-svg-loader from 0.14.0 to 0.15.0 in /webapp 
Bumps [vue-svg-loader](https://github.com/visualfanatic/vue-svg-loader) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/visualfanatic/vue-svg-loader/releases)
- [Commits](https://github.com/visualfanatic/vue-svg-loader/compare/0.14.0...0.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:22:57 +00:00
dependabot-preview[bot]
05566cf6b8
build(deps-dev): bump async-validator from 3.2.1 to 3.2.2 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:22:19 +00:00
mattwr18
ad01c9925f
Merge pull request #2201 from Human-Connection/2161-fix 
console.error in Hashtag.spec.js #2161
 2019-11-12 00:56:45 +01:00
mattwr18
d360acd7f9
Merge pull request #2186 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.6 
build(deps-dev): bump @storybook/addon-actions from 5.2.5 to 5.2.6 in /webapp
 2019-11-12 00:40:43 +01:00
Mo Zargham
34fb529147 console.error in Hashtag.spec.js #2161 2019-11-11 18:15:26 -05:00
mattwr18
a4386c17cf Update doctl to use default context 
- access token is ignored if any other context is passed in
 2019-11-11 22:45:05 +01:00
Moriz Wahl
163825e562 Added Empty Definitions For Missing Getters And Mutations 2019-11-11 21:20:53 +01:00
dependabot-preview[bot]
44defc57eb
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.6/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 19:41:16 +00:00
mattwr18
ce5d67235c
Merge pull request #2188 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.2 
build(deps-dev): bump style-resources-loader from 1.2.1 to 1.3.2 in /webapp
 2019-11-11 20:39:20 +01:00
mattwr18
9c21d8978a
Merge pull request #2183 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.6 
build(deps-dev): bump @storybook/vue from 5.2.5 to 5.2.6 in /webapp
 2019-11-11 20:38:53 +01:00
mattwr18
48ae541330
Merge pull request #2176 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.6 
build(deps-dev): bump @storybook/addon-a11y from 5.2.5 to 5.2.6 in /webapp
 2019-11-11 20:38:34 +01:00
mattwr18
6f498a621c
Merge pull request #2173 from Human-Connection/dependabot/npm_and_yarn/cypress-3.6.1 
build(deps-dev): bump cypress from 3.6.0 to 3.6.1
 2019-11-11 20:37:42 +01:00
mattwr18
d036a57414
Merge pull request #2164 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.7.0 
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /webapp
 2019-11-11 20:36:30 +01:00
mattwr18
3df8a77604
Merge pull request #2191 from Human-Connection/update-docs 
Update docs for deploying new server, env variables
 2019-11-11 19:24:49 +01:00
mattwr18
ce3867a717
Merge pull request #2192 from Human-Connection/fix-invalid-json 
Remove unintended comma
 2019-11-11 19:21:37 +01:00
mattwr18
f51ad1131b UpdateDonations from admin/donations 
@alina-beck I'm not 100% satisfied with this at the moment. I think that
the admin could have the goal and progress initialized from a query for
the Donations, and be able to update if one of them changed... what do
you think?
 2019-11-11 19:16:07 +01:00