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
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
