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

2034 Commits

Author SHA1 Message Date
roschaefer
1d15176500 Write a test for #2057 2019-11-05 00:06:15 +01:00
Stephen Hogsten
3f7a7913c0 convert email to lowercase before submitting 2019-11-05 00:06:15 +01:00
mattwr18
abbd090eb7
Merge pull request #1956 from Human-Connection/cropper-enhancements 
Refactor and tidy up crop image implementation
 2019-11-04 11:13:21 +01:00
mattwr18
d3922a8149
Merge pull request #2059 from Human-Connection/2045-filter-posts-by-language 
🍰 First Implementation Of Filtering Posts By Language
 2019-11-04 10:20:13 +01:00
mattwr18
a78a58ad8d Mock $t in TeaserImage test 2019-11-02 17:02:19 +01:00
Brent Vardy
99816f1c21 update cancel crop to keep previous image 
- Also refactor to split into more methods

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 12:09:28 +00:00
Brent Vardy
dfb59516d0 Add abiltiy to cancel out of cropper and remove image 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:48:56 +00:00
Brent Vardy
2670b48694 removed unused code and refactor cropper 
- Removed unused code
- updated confirm button to be ds-button component
- split into multiple functions

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:07:06 +00:00
Brent Vardy
daf40bbb7c Merge branch 'master' into cropper-enhancements 2019-11-02 09:42:38 +00:00
ogerly
4cb46b6178 Fix: Poll Interval 2019-11-01 12:11:54 +01:00
roschaefer
5715d3e9d5 Add vuex store tests for language filter 2019-10-31 17:32:18 +01:00
Moriz Wahl
3c8a35d371 Language Code As Buttons Instead Of Flag Icon 2019-10-31 14:35:36 +01:00
Moriz Wahl
6ffbd37c95 Language Code As Buttons Instead Of Flag Icon 2019-10-31 14:34:23 +01:00
dependabot-preview[bot]
5f91cf8057
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc16 to 4.0.0-rc17.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.16...v4.0.0-rc.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-30 11:38:10 +00:00
mattwr18
b4896c3839
Merge pull request #2007 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.6.0 
build(deps): bump date-fns from 2.5.0 to 2.6.0 in /webapp
 2019-10-29 18:31:33 +01:00
