Commit graph

116 commits

Author SHA1 Message Date
Shpuld Shpludson
54b0f90133 Merge branch 'eslint-fix' into 'develop'
Fix shitton warning eslint gives

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

Closes 

See merge request 
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
   - 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 : 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 
2019-03-15 13:14:41 +00:00
dave
8ade93bb4d : update test 2019-03-14 22:36:11 -04:00
dave
06fda27511 : 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 

See merge request 
2019-03-07 16:38:45 +00:00
taehoon
7cb13df8ad Update tests 2019-03-05 14:13:22 -05:00
dave
f5adb62e2e : update defaultState into a function 2019-02-28 14:27:47 -05:00
Edijs
be77707381 Fix unit test 2019-02-10 19:32:01 -07:00
Edijs
7addd408a9 Typo 2019-02-10 12:06:13 -07:00
Edijs
c0b833cb85 Added tag extractor method and spec 2019-02-07 14:46:10 -07:00
shpuld
c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
shpuld
15603981f8 Capture clicks on statuses to hijack mention clicks, match mention href to user somehow 2019-01-30 19:24:47 +02:00
lambda
fcd99ebc5b Merge branch 'fix/make-user-by-name-case-insensitive' into 'develop'
Make userByName case-insensitive

See merge request 
2019-01-28 19:25:25 +00:00
shpuld
a593c2cb8c Make userByName case-insensitive 2019-01-28 21:21:11 +02:00
shpuld
ca78623b34 fix user tl clearing and give it a test 2019-01-28 20:15:00 +02:00
shpuld
51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
shpuld
3978aaef84 Redo everything in the MR 2019-01-26 17:45:03 +02:00
William Pitcock
efad3ad0a5 attempt to fix tests 2019-01-26 13:51:07 +00:00
Henry Jameson
d405bfe6de update test names 2019-01-22 19:58:59 +03:00
Henry Jameson
1e61c8140b tests for the tests god! bugfixes for bugfixes throne! 2019-01-17 20:44:37 +03:00
Henry Jameson
a2ef716f3b consistency in tests too 2019-01-17 19:27:57 +03:00
Henry Jameson
5251de317d Merge branch 'switch-to-string-ids' into favorites
with some changes/merge conflicts resolution

* switch-to-string-ids:
  fixx?????
  fix notifications?
  fix lint
  fix tests, removed one unused function, fix real problem that tests helped to surface
  added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
  Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
Henry Jameson
d7bd294666 migrated some tests to normalizer, fixed some potential bug, fixed tests to use
normalized naming instead of raw qvitter api objects. needs more tests tho.
2019-01-15 18:39:24 +03:00