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

448 Commits

Author SHA1 Message Date
Wolfgang Huß
22b9bf77fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/schema/resolvers/notifications.spec.js
 2019-08-05 10:15:20 +02:00
Robert Schäfer
ffe6dc7736 Add MutationObserver to fix tests 
Our build server failed because of frontend tests. However, all our
fullstack tests are passing... So maybe an issue in our test setup, not
reproducible in a real browser?

This commit:
ee4f132b0f (diff-0806c5f3fdae5e139222967601c7faca)
adds MutationObserver to their test setup. Adding it to our test suites
that touch the `editor` directly fixes our tests, too!

From what I can tell is that prosemirror is calling
`this.observer.takeRecords()`. Probably `tiptap` updated its
dependencies at some point and that's where `this.observer` was
introduced? Hard to tell. It really looks just like an issue only
present in test environments, so I think it's safe not to investigate
any further.
 2019-08-02 14:32:06 +02:00
Wolfgang Huß
6a6f1c5556 Removed submit function at the form 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-31 14:09:04 +02:00
Wolfgang Huß
49f5851d2c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-31 13:14:43 +02:00
Wolfgang Huß
c9ad86c863 Fixed jest tests 2019-07-31 13:11:31 +02:00
Wolfgang Huß
51321df931 In the middle of refactoring the tests 2019-07-31 12:19:47 +02:00
Robert Schäfer
c24452c8a0 Fix console.errors during yarn run test 
@mattwr18 you added `currentUser` in 19b2b7a49 without running the tests,
didn't you?
 2019-07-30 21:13:44 +02:00
Wolfgang Huß
1a1ab418a3 Fix tests and change variable names 2019-07-29 11:01:15 +02:00
Matt Rider
19b2b7a491 Reset branch to master, copy changes to ContributionForm in 2019-07-29 08:45:58 +02:00
ogerly
0c75d6e089 Fix commit 2019-07-24 16:03:10 +02:00
ogerly
77f45c1508 esoolved comments @tirokk 2019-07-24 15:35:08 +02:00
ogerly
063479610e fix lint 2019-07-19 10:28:13 +02:00
ogerly
6e5b277afa commentar delete 2019-07-18 21:19:15 +02:00
ogerly
18fcfb0fd0 Change of css and variables, lint and test ok 2019-07-18 21:06:01 +02:00
Wolfgang Huß
ccae251ad9 Implemented scrollBehavior for better scroll behaviar 
This scrolls even if you go forth and back in the browser.
Corrected URL for notifications in a Post.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-18 16:31:50 +02:00
Wolfgang Huß
744f0cb225 Approach to get scrollBehavior in a useful way. Works, but not fully successful 2019-07-18 08:30:44 +02:00
Wolfgang Huß
0d5471fee4 Try to implement scrollBehavior for Mentions of User in Comment of a Post 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 19:25:03 +02:00
Wolfgang Huß
cd0c509c81 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-16 16:10:36 +02:00
Wolfgang Huß
3b88c47206 Update the contentExcerpt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02:00
Matt Rider
a019c8c311 Revert unintended changes, refactor 
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
 2019-07-16 07:53:57 -03:00
Matt Rider
7de337f96d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-16 07:24:23 -03:00
Wolfgang Huß
9203f7310d Edit Comment content not contentExcerpt 
Comment button now only active, if the comment has changed.
Remove `console.log`.
 2019-07-16 11:48:33 +02:00
Wolfgang Huß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 08:12:40 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress 
- Follow @Tirokk PR review
 2019-07-15 19:09:33 -03:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Matt Rider
bb4532827a Refactor search input, navbar 
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar 
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
Wolfgang Huß
6430c9e1bf Comment can notify a Mention of a User in the database 
Frontend notification is still missing.
 2019-07-15 09:42:24 +02:00
Wolfgang Huß
5aec13caa1 Refactored avoiding Hashtags in Comments 2019-07-15 09:03:09 +02:00
Wolfgang Huß
2c9855e584 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-15 08:30:10 +02:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Matt Rider
c7094d82b8 Fix styling, follow @Tirokk suggestions 2019-07-12 10:37:27 -03:00
Matt Rider
2e97af074c Remove duplicate code 
- was silly for writing so much duplicate code to change the index of the array
- woke up with inspiration
 2019-07-11 07:10:57 -03:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -03:00
Matt Rider
6536574a3b Refactor FilterPosts 
- extract FilterPostsMenuItems to its own component
- update tests accordingly
- add _.chunk from lodash to dry out code
 2019-07-10 17:10:01 -03:00
Wolfgang Huß
1255a46b7a Avoid Hashtags in Comments in the Editor 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-10 18:35:19 +02:00
Robert Schäfer
9a72e7b9e6 Proper null handling 
FYI @mattwr18
 2019-07-10 18:01:18 +02:00
senderfm
acebf94b83 fix lint error 2019-07-10 17:20:08 +02:00
senderfm
f7ec19f960 merge master 2019-07-10 13:58:11 +02:00
senderfm
f870b8ea29 lint ok, specs for too long and too short content and title 2019-07-10 13:30:05 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin 
Signup new users as admin
 2019-07-10 11:46:50 +02:00
senderfm
3481b1f24b maximum number of characters in content without html tags is 2000, characters are counted and number is displayed. regex is strongly shortened. 2019-07-10 09:18:47 +02:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height 
large images are set to maximum height
 2019-07-09 23:21:27 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00