Commit Graph

42 Commits

Author SHA1 Message Date
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
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
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 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 fd171da0dc attempt at making it work 2019-04-13 18:28:50 +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
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
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
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
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
Henry Jameson b18e27c6d4 fix tests, removed one unused function, fix real problem that tests helped to
surface
2019-01-11 03:38:23 +03:00
shpuld 16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
shpuld 85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
Lambda f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
Maxim Filippov 2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Maxim Filippov 828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
Maxim Filippov e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Maxim Filippov 24caa2cfcd Add generateProfileLink 2018-12-13 05:00:01 +03:00
Rinpatch fa7fbe05de Write a unit test for fileSizeFormatService 2018-12-12 20:41:12 +03:00
Roger Braun 024230c7f4 Basic word position and completion service. 2017-03-15 16:22:36 +01:00
Roger Braun ee009f63dd Don't break status parsing when link class is missing. 2016-11-13 00:08:03 +01:00
Roger Braun 05733b6bc9 Remove attachment links, as we are already showing them. 2016-11-12 22:41:43 +01:00