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

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
f8b4e1f78f
Merge pull request #2105 from Human-Connection/dependabot/npm_and_yarn/cypress-3.6.0 
build(deps-dev): bump cypress from 3.5.0 to 3.6.0
 2019-11-01 14:51:50 +01:00
Alexander Friedland
056f2d32a1
change 
this.$i18n.set(this.user.locale)
 2019-11-01 13:23:06 +01:00
Alexander Friedland
9a246dea8d
remove getter locale 
remove getter locale
 2019-11-01 13:14:46 +01:00
Alexander Friedland
34283b6d6c
Merge pull request #2108 from Human-Connection/2102-Notifications_query_ignores_poll_interval_and_queries_infinitely 
Fix: Poll Interval
 2019-11-01 13:09:50 +01:00
ogerly
4cb46b6178 Fix: Poll Interval 2019-11-01 12:11:54 +01:00
dependabot-preview[bot]
6b0829516b
build(deps-dev): bump cypress from 3.5.0 to 3.6.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 10:29:46 +00:00
mattwr18
805415a13a
Merge pull request #2104 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.4.0 
build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0
 2019-11-01 09:11:30 +01:00
dependabot-preview[bot]
4305142daa
build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.3.0...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 07:11:12 +00:00
mattwr18
bf71434fba
Merge pull request #2082 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.17 
build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:33:10 +01:00
mattwr18
eeeccc7fd3
Merge pull request #2098 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.7.17 
build(deps): bump metascraper-publisher from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:32:55 +01:00
mattwr18
d987bb22ce
Merge pull request #2096 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.17 
build(deps): bump metascraper-description from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:32:42 +01:00
Joseph Ngugi
044155a298 add allowShouts mutation 2019-10-31 21:22:44 +03:00
Joseph Ngugi
9668351279 add allowShouts type 2019-10-31 21:22:10 +03:00
Joseph Ngugi
c8ce53d598 add allowShouts field 2019-10-31 21:21:31 +03:00
Robert Schäfer
3e9403ec14
Merge pull request #2097 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.7.17 
build(deps): bump metascraper-audio from 5.7.14 to 5.7.17 in /backend
 2019-10-31 19:07:27 +01:00
dependabot-preview[bot]
f503dc09f5
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:07:35 +00:00
dependabot-preview[bot]
206b5e8ce7
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:07:22 +00:00
dependabot-preview[bot]
ffa1038b86
build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:06:58 +00:00
Robert Schäfer
2e1f26ff82
Merge pull request #2086 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.7.17 
build(deps): bump metascraper-url from 5.7.14 to 5.7.17 in /backend
 2019-10-31 18:04:50 +01:00
Robert Schäfer
edac772591
Merge pull request #2090 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.7.17 
build(deps): bump metascraper-image from 5.7.6 to 5.7.17 in /backend
 2019-10-31 18:04:41 +01:00
Robert Schäfer
600adfddc6
Merge pull request #2093 from Human-Connection/ogerly-patch-1 
deleted posts no longer displayed in user profile
 2019-10-31 18:04:14 +01:00
KapilJ
d8e4697f1d
Merge pull request #2062 from Human-Connection/1953-TwoNotifications 
Send only one notification for mention and comment
 2019-10-31 12:45:28 -04:00
roschaefer
5715d3e9d5 Add vuex store tests for language filter 2019-10-31 17:32:18 +01:00
roschaefer
cbc547a86b refactor: small refactoring for readability 
@KapilJ your solution is right now the best solution, I think. Probably
the ideal solution would be if we could implement the `CreateComment`
resolver in such a way that it is doing eager loading of the
`comment->post->author` relationship and resolving a commment object
which has the required objects all set. Then you wouldn't have to
refetch all the stuff.

But I think this is OK for now 👍
 2019-10-31 16:11:05 +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]
181cd76bc3
build(deps): bump metascraper-audio from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 12:12:19 +00:00
dependabot-preview[bot]
e56f2fb4ff
build(deps): bump metascraper-image from 5.7.6 to 5.7.17 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.7.6 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.6...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 10:13:25 +00:00
dependabot-preview[bot]
70e54c6bec
build(deps): bump metascraper-url from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 10:13:20 +00:00
Alexander Friedland
3fc61618bd
deleted posts no longer displayed in user profile 
deleted posts are no longer displayed in the user profile
 2019-10-31 11:05:29 +01:00
mattwr18
90f7dcedfa
Merge pull request #2089 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.7.17 
build(deps): bump metascraper-date from 5.7.14 to 5.7.17 in /backend
 2019-10-31 10:55:20 +01:00
mattwr18
7309810112
Merge pull request #2088 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc17 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc16 to 4.0.0-rc17 in /webapp
 2019-10-31 10:55:02 +01:00
mattwr18
b768cc4dd7
Merge pull request #2087 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.7.17 
build(deps): bump metascraper-lang from 5.7.14 to 5.7.17 in /backend
 2019-10-31 10:54:39 +01:00
mattwr18
fbb1628d27
Merge pull request #2084 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.7.17 
build(deps): bump metascraper-video from 5.7.14 to 5.7.17 in /backend
 2019-10-31 10:53:50 +01:00
mattwr18
837360b68a
Merge pull request #2081 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.7.17 
build(deps): bump metascraper-soundcloud from 5.7.14 to 5.7.17 in /backend
 2019-10-31 10:53:11 +01:00
Kapil Jain
b4a9e3e551 add software tests for two notifications bug 2019-10-31 05:08:15 -04:00
Kapil Jain
c21ad2244f add software tests for two notifications bug 2019-10-30 22:03:52 -04:00
Kapil Jain
063ff17d8b add software tests for two notifications bug 2019-10-30 20:39:50 -04:00
ppelegrin
405021dea6 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into add-missing-portuguese-translations 2019-10-30 22:35:03 +01:00
ppelegrin
c275a3ee00 Continue with translations 2019-10-30 22:23:52 +01:00
Wolfgang Huß
21e82d2ea5 Get decide mutation to work 
- Tests are not fully working yet!
 2019-10-30 19:07:51 +01:00
Tomas Bednarik
194178627d Commit after lint --fix 2019-10-30 17:15:32 +01:00
Wolfgang Huß
54be7782ba First refactoring tests to new database structure 2019-10-30 16:59:24 +01:00
Wolfgang Huß
47d5cc89dd Implement last property on DECIDED relation 2019-10-30 15:48:46 +01:00
dependabot-preview[bot]
bf7e4eb79c
build(deps): bump metascraper-date from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-30 14:44:47 +00:00
dependabot-preview[bot]
10545eb6c7
build(deps): bump metascraper-lang from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-30 14:44:46 +00:00
dependabot-preview[bot]
43b2ef3eb3
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-30 14:44:41 +00:00
dependabot-preview[bot]
42479c0ced
build(deps): bump metascraper-video from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-30 14:44:40 +00:00