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

845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
0b9ad5c395 Refactor context => resourceType 
@appinteractive `context` is probably the broadest term you can think
of. If possible avoid and prefer a descriptive name.
 2019-03-10 15:19:23 +01:00
Robert Schäfer
3b7308c7ef ModalWrapper closes if DisableModel closes 2019-03-10 15:19:23 +01:00
Robert Schäfer
7d7a1be43d Refactor: Put id in data.resource object 2019-03-10 15:19:23 +01:00
Robert Schäfer
173c2c3281 Test+implement modal wrapper for DisableModal 2019-03-10 15:19:23 +01:00
Robert Schäfer
b1bc46e170 DisableModal ready 2019-03-10 15:19:23 +01:00
Robert Schäfer
ca397b6674 Behaviour of DisableModal fully tested 2019-03-10 15:19:23 +01:00
Robert Schäfer
61e6773e86 Sketch a component test for DisableModal 2019-03-10 15:19:23 +01:00
Robert Schäfer
cdc9cd0af2 Await async mehtods in ReportModal.spec.js 2019-03-10 15:19:23 +01:00
Robert Schäfer
03422920a2 Start to implement wrapper modal 2019-03-10 15:19:23 +01:00
Lala Sabathil
f247e8657e
Merge branch 'master' into 27_disable_posts 2019-03-09 20:28:50 +01:00
Robert Schäfer
3903c2a4ff
Merge pull request #237 from Human-Connection/remove_portal 
[WIP] Remove portal
 2019-03-09 13:03:40 +01:00
