Grzegorz Leoniec
9419a57c29
Updated yarn.lock
2019-03-12 20:26:41 +01:00
Grzegorz Leoniec
0d38505054
Merge branch 'master' into 27_disable_posts
2019-03-12 19:36:56 +01:00
Grzegorz Leoniec
a05b438b3c
Merge pull request #253 from Human-Connection/fix-styleguide-issues
...
Fix styleguide issues
2019-03-12 19:06:54 +01:00
Grzegorz Leoniec
078b4974c4
Upgraded nuxt to 2.4.5
2019-03-12 18:47:47 +01:00
Grzegorz Leoniec
4810fd1497
Fixed tag and categories tests by trimming names
2019-03-12 18:44:51 +01:00
Grzegorz Leoniec
968365187a
Merged master in
2019-03-12 18:08:53 +01:00
Grzegorz Leoniec
b8417f3a5f
Try to "quick" (haha) fix the build with styleguide
2019-03-12 18:06:18 +01:00
Grzegorz Leoniec
ab09f356ca
Fixed a submit buttion translation for reporting content
2019-03-12 17:59:40 +01:00
Grzegorz Leoniec
370734bdde
Merged master in, fixed translation and modal linting issues
2019-03-12 17:58:04 +01:00
Grzegorz Leoniec
c68b214dc5
Removed polyfill
2019-03-12 15:39:54 +01:00
Grzegorz Leoniec
c1218d8607
Revert change from chrome to electron as we need recording
2019-03-12 15:07:15 +01:00
Grzegorz Leoniec
77200bda74
Ignore .min.js files from linting
2019-03-12 14:45:59 +01:00
Grzegorz Leoniec
b1b5a041a0
Removed parallel from cypress run
2019-03-12 14:43:14 +01:00
Grzegorz Leoniec
033e440ea3
Updated styleguide to 0.5.14
2019-03-12 13:58:21 +01:00
Grzegorz Leoniec
bb4afe79cb
Added IntersectionObserver polyfill
2019-03-12 13:58:07 +01:00
Grzegorz Leoniec
dc8c2e81aa
Try to run cypress tests in chrome
2019-03-12 13:57:29 +01:00
Robert Schäfer
6e003d428b
Merge pull request #233 from Human-Connection/get_rid_of_resource_type
...
Update ReportModal to work with back end
2019-03-12 13:52:30 +01:00
Robert Schäfer
3b7ffde4c2
Merge branch 'master' of github.com:Human-Connection/Nitro-Web into get_rid_of_resource_type
2019-03-12 13:26:56 +01:00
Grzegorz Leoniec
610aa470fb
Merge pull request #250 from Human-Connection/lokalise-2019-03-12_10-42-56
...
Lokalise: Translations update
2019-03-12 10:44:07 +01:00
lokalise-bot
d1be013c3c
Lokalise: update of locales/pt.json
2019-03-12 10:43:01 +01:00
lokalise-bot
bcedf11c69
Lokalise: update of locales/pl.json
2019-03-12 10:43:00 +01:00
Grzegorz Leoniec
39933995c5
Merge pull request #240 from Human-Connection/update_translations
...
Update translations
2019-03-12 10:42:31 +01:00
Robert Schäfer
31c056e8d3
Display who disabled a resource
2019-03-10 22:40:29 +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
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
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
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
