ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

2667 Commits

Author SHA1 Message Date
Alina Beck
0392826211 set avatar size to small in AvatarMenu and for Anonymous users 2020-01-22 18:05:00 +03:00
Alina Beck
38eec0fc5f rename Comment to CommentCard 2020-01-22 17:43:25 +03:00
Alina Beck
e7bf499d37 use BaseCard in Comment component and refactor 2020-01-22 17:37:32 +03:00
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
ogerly
00c0397919 test: specs is not ok 2020-01-22 11:25:44 +01:00
Alina Beck
db422257e4 add BaseCard component 2020-01-22 12:59:46 +03:00
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content 
feat: Convert block/unblock to mute/unmute
 2020-01-21 17:05:09 +01:00
Alina Beck
24898f5fe2 quick fix tests relying on classes of child components 
changing class names in the UserTeaser leads to tests failing for other components, like SearchableInput and NotificationsTable – I just updated the classes but long-term it would be good to find a way to not rely on implementation details of child components – maybe just test if the child component is rendered?
 2020-01-21 17:07:00 +03:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
Alina Beck
e93332b173 display username below slug when there is no date-time 2020-01-21 17:00:20 +03:00
Alina Beck
d20421cb70 clean up UserAvatar a little 2020-01-21 13:26:14 +03:00
Alina Beck
c5af2dbfb4 truncate overflowing user name 2020-01-21 11:58:54 +03:00
ogerly
73b005a900 test: added some test 2020-01-20 11:18:35 +01:00
mattwr18
7b73c990ec Remove unintended changes to class name/comment 2020-01-20 10:19:39 +01:00
mattwr18
1da872ba1e Update SearchableInput spec after rebase 2020-01-20 10:11:48 +01:00
mattwr18
77ef3b0406 Fix failing tests 2020-01-20 10:07:02 +01:00
mattwr18
2cc350936f Update HcUser to UserTeaser 2020-01-20 10:06:31 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions 
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-01-20 10:04:30 +01:00
mattwr18
5c7a6ace08 Refactor 
- Move mouse events to nuxt-link
- use .native
- refactor deprecated slot syntax
 2020-01-20 10:04:30 +01:00
mattwr18
27c23fa9ac Improve styling of User.vue 
- Remove avatar class
- fix competing styles
- follow rscss guidlines
 2020-01-20 10:04:30 +01:00
mattwr18
905f34c827 Support use of initials, add tests, move component 
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
 2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum 
- follow @alina-beck PR review
 2020-01-20 10:04:30 +01:00
mattwr18
b53bf880ee Fix lint 2020-01-16 20:23:36 +01:00
roschaefer
c5a6919833 Merge remote-tracking branch 'origin/master' into 279-blacklist-users-content 2020-01-16 19:48:16 +01:00
roschaefer
4631db0a1b feat(webapp): Display deployed version in footer 
Remove VERSION file in favour of version entry in `package.json`. Parse
this version in our build server scripts.

This commit also introduces `standard-version` which we can use to
generate our `CHANGELOG.md` with `yarn run release`.

close #1831
 2020-01-16 19:24:55 +01:00
mattwr18
5eb42830fd Revert unintended changes to ContributionForm.spec 2020-01-16 15:47:55 +01:00
mattwr18
0a4defe36d Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 14:52:58 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
mattwr18
83491e15c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 13:19:33 +01:00
mattwr18
3686a93878 Add nextTick to CreateUserAccount 
- there were changes that moved vue-test-utils from synchronous to
asynchronous, which means we need to use nextTick before checking
certain attributes.
 2020-01-16 13:15:35 +01:00
mattwr18
6877c9da91 Use new base-button, rename CSS class 2020-01-16 12:29:28 +01:00
mattwr18
3132ac14a1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-16 12:16:15 +01:00
Alexander Friedland
15bd6c5d48
Merge branch 'master' into 1188-Delete_teaser_image 2020-01-16 05:32:27 +01:00
ogerly
a8132d23da fix: spec, delete teasureImage 2020-01-15 20:18:36 +01:00
ogerly
c1743ce1d0 fix: lint, test 2020-01-15 18:58:42 +01:00
ogerly
2e7f774679 fix: lint 2020-01-15 18:49:32 +01:00
ogerly
75753444ea fix: delete picture and thumbnail in post 2020-01-15 18:48:37 +01:00
mattwr18
9e639c23a7 Fix import for newly named/moved component 2020-01-15 18:20:12 +01:00
mattwr18
81cbb7a85c Refactor styling, fix naming convention 
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
 2020-01-15 17:37:54 +01:00
Alina Beck
eaf738c12b replace last instance of ds-button with base-button 2020-01-15 16:13:47 +03:00
Alina Beck
fcbe6125f3 refactor and use base-button in SearchableInput 2020-01-15 16:04:27 +03:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons 
refactor(styleguide): migrate and redesign buttons
 2020-01-15 14:17:06 +03:00
Alina Beck
c108603b8f fix tests and refactor Paginate component 2020-01-15 13:09:36 +03:00
Alina Beck
7c89404da0 fix lint errors in test 2020-01-15 12:15:03 +03:00