Moriz Wahl
1dbd36c1e1 Tests Added For Language Filter Of Posts 2019-10-29 17:20:33 +01:00
dependabot-preview[bot]
0826bcce3b
build(deps): bump date-fns from 2.5.0 to 2.6.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.0 to 2.6.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.5.0...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 11:04:18 +00:00
dependabot-preview[bot]
2c4416c2ee
build(deps): bump node from 12.13.0-alpine to 13.0.1-alpine in /webapp 
Bumps node from 12.13.0-alpine to 13.0.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 08:07:10 +00:00
dependabot-preview[bot]
bb63afdc4c
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.0 to 23.0.2.
- [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.0...v23.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 04:22:58 +00:00
Moriz Wahl
aeae72f691 first implementation 2019-10-28 13:49:32 +01:00
mattwr18
2b76ead330
Merge pull request #2051 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.0 
build(deps-dev): bump eslint-plugin-jest from 22.20.0 to 23.0.0 in /webapp
 2019-10-28 10:00:37 +01:00
dependabot-preview[bot]
c84cfc3397
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.20.0 to 23.0.0.
- [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/v22.20.0...v23.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 04:22:44 +00:00
dependabot-preview[bot]
d9f48272cb
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.4.0 to 6.5.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.4.0...v6.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 04:21:42 +00:00
mattwr18
00e375c6cb
Merge pull request #2037 from Human-Connection/dependabot/npm_and_yarn/webapp/node-sass-4.13.0 
build(deps-dev): bump node-sass from 4.12.0 to 4.13.0 in /webapp
 2019-10-27 12:24:35 +01:00
Moriz Wahl
cd9a15ee32 fix #1993 2019-10-25 15:06:13 +02:00
mattwr18
297875304a
Merge pull request #2030 from Human-Connection/ogerly-patch-2 
change Changes & History to Changes
 2019-10-25 10:04:10 +02:00
mattwr18
55789547db
Merge pull request #2029 from Human-Connection/ogerly-patch-1 
chnage Änderungen & Verlauf zu Änderungen
 2019-10-25 10:03:52 +02:00
dependabot-preview[bot]
1316792fc6
build(deps-dev): bump node-sass from 4.12.0 to 4.13.0 in /webapp 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-25 07:59:55 +00:00
mattwr18
88253308d5
Merge pull request #1990 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc16 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc15 to 4.0.0-rc16 in /webapp
 2019-10-25 09:57:21 +02:00
Alexander Friedland
fb765ac1d8
change 
Changes & History  to  Changes
 2019-10-24 15:51:07 +02:00
Alexander Friedland
060f8cc747
chnage 
Änderungen & Verlauf zu Änderungen
 2019-10-24 15:48:11 +02:00
mattwr18
ad282b8afe
Merge pull request #2028 from Human-Connection/2026_Add_FAQ 
add FAQ _blank-href in Footer
 2019-10-24 15:15:35 +02:00
ogerly
9308646a56 add FAQ, lint ok 2019-10-24 14:27:53 +02:00
mattwr18
6dfe0ce7af
Merge pull request #2025 from Human-Connection/fix_maintenance_dockerfile 
fix: Don't attempt to save locale if not authenticated
 2019-10-24 14:22:08 +02:00
Robert Schäfer
d3b3d9231e
Merge pull request #2027 from Human-Connection/new-terms-conditions-version-0.0.3 
🍰 New terms and conditions version 0.0.3
 2019-10-24 13:52:29 +02:00
mattwr18
5c12914e02 Add test cases for LocaleSwitch 
- if there is a currentUser then update their locale in the database,
otherwise, do not.
 2019-10-24 13:52:21 +02:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
821ea6d671 Update LocaleSwitch with guard clause 
- return if there is no currentUser
- do not copy graphql directory as there is no need to send messages to
backend
 2019-10-24 12:45:55 +02:00
Wolfgang Huß
114c7531bb Change terms and condition version to 0.0.3 2019-10-24 11:32:45 +02:00
mattwr18
945033a687
Merge pull request #2023 from Human-Connection/2022-fix-pinned-post-appearing-twice-bug 
Remove duplicate pinned post record
 2019-10-24 11:24:15 +02:00
roschaefer
9d522353cc fix: import missing files in maintenance image 
@ogerly the maintenance page needs just two components of the webapp
folder. For that reason we import only these. If you add imports to
`LocaleSwitch` component, you need to copy those files in the
Dockerfile.
 2019-10-24 11:14:22 +02:00
dependabot-preview[bot]
26c21b5b76
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc15 to 4.0.0-rc16.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.15...v4.0.0-rc.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 08:51:42 +00:00
mattwr18
69c0247ae5
Merge pull request #2021 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.8.0 
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp
 2019-10-24 10:48:56 +02:00
mattwr18
a38731fcae
Merge pull request #1991 from Human-Connection/Locale_save_by_change_LocalSwitch 
Locale save by change local switch
 2019-10-24 10:02:46 +02:00
mattwr18
a923cb2e62 Remove duplicate pinned post record 
- Maintain consistent orderBy for fetchMore
 2019-10-24 09:58:22 +02:00
Alexander Friedland
b584f12bb1
change 
change()  change to updateUserLocale()
 2019-10-24 08:52:24 +02:00
mattwr18
c40d6a80a6
Merge pull request #1983 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.5 
build(deps-dev): bump @storybook/addon-actions from 5.2.4 to 5.2.5 in /webapp
 2019-10-24 08:52:00 +02:00
mattwr18
cf5405cf62
Merge pull request #2016 from Human-Connection/1995-shouts-hidden-to-other-users 
Hide shout count on user profile unless my profile
 2019-10-24 08:41:32 +02:00
Alexander Friedland
80736f422b
Merge pull request #2017 from Human-Connection/New_AGB_TermsAndConditions 
new terms and conditions
 2019-10-24 07:44:55 +02:00
dependabot-preview[bot]
62d1b1b13f
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.6.0 to 5.8.0.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.6.0...v5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 04:20:15 +00:00