Commit Graph

4863 Commits

Author SHA1 Message Date
dave f1ff48ffd6 #468 - remove unpinned status from timeline 2019-05-15 12:04:24 -04:00
dave 2c89d49a3d #468 - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00
dave e28b19645a #468 - show pin for own statuses only 2019-05-15 12:04:24 -04:00
dave 1aa0e8d7e0 #468 - pin/unpin status 2019-05-15 12:04:24 -04:00
dave b491e6acbe #468 - add pin icon 2019-05-15 12:04:24 -04:00
dave affbe8700e #468 - integrate endpoints 2019-05-15 12:04:24 -04:00
HJ 9eac355851 Merge branch '539' into 'develop'
Show post reply button and count when logged out as well

Closes #539

See merge request pleroma/pleroma-fe!793
2019-05-15 15:55:17 +00:00
tarteka bacbfc1154 Update es.json 2019-05-15 09:16:49 +00:00
taehoon 5e0235fa63 make reply icon not hoverable if disabled 2019-05-14 22:45:57 -04:00
taehoon 731ad0a48b show reply button and count when logged out as well 2019-05-14 22:44:56 -04:00
Henry Jameson 543604fd2d removed unused masto api, added initial version of interactions timeline 2019-05-14 22:48:44 +03:00
Henry Jameson 04fa2aefb3 get rid of reply-left, we decided it should go long time ago 2019-05-14 19:49:03 +03:00
Henry Jameson addeb85220 fix prod build 2019-05-13 21:54:25 +03:00
Henry Jameson 750dca4a10 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (116 commits)
  Fix small mistake in Polish translation
  link interaction avatars to the user profile
  Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
  use backendInteractor
  refactor api service functions using new helper
  clean up
  update favorite number earlier
  update status interaction upon retweet action response
  sync up favoritedBy with favorite/unfavorite action
  do not regenerate status object
  reduce needless calculation
  Move scope visibility notice to the status form, make it dismissible
  Revert "eliminate expandable prop in favor of inConversation"
  status attention doesn’t have relationship entities
  make it short
  fix wrong inlineExpanded
  expanded is always false, eliminate it
  eliminate expandable prop in favor of inConversation
  fix conversationId comparision bug using integer format
  Display additional scope description above the status form for mobile users.
  ...
2019-05-13 20:38:54 +03:00
HJ 2322610b62 Merge branch 'patch-3' into 'develop'
Fix small mistake in Polish translation

See merge request pleroma/pleroma-fe!790
2019-05-10 07:49:35 +00:00
Marcin Mikołajczak caf9e627a7 Fix small mistake in Polish translation 2019-05-10 06:52:01 +00:00
HJ cd67b1f496 Merge branch '527' into 'develop'
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"

Closes #527

See merge request pleroma/pleroma-fe!787
2019-05-09 17:17:26 +00:00
HJ 177e53cf6a Merge branch 'mobile-scope' into 'develop'
Display additional scope description above the status form for mobile users.

Closes #505

See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
HJ d5d7658418 Merge branch '530' into 'develop'
Link interaction avatars to the user profile

Closes #530

See merge request pleroma/pleroma-fe!788
2019-05-08 19:40:08 +00:00
taehoon 31e14cd45d link interaction avatars to the user profile 2019-05-08 12:04:33 -04:00
eugenijm a89010843d Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice. 2019-05-08 16:50:39 +03:00
taehoon 7d60ab322e use backendInteractor 2019-05-07 23:36:35 -04:00
taehoon 26131266a9 refactor api service functions using new helper 2019-05-07 23:27:22 -04:00
taehoon a54cf47ba5 clean up 2019-05-07 23:21:19 -04:00
taehoon 28c2a700e1 update favorite number earlier 2019-05-07 23:19:46 -04:00
taehoon ff3a7e8b5b update status interaction upon retweet action response 2019-05-07 23:17:52 -04:00
taehoon f75e40e462 sync up favoritedBy with favorite/unfavorite action 2019-05-07 16:43:54 -04:00
taehoon 78a4ab98af do not regenerate status object 2019-05-07 16:20:24 -04:00
taehoon 9a9d66dca1 reduce needless calculation 2019-05-07 15:54:49 -04:00
HJ 157d4e601e Merge branch 'fix/floating-button' into 'develop'
Mobile Post button fix

Closes #506

See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
Shpuld Shpludson 496ccd0bb3 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!784
2019-05-07 17:35:28 +00:00
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
eugenijm 4af343374a Move scope visibility notice to the status form, make it dismissible 2019-05-07 19:13:45 +03: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
eugenijm befaa477a3 Display additional scope description above the status form for mobile users. 2019-05-06 18:10:58 +03:00
tarteka bfd25a5c3f Update es.json 2019-05-06 08:38:24 +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