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

5716 Commits

Author SHA1 Message Date
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
Moriz Wahl
53f3606d12 removed moz and webkit for hyphens 2019-11-12 11:24:06 +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
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
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
Moriz Wahl
e46a23d445 css hyphens for webkit and moz 2019-11-11 23:01:03 +01:00
Moriz Wahl
d0c0fd373a Language attribute added to post and postCard 2019-11-11 22:42:37 +01:00
Moriz Wahl
19602d7311 language is fetched in postFragment 2019-11-11 22:21:59 +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
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
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
Wolfgang Huß
b305bc27d7 Use eyes icon to show state of decision 2019-11-11 18:02:01 +01:00
Wolfgang Huß
3d147a1cff Fix lint 'pt.json' 2019-11-11 17:53:51 +01:00
Wolfgang Huß
677039b786 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	webapp/pages/moderation/index.vue
 2019-11-11 17:52:58 +01:00
Wolfgang Huß
c3f6ad0e44 Implement always show resource status 
- Rename buttons after Roberts suggestion.
 2019-11-11 16:38:48 +01:00
Alina Beck
ffb3ff896e add tests for DonationInfo component (wip) 2019-11-11 17:36:04 +03:00
Wolfgang Huß
4e49dfe9e1 Add a confirm modal. 2019-11-11 14:53:19 +01: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
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
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
288787bcb9 Remove deprecated slot syntax 
- Update slot to use syntax supported after Vue 2.6
 2019-11-11 08:52:51 +01:00