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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
a1b9f770ce
Bump date-fns from 2.0.0-alpha.26 to 2.0.0-alpha.27 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.26 to 2.0.0-alpha.27.
- [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.0-alpha.26...v2.0.0-alpha.27)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-10 19:41:58 +00:00
Robert Schäfer
28a37c226a
Merge pull request #213 from Human-Connection/get_rid_of_resource_type 
Get rid of resource type
 2019-03-10 20:39:09 +01:00
Grzegorz Leoniec
2116936062 Fixed shout and follow seeding 2019-03-10 19:05:50 +01:00
Robert Schäfer
60d711bb0a Prevent to report any type 
Resouce must have a label (Post|Comment|User)
 2019-03-10 19:05:50 +01:00
Robert Schäfer
ee5c4127e6 Prevent disabling any type 
Resource must have a label Post|Comment|User
 2019-03-10 19:05:50 +01:00
Robert Schäfer
f14c903d2a Refactor: we don't need a setup object 2019-03-10 19:05:50 +01:00
Robert Schäfer
cae3330105 Fix deprecation: async function passed to describe 2019-03-10 19:05:50 +01:00
Robert Schäfer
2d1ea0e251 Cypres should be a development dependency 2019-03-10 18:24:37 +01:00
Robert Schäfer
d114d71fac Remove unrelated translations 2019-03-10 18:24:37 +01:00
Robert Schäfer
c794e5acb4 Fix yarn.lock 2019-03-10 18:24:37 +01:00
Robert Schäfer
ff926ae35f Bugfix: ReportModal keeps showing success screen 2019-03-10 18:24:37 +01:00
Grzegorz Leoniec
e82cf9b349
Merge branch 'master' into get_rid_of_resource_type 2019-03-10 17:22:22 +01:00
Robert Schäfer
dd6f9ddd25 Improve locales 2019-03-10 15:49:02 +01:00
Robert Schäfer
9eba745b83 We probably don't even need 'disabled' property 2019-03-10 15:47:23 +01:00
Robert Schäfer
7efc56a227 Fine-tune styling 2019-03-10 15:24:04 +01:00
Robert Schäfer
4cc02a6200 Import ReportModal in Modal 2019-03-10 15:19:23 +01:00
Robert Schäfer
bc2471c5df Refactor ReportModal 2019-03-10 15:19:23 +01:00
Robert Schäfer
b7ca8a426b Render modals in a closed state and hide 
I found out that when you umount the modals completely you don't get the
nice hide effect of `<ds-modal>`. It should be safe to still have all
modals in the DOM.
 2019-03-10 15:19:23 +01:00
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
kachulio1
0a31e5278c add test for correct credentials 2019-03-10 01:44:41 +03:00
kachulio1
6cba9f1fd8 remove image url 2019-03-10 00:50:16 +03:00
kachulio1
3fbe4cb2e6 add use single quotes 2019-03-10 00:48:16 +03:00
Robert Schäfer
221958ba10 Merge remote-tracking branch 'victorrms2/patch-1' into update_translations 2019-03-09 22:33:17 +01:00
Robert Schäfer
6f558db8aa Upload/Download translations from lokalise.co 
@appinteractive @mattwr18 @Tirokk I did the following steps:

1. Upload current translations for `en` and `de` to lokalise.co
  * this did not update or create any keys, instead
    all keys were skipped (apparently already there)
2. Download the translations on lokalise with the following settings:
  * ICU message with numeric pluralization
  * Don't escape forward slashes
  * Indent with 2 spaces
 2019-03-09 22:02:43 +01:00
Victor
a3e4633329
Small changes on translation mistakes - Portuguese 
The translation of "post" is "postagem", and not "pastagem". Pastagem means where the cow eats grass.
The "admin" was as "Administrator", while the correct word is "Administrador".

I'm not sure about what "Shouts" are, but I don't really know if the word "Gritos" is the properly for this thing. In portuguese, when you say "Grito", the literal translation of "Shouts" you think of a person screaming, and I don't think that's was the intention. If somebody could explain me what a "Shout" means in this code I could help in a more accurate translation.
 2019-03-09 17:47:34 -03:00
Lala Sabathil
8c4ce07a54
Merge pull request #165 from Human-Connection/master 
x
 2019-03-09 20:33:55 +01:00
Lala Sabathil
3d1b3ce489
Update README.md 2019-03-09 20:32:40 +01:00
Lala Sabathil
82976b9697
Update README.md 2019-03-09 20:32:06 +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
kachulio1
bd2a7e5332 fix merge conflicts 2019-03-09 14:52:59 +03:00
kachulio1
35339b4674 add changePassword mutation test 2019-03-09 14:50:23 +03:00
kachulio1
82ae81d8fe add changePasssword mutation 2019-03-09 14:50:23 +03:00
kachulio1
8fcefc63bc add changePassword mutation test 2019-03-09 14:47:12 +03: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
kachulio1
4350590697 add changePasssword mutation 2019-03-09 13:36:27 +03: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