981 Commits

Author SHA1 Message Date
Robert Schäfer
0c2a228b47
Merge pull request #264 from Human-Connection/37-full-text-search-top-bar
37 full text search top bar
2019-03-18 17:42:13 +01:00
Robert Schäfer
9987ad1c95 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-18 15:08:31 +01:00
mattwr18
2c2deacbb7
Merge pull request #208 from Human-Connection/27_disable_posts
Disable posts
2019-03-18 10:30:45 -03:00
Robert Schäfer
41cf347f21 Fix ReportContent.feature 2019-03-16 19:41:56 +01:00
Robert Schäfer
4db242933f Fix HidePosts.feature 2019-03-16 19:24:39 +01:00
Robert Schäfer
a0257fc303 Oh, forgot post/_slug/index
cc @appinteractive
2019-03-16 12:41:28 +01:00
Robert Schäfer
c2e6416d44 Add post.createdAt in the bottom right corner
@appinteractive feel free to change styling if this is too much visual
clutter.
2019-03-16 12:35:46 +01:00
Robert Schäfer
580f142b2e Fetch missing disabled/deleted attributes
Do you think it's better to **always request** the `disabled` and `deleted`
properties on the client or is it OK to **always return** these
properties even if the client did not ask for it?
@appinteractive @ulfgebhardt
2019-03-16 12:08:51 +01:00
Robert Schäfer
67686d0af9 Refactoring for consistency
The disabled/deleted part comes first (similar to guard clauses)
2019-03-15 20:12:56 +01:00
Robert Schäfer
f33f3a4d16 Report/disable message shows data of the resource 2019-03-15 19:56:21 +01:00
Robert Schäfer
07731ca548 Nuxt-link makes showAuthorPopover unneccessary 2019-03-15 17:26:30 +01:00
Robert Schäfer
6beabf7eda Moderators see a red border around disabled users 2019-03-15 17:12:52 +01:00
Robert Schäfer
7bc3214d98 User component shows anonymus if disabled 2019-03-15 17:03:43 +01:00
Robert Schäfer
e6af5a11ab Tests pass 2019-03-15 16:56:24 +01:00
Robert Schäfer
3fad432858 Merge Author+RelatedUser into User component 2019-03-15 16:47:51 +01:00
Robert Schäfer
fc244cd098 More honest translations 2019-03-14 23:21:19 +01:00
Robert Schäfer
e0dd39d5fc Fix bug: No red border of comment for user 2019-03-14 23:17:20 +01:00
mattwr18
53bd169945
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-13 22:52:49 -03:00
Robert Schäfer
7160006eed Show red border for moderators 2019-03-14 02:11:17 +01:00
Robert Schäfer
c2d7002795 Translations 2019-03-14 02:11:17 +01:00
Robert Schäfer
48a85b4af3 Copy+paste from post/_slug page 2019-03-14 02:11:17 +01:00
Robert Schäfer
08d0679a67 Show the comment content if you are a moderator 2019-03-14 02:11:17 +01:00
Robert Schäfer
bb2a6c052e Comment component shows content unless disabled 2019-03-14 02:11:17 +01:00
Robert Schäfer
4845904ddf Sketch comment component 2019-03-14 02:11:17 +01:00
Lala Sabathil
c934cc339e
Merge branch 'master' into 27_disable_posts 2019-03-14 00:47:00 +01:00
Lala Sabathil
0fae7a26e5
Merge pull request #254 from Human-Connection/dependabot/npm_and_yarn/jest-24.5.0
Bump jest from 24.1.0 to 24.5.0
2019-03-14 00:42:16 +01:00
dependabot[bot]
192e3290b1
Bump jest from 24.1.0 to 24.5.0
Bumps [jest](https://github.com/facebook/jest) from 24.1.0 to 24.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.1.0...v24.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-13 23:38:03 +00:00
Lala Sabathil
5e8497e510
Merge pull request #255 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.5.0
Bump babel-jest from 24.3.1 to 24.5.0
2019-03-14 00:35:55 +01:00
dependabot[bot]
d62a9c0480
Bump babel-jest from 24.3.1 to 24.5.0
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.3.1 to 24.5.0.
- [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.5.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-13 22:55:25 +00:00
Lala Sabathil
ae5f663c4d
Merge pull request #258 from Human-Connection/remove_cypress_dependency
Remove cypress from package.json
2019-03-13 23:46:34 +01:00
Robert Schäfer
c3dd027c9f Remove cypress from package.json
cc @mattwr18 added by accident?
2019-03-13 23:30:24 +01:00
Matt Rider
c8f66d168a Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-13 11:30:47 -03:00
Matt Rider
22eec97551 Fix onSelect test to use realistic results 2019-03-13 11:29:41 -03:00
Grzegorz Leoniec
9cad81fa25
Make disabled content more "pretty" 2019-03-13 12:51:50 +01:00
Robert Schäfer
0ba0d2f0a2 Implement effects but remove modals from DOM 2019-03-12 23:26:56 +01:00
Robert Schäfer
58852cb566 Visually distinguish disabled content
with beautiful orange border 😆

cc @appinteractive
2019-03-12 21:47:37 +01:00
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
abf5a3143d
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 19:34:32 +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
Matt Rider
16e75e4464 Refactor SearchInput
- break focus and blur into two functions
- add failing test for onSelect function

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
2019-03-12 14:31:29 -03: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
Matt Rider
85ffd67a49 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-12 12:49:48 -03: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