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
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
ogerly
8edb551c15
ready to be merged or rebased
2020-01-15 07:40:01 +01:00
ogerly
9d09dae2f4
slug from editor comands set
2020-01-14 18:36:35 +01: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
mattwr18
5d5574b1b5
Blocked users cannot comment on my posts
2020-01-09 16:07:25 +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
mattwr18
ba3e9e1025
Rename blacklist/whitelist to mute/unmute
...
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
Alina Beck
53a504010c
allow overflow for notifications counter
2020-01-08 14:28:21 +05:30
Alina Beck
cc38fa2b0a
make content-menu clickable on post-card
2020-01-08 13:49:07 +05:30
mattwr18
c297b83f87
Convert block/unblock to blacklist/whitelist
...
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7
improved specs
2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea
removed Hashtag search
2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0
remove console
2020-01-07 06:02:19 +01:00
