Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1953 commits 59 branches 16 tags 15 MiB
Commit graph

1953 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
b7c13fd4b4 Merge branch 'feat/better-perf-side-drawer-anim' into 'develop' 
use translate over margin animation (stupid me)

See merge request pleroma/pleroma-fe!478
 2019-01-27 06:32:21 +00:00
shpuld
474fbf6bf4 use translate over margin animation (stupid me) 2019-01-27 08:27:41 +02:00
Shpuld Shpludson
b82ba54add Merge branch 'feature/media-timeline' into 'develop' 
media timeline

See merge request pleroma/pleroma-fe!472
 2019-01-26 21:11:02 +00:00
William Pitcock
efad3ad0a5 attempt to fix tests 2019-01-26 13:51:07 +00:00
William Pitcock
7b296696a3 user profile: add media timeline 2019-01-26 13:49:24 +00:00
William Pitcock
dbe0205a9c api service: add the ability to fetch a media-only timeline 2019-01-26 13:49:24 +00:00
HJ
8197c77f75 Merge branch 'hotifx-convos' into 'develop' 
Fix ordering in convos

See merge request pleroma/pleroma-fe!477
 2019-01-25 15:00:06 +00:00
Henry Jameson
9f914824cb i should take it easy 2019-01-25 17:55:56 +03:00
HJ
a733a33d36 Merge branch 'hotfix-broken-convos' into 'develop' 
Hotfix broken convos

See merge request pleroma/pleroma-fe!476
 2019-01-25 13:29:24 +00:00
Henry Jameson
eb33951186 hotfix 2019-01-25 16:24:41 +03:00
lambda
28d1571530 Merge branch 'hotfix/summary-html' into 'develop' 
entity normalizer: provide summary_html property

See merge request pleroma/pleroma-fe!475
 2019-01-25 10:10:27 +00:00
William Pitcock
5e68161d91 entity normalizer: provide summary_html property 
Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
 2019-01-25 10:05:19 +00:00
Henry Jameson
f48e3d0db8 quickfix 2019-01-25 01:39:19 +03:00
HJ
63df815dd9 Merge branch 'fixSortingSequentials' into 'develop' 
Fix TL sorting

See merge request pleroma/pleroma-fe!474
 2019-01-24 22:16:26 +00:00
Henry Jameson
9d0d6b86c8 this attempts converting id to number to sort them numerically, since "99" > 
"100" while 99 < 100
 2019-01-25 01:08:08 +03:00
HJ
03ffa7e84e Merge branch 'fix-custom-nsfw-image' into 'develop' 
fix custom nsfwCensorImage not working

See merge request pleroma/pleroma-fe!469
 2019-01-24 18:13:07 +00:00
HJ
8b7faa8106 Merge branch 'favorites-fixes' into 'develop' 
fix reply-to tooltip being somewhat unreliable

See merge request pleroma/pleroma-fe!473
 2019-01-24 18:05:09 +00:00
Henry Jameson
f38da239d9 "spring" cleaning 2019-01-24 21:03:13 +03:00
Henry Jameson
416424d048 review 2019-01-24 20:27:20 +03:00
Shpuld Shpludson
3492ab6697 Merge branch 'fix-who-to-follow-panel-shuffling' into 'develop' 
Fix who to follow panel shuffling

See merge request pleroma/pleroma-fe!470
 2019-01-24 15:17:35 +00:00
Hakaba Hitoyo
efa0c85ac0 Fix who to follow panel shuffling 2019-01-24 15:17:35 +00:00
HJ
9305dad005 Merge branch 'fix/hide-network-setting' into 'develop' 
Always send "hide_network" when updating user profile

See merge request pleroma/pleroma-fe!471
 2019-01-24 12:15:46 +00:00
Maxim Filippov
958557201a Always send "hide_network" when updating user profile 2019-01-23 19:46:35 +03:00
Henry Jameson
ac64e90898 fix custom nsfwCensorImage not working 2019-01-23 00:15:24 +03:00
Henry Jameson
61c9ecd855 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:10:26 +03:00
HJ
c8caa477d7 Revert "fix reply-to tooltip being somewhat unreliable" 
This reverts commit 66dc72deb2
 2019-01-22 21:08:28 +00:00
Henry Jameson
66dc72deb2 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:03:33 +03:00
Henry Jameson
8946ff9838 fix errors in console 2019-01-22 23:57:27 +03:00
HJ
3a3cf1d48a Merge branch 'favorites' into 'develop' 
Add Favorites TL to user profile, add some initial support for MastoAPI

Closes #265 and #262

See merge request pleroma/pleroma-fe!462
 2019-01-22 17:46:08 +00:00
Henry Jameson
92dedcd53e linting 2019-01-22 20:27:49 +03:00
Henry Jameson
d405bfe6de update test names 2019-01-22 19:58:59 +03:00
Henry Jameson
42f8d01b66 confusion 2019-01-21 21:41:17 +03:00
Henry Jameson
031c044297 better handling of attachments 2019-01-21 16:28:36 +03:00
lambda
7651290e2b Merge branch 'referrer-caching-fix' into 'develop' 
Don't use referrerpolicy with media proxy.

See merge request pleroma/pleroma-fe!467
 2019-01-20 10:26:20 +00:00
lain
0ed1828352 Linting. 2019-01-19 14:56:18 +01:00
lain
741ccfdc4a Don't use referrerpolicy with media proxy. 2019-01-19 14:45:56 +01:00
kaniini
d8512bf6eb Merge branch 'develop' into 'develop' 
update logo

See merge request pleroma/pleroma-fe!466
 2019-01-19 07:29:49 +00:00
nik
aed7c7096e update logo 2019-01-18 22:17:38 -06:00
Henry Jameson
d231a45644 support for extended fields (for future, doesn't work yet), fix reply bug 2019-01-19 04:10:16 +03:00
lambda
ee5fd0dd1a Merge branch 'package-updates' into 'develop' 
Upgrade packages

See merge request pleroma/pleroma-fe!461
 2019-01-18 18:50:41 +00:00
lambda
08b277aa8b Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translation

See merge request pleroma/pleroma-fe!465
 2019-01-18 18:50:21 +00:00
Henry Jameson
bac7154bc6 more fields for users 2019-01-17 23:57:24 +03:00
Henry Jameson
6c70e9950c some more post fields 2019-01-17 23:57:24 +03:00
Henry Jameson
af36f4915a support for CW/Subject. fix replies. 2019-01-17 23:57:24 +03:00
Henry Jameson
80a7035154 removing unnecessary conversions since it should already be converted in normalizer 2019-01-17 23:57:24 +03:00
Henry Jameson
8172eeb1e0 fix indents 2019-01-17 23:05:58 +03:00
Henry Jameson
8f4fbf8571 some consistency 2019-01-17 23:01:38 +03:00
Henry Jameson
a680f7d684 localization strings 2019-01-17 22:49:33 +03:00
Henry Jameson
6e219c2961 add support for tab-switcher to automatically switch to first tab if asked index 
is invalid
 2019-01-17 22:46:41 +03:00
Henry Jameson
93cbb58212 fix login and favorites tab... 2019-01-17 22:11:51 +03:00