Wolfgang Huß
|
68980f85c6
|
Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
# webapp/components/Comment.vue
# webapp/components/ContentMenu.vue
# webapp/components/Modal/DeleteModal.spec.js
# webapp/components/Modal/DeleteModal.vue
# webapp/components/Modal/DisableModal.spec.js
# webapp/components/Modal/DisableModal.vue
# webapp/components/Modal/ReportModal.spec.js
# webapp/components/Modal/ReportModal.vue
# webapp/components/PostCard/index.vue
# webapp/components/comments/CommentList/index.vue
# webapp/locales/de.json
# webapp/pages/index.vue
# webapp/pages/profile/_id/_slug.vue
|
2019-05-27 12:34:59 +02:00 |
|
|
|
ce3d16c146
|
fixed test error caused by manual lint error fixing
|
2019-05-23 20:02:56 +02:00 |
|
|
|
5202763dd8
|
frontend lint fixes
|
2019-05-23 19:40:39 +02:00 |
|
Wolfgang Huß
|
8bcb250951
|
Started to rewrite the tests of DeleteModal.vue
|
2019-05-23 10:22:36 +02:00 |
|
Robert Schäfer
|
834473e978
|
Merge pull request #622 from Human-Connection/2019/kw20/fix_post_card_design
🍰 2019/kw20/fix_post_card_design
|
2019-05-21 15:30:44 +02:00 |
|
Wolfgang Huß
|
7e922fa0b0
|
Got the go to Index Page to work on Post Page deletion
|
2019-05-20 07:00:33 +02:00 |
|
Wolfgang Huß
|
8d6e3794cf
|
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment
|
2019-05-20 06:08:55 +02:00 |
|
Wolfgang Huß
|
f5d9bc9ae4
|
First proof of functionality for Delete Comment and Post via DeleteModal
|
2019-05-19 12:54:25 +02:00 |
|
Wolfgang Huß
|
7f83f775a7
|
Clean up the delete-menu stuff for Comments and Posts
|
2019-05-19 08:23:51 +02:00 |
|
Wolfgang Huß
|
2016a9445b
|
Rename confirm callbacks
|
2019-05-19 07:42:55 +02:00 |
|
Wolfgang Huß
|
388e9ff6b2
|
Go ahead with refactoring of DeleteModal in Comments and Posts
|
2019-05-18 15:56:07 +02:00 |
|
Wolfgang Huß
|
9af8c2b46c
|
Refactored handling of DeleteModal in Comments and Posts
|
2019-05-18 12:58:51 +02:00 |
|
|
|
a7fb3f0095
|
linting
|
2019-05-18 12:36:51 +02:00 |
|
|
|
eda58c25e3
|
ribbon tests, ribbon positions, fixed ssr stuff, fied missing language things
|
2019-05-18 12:33:41 +02:00 |
|
Wolfgang Huß
|
8033556145
|
Investigation how to update the Comments List intelligent
|
2019-05-18 07:35:45 +02:00 |
|
|
|
7095e38947
|
fixed post card design
|
2019-05-17 23:10:10 +02:00 |
|
aonomike
|
29c9adc373
|
Refactor to use <img> instead of <hc-image> component for images
|
2019-05-16 16:36:25 +03:00 |
|
Wolfgang Huß
|
1acf109dba
|
Implemented Menus, Unit Tests and created and refactored localisations
|
2019-05-15 16:48:50 +02:00 |
|
|
|
fe386e2355
|
Merge pull request #595 from Human-Connection/delete-posts
Delete posts
|
2019-05-10 16:55:59 +02:00 |
|
|
|
c176ce738a
|
Merge pull request #556 from Human-Connection/554-add-component-test-CommentForm
Write component tests for CommentForm.vue
|
2019-05-10 16:30:54 +02:00 |
|
Matt Rider
|
bb306cad49
|
Update other ds-avatar sizes
|
2019-05-10 10:30:02 -03:00 |
|
Matt Rider
|
c28c51d86f
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 586-deal-with-yarn-warn-due-to-invalid-size-prop
|
2019-05-10 10:20:23 -03:00 |
|
|
|
0712b3c0dc
|
Merge pull request #551 from Human-Connection/2019/kw15/change_password_strength
2019/kw15/change password strength
|
2019-05-10 15:13:22 +02:00 |
|
|
|
d0fb12d7ad
|
fixed comment
|
2019-05-10 14:38:34 +02:00 |
|
|
|
dd8f9deb67
|
fixed lint error, refactored whole modules - its now small and neat!
|
2019-05-10 14:32:21 +02:00 |
|
Robert Schäfer
|
6c5f529d85
|
Couple of corrections
@aonomike use computed properties when possible
|
2019-05-10 13:58:24 +02:00 |
|
Robert Schäfer
|
51ed1604a0
|
Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component
|
2019-05-10 13:42:21 +02:00 |
|
Robert Schäfer
|
1db35be50f
|
Merge remote-tracking branch 'origin/master' into 296-image_component
|
2019-05-10 13:30:06 +02:00 |
|
|
|
15d03f18f7
|
fixed strength meter
|
2019-05-10 12:21:24 +02:00 |
|
Matt Rider
|
0d243b225e
|
Fix lint
- when will this be automated!!!
|
2019-05-09 15:53:01 -03:00 |
|
Matt Rider
|
6e675c74d5
|
Update ds-avatar size to use small
|
2019-05-09 15:34:24 -03:00 |
|
aonomike
|
e55129c64b
|
Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component
|
2019-05-09 21:04:46 +03:00 |
|
aonomike
|
6445c534b4
|
Refactor to pass imageProps as an object without the computed section
|
2019-05-09 21:04:07 +03:00 |
|
Matt Rider
|
71f3dd73aa
|
Update tests
|
2019-05-09 15:03:54 -03:00 |
|
Matt Rider
|
3c8a59c01b
|
Merge branch '2019/kw15/change_password_strength' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength
|
2019-05-09 14:32:36 -03:00 |
|
Matt Rider
|
c0907dd7c5
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength
|
2019-05-09 14:32:29 -03:00 |
|
Matt Rider
|
26f090daa4
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 554-add-component-test-CommentForm
|
2019-05-09 14:05:38 -03:00 |
|
|
|
aa80d7492d
|
Merge branch 'master' into delete-posts
|
2019-05-09 15:05:47 +02:00 |
|
|
|
4fef755caf
|
removed invalid test case
|
2019-05-09 14:43:56 +02:00 |
|
|
|
4a9514c5fb
|
tried to removed duplicate submit call
|
2019-05-09 14:42:12 +02:00 |
|
Matt Rider
|
fdab1e12c2
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component
|
2019-05-08 21:32:08 -03:00 |
|
Matt Rider
|
b8465c914c
|
Update failing test, fix linting
- moved passwordStrength to watch since there was a "unexpected side effect in computed property vue" in lint
- found this SO post https://stackoverflow.com/questions/53757107/handling-unexpected-side-effect-in-computed-properties-vuejs
|
2019-05-08 21:20:58 -03:00 |
|
Matt Rider
|
5058a0c778
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength
|
2019-05-08 20:31:21 -03:00 |
|
aonomike
|
bf57198815
|
Refactor code based on comments from PR review
|
2019-05-09 02:27:03 +03:00 |
|
Daniel Grijalva
|
07bf1b4653
|
comply with tests
|
2019-05-08 13:57:47 -07:00 |
|
Daniel Grijalva
|
87c3f4619e
|
lint fix
|
2019-05-08 13:29:39 -07:00 |
|
Daniel Grijalva
|
885a282b2a
|
Merge branch 'delete-posts' of github.com:danielgrijalva/Human-Connection into delete-posts
|
2019-05-08 12:16:13 -07:00 |
|
Daniel Grijalva
|
6af29c6b8e
|
DeleteModal tests
|
2019-05-08 12:15:48 -07:00 |
|
Matt Rider
|
09a8ad78b8
|
Merge in changes in master from comments PR #536
|
2019-05-07 20:13:41 -03:00 |
|
|
|
48920f8b9d
|
empty strength bar for empty password field
|
2019-05-07 20:41:22 +02:00 |
|