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

7083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
56f0c1a8e8
Merge pull request #2235 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.1 
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp
 2019-11-14 10:53:14 +01:00
mattwr18
5305577b69
Merge pull request #2205 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.6.0 
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp
 2019-11-14 10:26:05 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00
dependabot-preview[bot]
45d60b233d
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 04:21:13 +00:00
mattwr18
ead0c5462d
Merge pull request #2233 from Human-Connection/add-locale-to-undefinedToNull 
Add locale to undefined to null
 2019-11-13 18:48:40 +01:00
mattwr18
b38fde0fd0 Fix production error "User.locale" returned undefined 2019-11-13 18:00:35 +01:00
mattwr18
3bfb6977b7 Update VERSION file 2019-11-13 15:46:02 +01:00
mattwr18
d1d7bf64fd
Merge pull request #2231 from Human-Connection/update-to-version-0.1.10 
Update to version 0.1.10
 2019-11-13 15:13:55 +01:00
mattwr18
4f68f79594 Update to version 0.1.10 2019-11-13 12:47:47 +01:00
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
v0.1.10 		2019-11-13 10:10:07 +01:00
Alina Beck
34239631a2 toggle shouts tab depending on user setting 2019-11-13 11:44:24 +03:00
Alina Beck
3cf3c31808 remove package-lock.json 2019-11-13 11:43:19 +03:00
Alina Beck
1625e0705e run update mutation when submitting shouts form 2019-11-13 11:02:53 +03: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
feb65a6c9c Update property name to be more descriptive 
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
 2019-11-12 21:19:52 +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
6e3bd19267 set up privacy page in settings 2019-11-12 19:13:56 +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
dependabot-preview[bot]
2b2aaa04e1
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 13:06:14 +00: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
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
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