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

1087 Commits

Author SHA1 Message Date
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
Wolfgang Huß
2c732bfbfb Refactor create and update comment to emit events 2019-09-09 15:53:50 +02:00
roschaefer
28776d7a6a Avatar should be centered on profile page 
This is a fix of e04eedf0d07ff66dba3e881e9ef8bdf5a868619e
 2019-09-09 15:02:56 +02:00
aonomike
9a6a3a6bea Test clicks on the emotions buttons 
- Add tests for clicks on the emotion button
- Refactor name of TOGGLE_EMOTIONS
 2019-09-09 15:42:10 +03:00
Wolfgang Huß
9f203cda3b Refactor by melting EditCommentForm.vue into CommentForm.vue 2019-09-09 13:06:44 +02:00
Wolfgang Huß
3f4e717163 Move user queries to graphql/User.js 2019-09-09 10:58:10 +02:00
Wolfgang Huß
e544725e87 Remove editPending and SET_EDIT_PENDING from the store 2019-09-09 10:27:21 +02:00
Vasily Belolapotkov
beb78249f6 update follower count on follow/unfollow 2019-09-09 10:01:46 +03:00
mattwr18
48e696dde4 Fix lint 2019-09-09 08:24:33 +02:00
mattwr18
079864a7a9 Add emotions buttons, get it filtering 2019-09-07 12:44:36 +02:00
mattwr18
3b5c02e276 Extract FollowsFilterMenuItems 
- remove now unnecessary FilterPostsMenuItems
 2019-09-07 12:41:19 +02:00
mattwr18
a63e132b41 Extract categories filter into own component 
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
- Co-authored-by: Harald <harald.reingruber@gmx.at>
 2019-09-07 12:38:24 +02:00
mattwr18
30ea892aa1 Allow filter by multiple emotions, test getters 
- Co-authored-by: vardyb <brent.vardy@challengelogic.net>
- Co-aurhored-by: mike aono <aonomike@gmail.com>
 2019-09-07 12:37:03 +02:00
mattwr18
07c58fc03e Add emotions buttons, get it filtering 2019-09-07 12:37:03 +02:00
mattwr18
e81942c6f5 Extract FollowsFilterMenuItems 
- remove now unnecessary FilterPostsMenuItems
 2019-09-07 12:37:03 +02:00
mattwr18
8a3bd6b770 Extract categories filter into own component 
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
- Co-authored-by: Harald <harald.reingruber@gmx.at>
 2019-09-07 12:37:03 +02:00
roschaefer
2ca508ba2f Rename code => nonce in webapp/ 2019-09-06 19:31:04 +02:00
Wolfgang Huß
80d1e03c03
Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user 
1506 Anonymize deleted user also for moderators
 2019-09-06 17:12:31 +02:00
roschaefer
1bd57dfeb8 Fix console.errors in test 2019-09-06 16:42:16 +02:00
roschaefer
1a1f73e53e Fix specs 
Destructuring `isModerator` and calling it in `displayAnonymous` lets
`Notification.spec.js` fail. Adding the getter fixes it.
 2019-09-06 13:43:01 +02:00
roschaefer
e04eedf0d0 Fix and DRY hc-avatar stylings 2019-09-06 13:36:11 +02:00
roschaefer
a053181334 Fix #1506 2019-09-06 13:29:53 +02:00
mattwr18
daf1ae864c Reuse css from ds-card-image, consistent width 
- the width of the contribution form is now the same as the post card
 2019-09-06 13:08:28 +02:00
mattwr18
d3ad06a5f0 Fix preview image craziness 
- depending on the size of the image, the preview looked really blurry
Also, the preview image differed from the image on the PostCard
 2019-09-06 12:17:09 +02:00
Wolfgang Huß
016e60b14c
Merge pull request #1476 from Human-Connection/1393-fix-show-less-bugginess 
1393 fix show less bugginess
 2019-09-05 08:44:40 +02:00
mattwr18
c2c165c362 Fix lint 2019-09-04 18:45:52 +02:00
mattwr18
2bf8247ddd Merge branch 'master' of github.com:Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 18:24:02 +02:00
mattwr18
e5198babf0 Update the tests with comment.content 2019-09-04 18:01:47 +02:00
mattwr18
d42baa5160 Hide show more link if the content is shorter than 180 characters 2019-09-04 17:55:02 +02:00
Wolfgang Huß
0df086e07f Rename variables 2019-09-04 15:38:28 +02:00
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
mattwr18
290bdf5ff4
Merge pull request #1440 from Human-Connection/1414-soft_delete 
1414 Implement soft delete
 2019-09-03 23:59:52 +02:00
roschaefer
5f14b4c45f Fix lint 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
99dd6ea20a Centralize fragments, fix @mattwr18's bugs 
Most of those bugs weren't even introduced in this PR, e.g. the missing
`this.$i18n` for the comments mutations.
 2019-09-03 21:28:29 +02:00
roschaefer
bb3f419532 Refactor graphql queries and fix bug 
It's sometimes unbelievable how many bugs you find when doing
refactoring. This time there was some apparent confusion about
`commentsCount` and `commentedCount`. The counters on the post card were
never showing the correct number.
 2019-09-03 21:28:29 +02:00
roschaefer
933e092549 Fix frontend tests 2019-09-03 21:28:29 +02:00
roschaefer
491a626031 Replace deleteComment with a more KISS solution 2019-09-03 21:28:29 +02:00
mattwr18
31862ad7d8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 19:00:28 +02:00
Robert Schäfer
649c51c705
Merge pull request #1452 from Human-Connection/separate-text-at-words 
Use hyphens to separate words properly
 2019-09-03 18:12:02 +02:00
mattwr18
2d9cd96867 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 17:44:53 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
Matt Rider
accb8ae505 Follow @alina-beck's suggestions 
- set items to the full list of hashtags or users to avoid unnecessarily reassigning the items variable based on suggestionType
- refactor tests to trigger onFilter, which calls filterSuggestionList, then check that it returns a maximum of 15 items both for queries and empty queries
- fix description with incorrect type(users, instead of hashtags)
- return 15 items, not 14
 2019-09-02 15:43:18 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
Matt Rider
cf10b650ae Limit suggestions list to 15, add component tests 2019-09-02 10:42:37 +02:00