Commit Graph

137 Commits

Author SHA1 Message Date
seven cb92865dac upgrade babel-register 2019-12-11 14:22:11 +05:00
taehoon d37caeeded add html-webpack-plugin to karma config 2019-12-03 14:40:51 -05:00
HJ 0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop'
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
kPherox a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
Henry Jameson bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
Henry Jameson b66564a30d Merge remote-tracking branch 'upstream/develop' into settings-refactor
* upstream/develop: (89 commits)
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  fix popper go behind the top bar
  migrate Popper to v-popover
  fix popper go behind the top bar
  fix eslint warnings
  reset font-size to normal text size using rem
  use top placement by default
  hide status preview popper when hover popper content
  ...
2019-10-29 09:36:16 +02:00
Henry Jameson 0be86304d2 Fix tests, more replacing with mergedConfig 2019-10-06 23:28:30 +03:00
Henry Jameson a2923570c3 fix regex shortcode problem 2019-09-30 23:45:03 +03:00
kaniini 4369ce6f1b Merge branch 'hide-followers-follows-count' into 'develop'
Added a setting to hide follow/follower count from the user profile

See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00:00
Henry Jameson 836cb817d1 fix tests 2019-09-25 20:54:07 +03:00
Henry Jameson 7b4cb38734 split spam mode into two separate options (one in settings page) 2019-09-23 20:36:49 +03:00
eugenijm aafb29c589 Added a setting to hide follow/follower count from the user profile 2019-09-23 16:19:21 +03:00
Henry Jameson db961af3c8 unit test for emoji input, for now covering only insertion mechanism 2019-09-15 16:01:57 +03:00
Henry Jameson 0d8b68632b Remove emoji zoom 2019-09-12 20:25:11 +03:00
Henry Jameson 9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
taehoon 18a41e785e update unit test 2019-07-28 16:55:34 -04:00
taehoon d785ed5a05 rewrite unit tests 2019-07-25 23:34:56 -04:00
taehoon a443a5203e add more unit tests for elimination logic 2019-07-25 14:17:48 -04:00
taehoon 65ef039316 add unit test for elimination logic 2019-07-25 08:03:41 -04:00
Shpuld Shpludson 54b0f90133 Merge branch 'eslint-fix' into 'develop'
Fix shitton warning eslint gives

See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson c8794b2b84 Merge branch '580' into 'develop'
Fix backend version string parsing

Closes #580

See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Eugenij 14ec12b4f6 Set hide_follows and hide_followers settings when parsing Mastodon format 2019-07-07 10:20:55 +00:00
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
HJ 8f53796420 Merge branch 'develop' into 'eslint-fix'
# Conflicts:
#   src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
taehoon c712754150 add unit tests 2019-07-05 13:38:52 -04:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
taehoon d8e210df4d update test for clearTimeline action 2019-07-02 15:07:18 -04:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Henry Jameson 52475dbf23 Fix pipelines and clean up console output 2019-05-21 21:22:00 +03:00
Henry Jameson 3e68514981 fix tests 2019-04-28 20:46:01 +03:00
Henry Jameson e0247e21f6 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (126 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
2019-04-27 12:26:17 +03:00
Henry Jameson 2b5cf61a8f firefox 2019-04-24 21:53:51 +03:00
Henry Jameson fd171da0dc attempt at making it work 2019-04-13 18:28:50 +03:00
Henry Jameson 77db9c5c69 karma stuff, still broken tho 2019-04-10 22:36:37 +03:00
Henry Jameson 262760d258 revert unnecessary changes 2019-04-10 21:48:42 +03:00
Henry Jameson 9108737d55 Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting. 2019-04-07 20:33:11 +03:00
dave 783cc00dd0 merge develop & resolve conflict 2019-03-29 10:11:28 -04:00
shpuld c50e64f8ee Add tests for gesture service, fix bug with perpendicular directions 2019-03-26 22:11:45 +02:00
dave 55d7bd6d4e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-18 10:37:26 -04:00
Henry Jameson 30c0cafff1 Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis
* upstream/develop: (34 commits)
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  actually use embedded relationship if it's present
  instead of filtering nulls, let's just not have them in the first place
  #434 - fix plain text issue
  Add floating post-status button on mobile
  Update user settings icon to pencil
  I18n: Update Czech translation
  user_card.vue: Copy over .status-content img styling
  ...
2019-03-17 13:32:56 +02:00
dave e5786f32a7 #436: merge develop 2019-03-15 11:28:33 -04:00
HJ 9364964b01 Merge branch 'mastoapi/user-stuff' into 'develop'
Transition to MastoAPI: user data

See merge request pleroma/pleroma-fe!655
2019-03-15 13:14:41 +00:00
dave 8ade93bb4d #436: update test 2019-03-14 22:36:11 -04:00
dave 06fda27511 #436: update unit testing 2019-03-14 08:06:40 -04:00
Henry Jameson 4efcda1b41 Added some tests 2019-03-11 22:41:08 +02:00
Henry Jameson 06d39b62a8 fixed tests, review fixes, now storing local users with downcase screen name for
better compatibility
2019-03-11 02:17:58 +02:00
shpuld 70d7ed3607 Make minId reset with minVisibleId to prevent gaps when showing new 2019-03-10 22:40:48 +02:00
Henry Jameson f3a9200b7c some test fixes, disabled one test for now since logic now is even more async in general 2019-03-09 02:47:20 +02:00
Henry Jameson 4f3a220487 Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna
just fetching it over QvitterAPI real quick :DDDDDDDDD
2019-03-08 22:40:57 +02:00
Shpuld Shpludson 09736691ea Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS

Closes #420

See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00