IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-03 16:15:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,971 Commits 6 Branches 100 Tags
Commit Graph

16971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasily Belolapotkov
fac7faf877 Sync 293-fix-follower-counter with master 2019-09-10 09:02:52 +03:00
Wolfgang Huß
fb672410f9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-10 06:58:33 +02:00
dependabot-preview[bot]
5e05e78401
Bump @human-connection/styleguide from 0.5.19 to 0.5.21 in /webapp 
Bumps @human-connection/styleguide from 0.5.19 to 0.5.21.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-10 04:22:57 +00:00
roschaefer
a8222c5290 Remove obsolete code 
I believe this is obsolete code. Could someone double-check?

@mattwr18 I tried to see any difference to `master` and I couldn't. Did
I miss sth.?

For context: During my work on https://github.com/Human-Connection/Human-Connection/pull/1517
the webapp was complaining about missing mutations when I changed the
dropdown.
 2019-09-10 03:35:10 +02:00
Alexander Friedland
f327cc01dd
Merge pull request #1539 from Human-Connection/1462-Sorting_dropdown_should_be_aligned_with_post_cards 
[WIP] Sorting dropdown is aligned with post cards
 2019-09-09 19:18:12 +02:00
Wolfgang Huß
20b54b050f
Merge pull request #1514 from Human-Connection/fix_css_on_profile_page 
Avatar should be centered on profile page
 2019-09-09 19:16:56 +02:00
Alina Beck
808b3c5a95
Merge pull request #155 from Human-Connection/update_version 
Update version to 0.5.21
 2019-09-09 18:04:32 +01:00
Wolfgang Huß
f1b52c7b81
Merge pull request #1536 from Human-Connection/fix-test-set-up 
Fix test by setting value of the mocked hashtag
 2019-09-09 17:17:44 +02:00
mattwr18
ba3e0ca941 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:35 +02:00
mattwr18
31a3f09caf Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:23 +02:00
mattwr18
3b056aacc1 Fix weird indentation issue with VS Code 2019-09-09 16:58:49 +02:00
aonomike
f23c9375f1 Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 17:52:00 +03:00
mattwr18
86d80c689c Fix indentation issue on EMOTED 2019-09-09 16:51:24 +02:00
aonomike
f1a5d215e3 Merge branch '1488-filter-posts-by-emotion' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 17:51:02 +03:00
mattwr18
919dc1924f Fix indent issue 2019-09-09 16:46:51 +02:00
ogerly
e278fa4afc Padding remove 2019-09-09 16:45:11 +02:00
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
mattwr18
b89043166b Add backend tests for filtering posts by emotions 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-09 16:35:11 +02:00
roschaefer
b05583a8b0 Implement a custom deployment condition via bash 2019-09-09 16:16:29 +02:00
Wolfgang Huß
abf408e3c6 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list 2019-09-09 16:03:42 +02:00
roschaefer
90f747a2a9 Don't deploy if you're not on master 
Thank you:
https://github.com/travis-ci/travis-ci/issues/5419#issuecomment-222815942
 2019-09-09 15:59:52 +02:00
roschaefer
3d85451aff Update version to 0.5.21 2019-09-09 15:59:52 +02:00
Wolfgang Huß
2c732bfbfb Refactor create and update comment to emit events 2019-09-09 15:53:50 +02:00
Robert Schäfer
cbcb6e6aea
Merge pull request #1534 from Human-Connection/add-console-log-for-erros-geolocation 
Add console log for erros geolocation
 2019-09-09 15:45:23 +02:00
aonomike
34ddd12948 Fix test by setting value of the mocked hashtag 
- The test wasnt testing anything as the hashtag value was defaulting to null
- Fixed by setting value of hashtag to a string and then testing if the clearSearch works
 2019-09-09 16:22:21 +03:00
roschaefer
28776d7a6a Avatar should be centered on profile page 
This is a fix of e04eedf0d07ff66dba3e881e9ef8bdf5a868619e
 2019-09-09 15:02:56 +02:00
aonomike
9a6a3a6bea Test clicks on the emotions buttons 
- Add tests for clicks on the emotion button
- Refactor name of TOGGLE_EMOTIONS
 2019-09-09 15:42:10 +03:00
mattwr18
d3952e2ada Use debug npm package over console.log 
- @roschaefer `PR` review
- better because we can leave in the code base and show only when/if we
want to
 2019-09-09 14:32:01 +02:00
