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

7172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
7d95809f6e Update test to ensure currency is shown by locale 2019-11-11 19:15:39 +01:00
mattwr18
afb443ac0d Update resolver to match one Donations node 
- there should only ever be one Donations node to start off with, if
that changes in the future for some reason, then we'd need to look into
changing the match to something that makes more sense.
 2019-11-11 19:14:06 +01:00
mattwr18
835a098731 Set up backend for DonationsInfo 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 18:14:33 +01:00
Alina Beck
ffb3ff896e add tests for DonationInfo component (wip) 2019-11-11 17:36:04 +03:00
mattwr18
46ed623cfa
Merge pull request #2111 from Human-Connection/russian-locales 
added Russian to locales
 2019-11-11 14:38:00 +01:00
dependabot-preview[bot]
202de180a2
build(deps-dev): bump style-resources-loader in /webapp 
Bumps [style-resources-loader](https://github.com/yenshih/style-resources-loader) from 1.2.1 to 1.3.2.
- [Release notes](https://github.com/yenshih/style-resources-loader/releases)
- [Changelog](https://github.com/yenshih/style-resources-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yenshih/style-resources-loader/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 13:32:48 +00:00
dependabot-preview[bot]
64ff54729e
build(deps-dev): bump @storybook/vue from 5.2.5 to 5.2.6 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) 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/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 13:32:46 +00:00
dependabot-preview[bot]
b8e428bf29
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) 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/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 13:32:26 +00:00
mattwr18
36722962e0
Merge pull request #1975 from Human-Connection/1974-notifications-page 
Add notifications page with All Notifications
 2019-11-11 14:29:40 +01:00
Alina Beck
61cb7dd7c2 add ProgressBar tests 2019-11-11 16:28:39 +03:00
Alina Beck
d15a1a8105 style donations info for mobile 2019-11-11 15:57:29 +03:00
Alina Beck
2cd7ee9ac6 add donations info page to admin pages 2019-11-11 15:07:26 +03:00
ogerly
47720e3ce0 Fix: Delete Block Button 2019-11-11 12:16:11 +01:00
mattwr18
bf87291879 Remove unintended comma 2019-11-11 11:55:18 +01:00
mattwr18
52bdfa7c48
Merge pull request #2073 from Human-Connection/Laod_saved_Laguage_and_select 
1931 - after successful login the saved language of the user is set
 2019-11-11 11:43:12 +01:00
mattwr18
b2367e9d97 Revert unintended changes to .travis.yml 2019-11-11 11:16:36 +01:00
mattwr18
d105739c0b Update docs for deploying new server, env variables 2019-11-11 11:10:02 +01:00
Alina Beck
f6de44b337 place donation info in separate component 
compute title and label according to selected locale and donation values
 2019-11-11 13:09:51 +03:00
Alina Beck
768f5f6631 extract progress bar into separate component 2019-11-11 12:31:10 +03:00
Alina Beck
88436c3cf7 add donation info with hardcoded values 2019-11-11 12:05:09 +03:00
dependabot-preview[bot]
98a60168c1
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.6.0 to 2.7.0.
- [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.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 07:58:17 +00:00
dependabot-preview[bot]
ab762c9b51
build(deps-dev): bump cypress from 3.6.0 to 3.6.1 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 07:57:14 +00:00
mattwr18
1a685732ce
Merge pull request #2167 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.5.0 
build(deps-dev): bump cypress-file-upload from 3.4.0 to 3.5.0
 2019-11-11 08:55:58 +01:00
mattwr18
6dfcd44cfa
Merge pull request #2166 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.7.0 
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /backend
 2019-11-11 08:55:36 +01:00
mattwr18
47a3a7faeb
Merge pull request #2165 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.7.0 
build(deps-dev): bump date-fns from 2.6.0 to 2.7.0
 2019-11-11 08:55:20 +01:00
mattwr18
e1cee39aab
Merge pull request #2156 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.0 
build(deps-dev): bump eslint-plugin-vue from 5.2.3 to 6.0.0 in /webapp
 2019-11-11 08:54:39 +01:00
mattwr18
210ac3d119
Merge pull request #2155 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.3 
build(deps): bump merge-graphql-schemas from 1.7.2 to 1.7.3 in /backend
 2019-11-11 08:54:01 +01:00
mattwr18
ba63512b57
Merge pull request #2154 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.2 
build(deps-dev): bump @babel/core from 7.6.4 to 7.7.2 in /backend
 2019-11-11 08:53:46 +01:00
mattwr18
f650c5cc05 Make createdAt/updatedAt non-nullable for NOTIFIED 
- Follow @Tirokk PR review suggestion
 2019-11-11 08:52:51 +01:00
mattwr18
288787bcb9 Remove deprecated slot syntax 
- Update slot to use syntax supported after Vue 2.6
 2019-11-11 08:52:51 +01:00
mattwr18
57b0a339c6 Avoid negative margins/targeting tags 
- follow @alina-beck's PR suggestions
 2019-11-11 08:52:51 +01:00
mattwr18
f2e2c78582 Add tests for notifications index page 2019-11-11 08:52:51 +01:00
mattwr18
64e2a2a7c2 Add story for Paginate component 2019-11-11 08:52:51 +01:00
mattwr18
7d0b9861b8 Add story for AvatarMenu 2019-11-11 08:52:51 +01:00
mattwr18
49f73976b7 Fix DropdownFilter story after refactor 
- it was refactored to make reuse easier
 2019-11-11 08:52:04 +01:00
mattwr18
d56c81dc3d Add test for NotificationsTable and refactor 2019-11-11 08:52:04 +01:00
mattwr18
09e4c20bb8 Update test to findIndex instead of hard coding 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 08:52:04 +01:00
mattwr18
b7e39ca3db Add test for DropdownComponent 2019-11-11 08:52:04 +01:00
mattwr18
088d4a8ae5 Use verbose variables 2019-11-11 08:52:04 +01:00
mattwr18
ddb9fcdcb7 Make dropdown filter reusable 2019-11-11 08:52:04 +01:00
mattwr18
780a418254 Fix lint 2019-11-11 08:52:04 +01:00
roschaefer
25c9b9585b Translate dropdown values on notification page 
@mattwr18 this solves the problem by 50%. If you switch the language and
click on the notifications dropdown filter, you will see the translated
labels. However, the label showing the selected value will not change,
probably because `<ds-menu>` caches the selected option 😞.
 2019-11-11 08:52:04 +01:00