Robert Schäfer
148bd03d4d Update styleguide to a version without vue-portal 2019-03-09 12:22:06 +01:00
dependabot[bot]
54c6fe1332 Bump tiptap-extensions from 1.13.0 to 1.14.0 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.13.0...tiptap-extensions@1.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-09 12:22:04 +01:00
dependabot[bot]
61f6e8d7c2 Bump babel-jest from 24.1.0 to 24.3.1 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.3.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-09 12:20:51 +01:00
dependabot[bot]
48732c50b5 Bump vue-jest from 3.0.3 to 3.0.4 
Bumps [vue-jest](https://github.com/eddyerburgh/vue-jest) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/eddyerburgh/vue-jest/releases)
- [Commits](https://github.com/eddyerburgh/vue-jest/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-09 12:20:23 +01:00
Robert Schäfer
525da7a303 Without vue-portal all the oddities vanish 
CC @Tirokk @mattwr18 @appinteractive

Major breakthrough: If I remove `vue-portal` entirely from the
styleguide, problem solved. Not only that we can remove the TODOs from
the tests. Even wrappers of subcomponents get updated when I interact
with the root component. What a bliss 😂

Example code:
```js
let button = wrapper.find('div div div button')
expect(button.attributes()).toEqual({disabled: 'disabled'})
wrapper.doSomeAction()
expect(button.attributes()).toEqual({})
```
 2019-03-09 12:20:23 +01:00
Robert Schäfer
2831af469a Remove all code related to vue-portal 2019-03-09 12:20:23 +01:00
dependabot[bot]
4aa640a2e5
Merge pull request #232 from Human-Connection/dependabot/npm_and_yarn/tiptap-extensions-1.14.0 2019-03-09 00:03:47 +00:00
dependabot[bot]
013192f048
Bump tiptap-extensions from 1.13.0 to 1.14.0 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.13.0...tiptap-extensions@1.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 21:45:59 +00:00
dependabot[bot]
5673ba831d
Merge pull request #235 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.3.1 2019-03-08 21:43:41 +00:00
Robert Schäfer
93a0e6654d Fledge out the test case for ReportModal 
@Tirokk I think I could narrow down our problem to an additional call of
Wrapper(). The fact that we have to call it at least twice is a strong
indicator of non-atomic tests, which is bad.
 2019-03-08 20:41:17 +01:00
Robert Schäfer
c0d545bae0 Refactor ReportModal 
@Tirokk and I had a hard time to reason about the then/catch block if
$toast is undefined.
 2019-03-08 20:41:17 +01:00
Robert Schäfer
193cff45e2 Test ReportModal with a wrapper component 
... called ModalTestbed
 2019-03-08 20:41:17 +01:00
Robert Schäfer
2a1276cdc3 Better test ReportModal first 2019-03-08 20:41:17 +01:00
Robert Schäfer
e10b9fde74 Fix translations, lint and some tests 2019-03-08 20:41:17 +01:00
Matt Rider
3cebb0eea0 Update ReportModal to work with back end 2019-03-08 20:41:17 +01:00
Robert Schäfer
44b216f138 Scaffold DisableModal and .spec 2019-03-08 20:41:16 +01:00
dependabot[bot]
a374099a1e
Bump babel-jest from 24.1.0 to 24.3.1 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.3.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 19:26:40 +00:00
Lala Sabathil
8a15ef99f6
Merge pull request #220 from Human-Connection/dependabot/npm_and_yarn/vue-jest-3.0.4 
Bump vue-jest from 3.0.3 to 3.0.4
 2019-03-08 20:24:15 +01:00
Grzegorz Leoniec
f8c24eb79a
Merge master in 2019-03-08 18:38:33 +01:00
dependabot[bot]
0e145c4934
Bump vue-jest from 3.0.3 to 3.0.4 
Bumps [vue-jest](https://github.com/eddyerburgh/vue-jest) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/eddyerburgh/vue-jest/releases)
- [Commits](https://github.com/eddyerburgh/vue-jest/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 17:22:18 +00:00
dependabot[bot]
c4f2457765
Merge pull request #231 from Human-Connection/dependabot/npm_and_yarn/tiptap-1.14.0 2019-03-08 17:19:41 +00:00
dependabot[bot]
3229dbc1d0
Bump tiptap from 1.13.0 to 1.14.0 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.13.0...tiptap@1.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 14:36:18 +00:00
Grzegorz Leoniec
243d604abc
Merge pull request #213 from Human-Connection/distinct-shouts-and-follows 
Fix follow and shout status
 2019-03-08 15:33:31 +01:00
mattwr18
572862e8aa
Merge branch 'master' into 27_disable_posts 2019-03-06 22:11:42 -03:00
Grzegorz Leoniec
c71f6fb07c
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 18:46:16 +01:00
Grzegorz Leoniec
d848929302
Improved countTo component 2019-03-06 18:45:57 +01:00
Grzegorz Leoniec
6617aaefc3
Merge branch 'master' into distinct-shouts-and-follows 2019-03-06 16:34:25 +01:00
Grzegorz Leoniec
78c9b83282
Fixed follow stats 2019-03-06 13:08:26 +01:00
dependabot[bot]
995ae36f21
Merge pull request #188 from Human-Connection/dependabot/npm_and_yarn/@vue/cli-shared-utils-3.4.1 2019-03-06 03:40:42 +00:00
dependabot[bot]
70416b4722
Bump @vue/cli-shared-utils from 3.4.0 to 3.4.1 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.4.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 01:24:16 +00:00
dependabot[bot]
b3e42fc444
Merge pull request #225 from Human-Connection/dependabot/npm_and_yarn/@nuxtjs/axios-5.4.1 2019-03-06 01:21:53 +00:00
dependabot[bot]
4efe4f42e9
Bump @nuxtjs/axios from 5.3.6 to 5.4.1 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.3.6 to 5.4.1.
- [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.3.6...v5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-05 23:05:15 +00:00
dependabot[bot]
8fcd108eb6
Merge pull request #221 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.1 2019-03-05 23:02:08 +00:00
Grzegorz Leoniec
29dac5c5a3
Removed unused voted var from author component 2019-03-05 17:37:48 +01:00
Grzegorz Leoniec
8792f02932
Improved follow button optimistic behavior 2019-03-05 17:35:41 +01:00
Grzegorz Leoniec
d9b633c5ae
Make follow button update instant 2019-03-05 17:26:20 +01:00
Grzegorz Leoniec
d30649164a
Improved following and shout behavior 2019-03-05 17:19:35 +01:00
Grzegorz Leoniec
66edec0dc8
Translated shot button 2019-03-05 14:30:02 +01:00
Grzegorz Leoniec
1423101ca5
Disable shouting for own content 2019-03-05 14:18:06 +01:00