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

1238 Commits

Author SHA1 Message Date
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
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
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
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00
Alina Beck
f53bcba13c use EmotionButton in filter menu 2020-01-15 11:42:12 +03:00
Alina Beck
90d1e50b9e refactor EmotionButton 2020-01-15 11:20:18 +03:00
Alina Beck
e9ad67d39b
Merge branch 'migrate-styleguide-buttons' into button-migration-fixes 2020-01-14 17:04:25 +03:00
mattwr18
84e475fd8a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-13 21:22:58 +01:00
roschaefer
3781ba5d2e Fix LoginForm test and lints 2020-01-11 01:48:19 +01:00
roschaefer
8c29ad947b Update vue-test-utils and follow updated docs 
https://vue-test-utils.vuejs.org/guides/#writing-asynchronous-tests-using-nexttick-new
 2020-01-11 00:37:22 +01:00
mattwr18
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users 
🍰 Search For Users
 2020-01-10 13:59:44 +01:00
mattwr18
84780013f4 Fix cypress tests/start refactor search story 
- Cannot use data-test in cypress tests as we use production image and
data-test are removed to minimize the image. Select based on styleguide
input's class

- Story is still not working because of filter dateTime and
$i18n.locale(), we can fix this later.

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-01-10 12:52:54 +01:00
mattwr18
b2db5e6057 Skip tests for DonationsInfo 
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
 2020-01-10 10:35:12 +01:00
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
Alina Beck
70d632e392 use scss tokens for counter icon and loading spinner 2020-01-09 14:47:14 +05:30
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30