Commit Graph

2946 Commits

Author SHA1 Message Date
Shpuld Shpludson 58ef6258d6 Merge branch '515' into 'develop'
Fix broken filtering for replies in the timeline

Closes #515

See merge request pleroma/pleroma-fe!786
2019-05-07 17:33:56 +00:00
taehoon 917e82e8ee Revert "eliminate expandable prop in favor of inConversation"
This reverts commit 1455e1f9d5.
2019-05-06 21:36:55 -04:00
taehoon 134b1894d6 status attention doesn’t have relationship entities 2019-05-06 16:41:12 -04:00
taehoon 44a18eb838 make it short 2019-05-06 16:17:29 -04:00
taehoon 1a3799bfac fix wrong inlineExpanded 2019-05-06 16:16:43 -04:00
taehoon 3adfbc0357 expanded is always false, eliminate it 2019-05-06 15:30:36 -04:00
taehoon 1455e1f9d5 eliminate expandable prop in favor of inConversation 2019-05-06 15:29:24 -04:00
Shpuld Shpludson 081f9a926a Merge branch '519' into 'develop'
Fix conversationId comparison bug using integer format

Closes #519

See merge request pleroma/pleroma-fe!781
2019-05-06 17:33:15 +00:00
taehoon a27a2f78ac fix conversationId comparision bug using integer format 2019-05-06 13:24:11 -04:00
Shpuld Shpludson 01552d0b45 Merge branch '520' into 'develop'
Fix Tweet input box wiped bug when window's width shrunk

Closes #520

See merge request pleroma/pleroma-fe!783
2019-05-06 17:13:47 +00:00
taehoon 489927bdc9 toggle showing new status form instead of toggle mouting 2019-05-05 23:00:45 -04:00
Shpuld Shpludson 4819009d21 Merge branch '523' into 'develop'
Make sure media modal to be on top of reporting modal

Closes #523

See merge request pleroma/pleroma-fe!782
2019-05-05 18:32:50 +00:00
taehoon bc41a7b305 make sure media modal to be above reporting modal 2019-05-05 13:48:25 -04:00
HJ 8e1c5841e9 Merge branch '441-reporting' into 'develop'
Reporting

Closes #441

See merge request pleroma/pleroma-fe!695
2019-05-04 13:59:27 +00:00
taehoon 9787d99672 update api services 2019-05-03 11:40:06 -04:00
taehoon 220a7e89d5 use native scrollbar 2019-05-03 11:40:06 -04:00
taehoon abad528dd4 refactor using List component 2019-05-03 11:40:06 -04:00
taehoon 8561bf6612 remove transition css 2019-05-03 11:40:06 -04:00
taehoon 19a0476985 update api endpoint url 2019-05-03 11:40:06 -04:00
taehoon ddc7c870f4 rewrite checkbox component 2019-05-03 11:40:06 -04:00
taehoon 58a420f2b3 fix panel title overflow issue in mobile 2019-05-03 11:40:06 -04:00
taehoon 0bb8247822 fix double scrollbar display bug in mobile 2019-05-03 11:40:06 -04:00
taehoon e97f8a4728 prevent parent scroll 2019-05-03 11:40:06 -04:00
taehoon 6b1e305a18 use custom scrollbar 2019-05-03 11:40:06 -04:00
taehoon 01cc7e4480 modal style improvements 2019-05-03 11:40:06 -04:00
taehoon 2e6eab51b8 Update promisedRequest helper to support json payload 2019-05-03 11:40:06 -04:00
taehoon f364068e10 Improve mobile layout 2019-05-03 11:40:06 -04:00
taehoon 91502a25a4 Add a css class to the checkbox indicator 2019-05-03 11:40:06 -04:00
taehoon cf72ebb407 update copy 2019-05-03 11:40:05 -04:00
taehoon 5d0bae5569 update generic error message 2019-05-03 11:40:05 -04:00
taehoon d115d98a1b add translations 2019-05-03 11:40:05 -04:00
taehoon 471085f0f3 add error message 2019-05-03 11:40:05 -04:00
taehoon dfc56dfee2 reset modal state if api request is completed 2019-05-03 11:40:05 -04:00
taehoon 1b07c6ae4f add processing state and close modal after api request is completed 2019-05-03 11:40:05 -04:00
taehoon 1878e56c16 reset modal state when userId is changed 2019-05-03 11:40:05 -04:00
taehoon 02d169b92c add promisedRequest helper 2019-05-03 11:40:05 -04:00
taehoon cea6ea42f0 add api service function 2019-05-03 11:40:05 -04:00
taehoon 2cda9010df add user reporting modal 2019-05-03 11:40:05 -04:00
Shpuld Shpludson 0438031da4 Merge branch 'develop' into 'develop'
[i18n]Update oc.json

See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
Shpuld Shpludson 513613a4b2 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!779
2019-05-03 14:56:45 +00:00
Shpuld Shpludson b47820905c Merge branch '516-autoload' into 'develop'
Autoload older notifications when scrolled to the bottom

Closes #516

See merge request pleroma/pleroma-fe!780
2019-05-03 14:47:54 +00:00
taehoon 6ae3c1cfcf autoload older notifications when scrolled to the bottom 2019-05-03 07:52:22 -04:00
tarteka 09253420a2 Update es.json 2019-05-03 00:22:14 +00:00
Shpuld Shpludson b4122c1003 Merge branch '502-notification' into 'develop'
Fix notifications div scrolling issue on mobile

Closes #502

See merge request pleroma/pleroma-fe!778
2019-05-02 16:19:56 +00:00
taehoon f8ae631d8c fix notifications div scrolling issue on mobile 2019-05-02 08:21:02 -04:00
HJ 2d07f26dd7 Merge branch 'feat/title-alt-for-avatars' into 'develop'
#513 Title/alt for avatars

See merge request pleroma/pleroma-fe!776
2019-05-01 20:30:40 +00:00
Exilat b98bab52a9 Update oc.json 2019-05-01 16:40:40 +00:00
shpuld c44c048356 add title and alt for avatars, fix console errors in avatarlist 2019-05-01 17:33:56 +03:00
HJ a954f56e34 Merge branch 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' into 'develop'
Show favoriting and repeating users in hilighted status

See merge request pleroma/pleroma-fe!768
2019-04-30 17:39:33 +00:00
Shpuld Shpludson b1bd5bd08e Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
# Conflicts:
#   src/services/api/api.service.js
2019-04-30 15:11:30 +00:00