Wolfgang Huß
9f203cda3b Refactor by melting EditCommentForm.vue into CommentForm.vue 2019-09-09 13:06:44 +02:00
Robert Schäfer
8dafc50286
Merge pull request #154 from Human-Connection/deploy_github_pages_through_travis 
Deploy Github pages through Travis CI
 2019-09-09 13:02:11 +02:00
roschaefer
0b6360bc0b Deploy Github pages through Travis CI 
This solves two problems
* It automatically deploys the documentation
* It deploys the documentation only if the npm package is deployed (ie.
if there is a git tag) and keeps both in sync
 2019-09-09 12:59:11 +02:00
mattwr18
2aef2add3d Add temporarily console.log statements to debug failed API call 
- in production environment, the user locationName is updated, but it is
failing the `createOrUpdateLocations` function in backend/src/middleware/nodes/locations.js
For some reason, it seems like the API call is coming back with
something other than what we are looking for.
Need help debugging... we can remove this code after we figure out
what's wrong
 2019-09-09 12:53:47 +02:00
Robert Schäfer
2ad4602de3
Merge pull request #153 from Human-Connection/update_all_dependencies 
Update all dependencies except `sass-loader`
 2019-09-09 12:28:02 +02:00
roschaefer
80eb430460 Update all dependencies except sass-loader 
We want to make another release and had a look which dependabot PR was
green. So I just updated the green dependencies manually and had a look
if anything breaks.

Again it would be great to have a build server and a reliable test suite.
 2019-09-09 12:22:32 +02:00
Robert Schäfer
aa772ca19f
Merge pull request #149 from Human-Connection/dependabot/npm_and_yarn/sass-loader-8.0.0 
Bump sass-loader from 7.2.0 to 8.0.0
 2019-09-09 12:20:18 +02:00
Alina Beck
94c0ed83d9 use renamed sass-loader prependData option 2019-09-09 11:16:14 +01:00
Robert Schäfer
ac960d8ecd
Merge pull request #137 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.9.0 
Bump babel-jest from 24.8.0 to 24.9.0
 2019-09-09 12:04:12 +02:00
Robert Schäfer
0889e137d9
Merge pull request #144 from Human-Connection/dependabot/npm_and_yarn/vue/cli-plugin-unit-jest-3.11.0 
Bump @vue/cli-plugin-unit-jest from 3.10.0 to 3.11.0
 2019-09-09 12:03:31 +02:00
Robert Schäfer
66c049544e
Merge pull request #152 from Human-Connection/fix-grid-component 
Fix grid component
 2019-09-09 11:59:05 +02:00
aonomike
11dd61c430 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 12:29:57 +03:00
Wolfgang Huß
3f4e717163 Move user queries to graphql/User.js 2019-09-09 10:58:10 +02:00
Wolfgang Huß
e544725e87 Remove editPending and SET_EDIT_PENDING from the store 2019-09-09 10:27:21 +02:00
mattwr18
e819ade8cb Add console.log statement on error to help debug 
- Geolocation is working in development, but not on staging or
production
 2019-09-09 09:54:38 +02:00
Vasily Belolapotkov
beb78249f6 update follower count on follow/unfollow 2019-09-09 10:01:46 +03:00
mattwr18
3d419c1f21
Merge pull request #1508 from Human-Connection/1505_remove_html_in_moderation_view 
Fix #1505 remove html
 2019-09-09 08:49:00 +02:00
mattwr18
48e696dde4 Fix lint 2019-09-09 08:24:33 +02:00
dependabot-preview[bot]
23a14534b7
Bump @babel/preset-env from 7.5.5 to 7.6.0 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:25:22 +00:00
dependabot-preview[bot]
0f2546aded
Bump @babel/core from 7.5.5 to 7.6.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:24:32 +00:00
dependabot-preview[bot]
d090161e4f
Bump vue-jest from 3.0.4 to 3.0.5 in /webapp 
Bumps [vue-jest](https://github.com/vuejs/vue-jest) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/vuejs/vue-jest/releases)
- [Commits](https://github.com/vuejs/vue-jest/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:24:27 +00:00
dependabot-preview[bot]
537c5c7c7b
Bump date-fns from 2.0.1 to 2.1.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.1 to 2.1.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.0.1...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 04:23:54 +00:00