9f914824cb
i should take it easy
2019-01-25 17:55:56 +03:00
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
eb33951186
hotfix
2019-01-25 16:24:41 +03:00
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
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
f48e3d0db8
quickfix
2019-01-25 01:39:19 +03:00
63df815dd9
Merge branch 'fixSortingSequentials' into 'develop'
...
Fix TL sorting
See merge request pleroma/pleroma-fe!474
2019-01-24 22:16:26 +00:00
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
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
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
f38da239d9
"spring" cleaning
2019-01-24 21:03:13 +03:00
416424d048
review
2019-01-24 20:27:20 +03:00
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
efa0c85ac0
Fix who to follow panel shuffling
2019-01-24 15:17:35 +00:00
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
958557201a
Always send "hide_network" when updating user profile
2019-01-23 19:46:35 +03:00
ac64e90898
fix custom nsfwCensorImage not working
2019-01-23 00:15:24 +03:00
61c9ecd855
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:10:26 +03:00
c8caa477d7
Revert "fix reply-to tooltip being somewhat unreliable"
...
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
66dc72deb2
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:03:33 +03:00
8946ff9838
fix errors in console
2019-01-22 23:57:27 +03:00
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
92dedcd53e
linting
2019-01-22 20:27:49 +03:00
d405bfe6de
update test names
2019-01-22 19:58:59 +03:00
42f8d01b66
confusion
2019-01-21 21:41:17 +03:00
031c044297
better handling of attachments
2019-01-21 16:28:36 +03:00
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
0ed1828352
Linting.
2019-01-19 14:56:18 +01:00
741ccfdc4a
Don't use referrerpolicy with media proxy.
2019-01-19 14:45:56 +01:00
d8512bf6eb
Merge branch 'develop' into 'develop'
...
update logo
See merge request pleroma/pleroma-fe!466
2019-01-19 07:29:49 +00:00
aed7c7096e
update logo
2019-01-18 22:17:38 -06:00
d231a45644
support for extended fields (for future, doesn't work yet), fix reply bug
2019-01-19 04:10:16 +03:00
ee5fd0dd1a
Merge branch 'package-updates' into 'develop'
...
Upgrade packages
See merge request pleroma/pleroma-fe!461
2019-01-18 18:50:41 +00:00
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
bac7154bc6
more fields for users
2019-01-17 23:57:24 +03:00
6c70e9950c
some more post fields
2019-01-17 23:57:24 +03:00
af36f4915a
support for CW/Subject. fix replies.
2019-01-17 23:57:24 +03:00
80a7035154
removing unnecessary conversions since it should already be converted in normalizer
2019-01-17 23:57:24 +03:00
8172eeb1e0
fix indents
2019-01-17 23:05:58 +03:00
8f4fbf8571
some consistency
2019-01-17 23:01:38 +03:00
a680f7d684
localization strings
2019-01-17 22:49:33 +03:00
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
93cbb58212
fix login and favorites tab...
2019-01-17 22:11:51 +03:00
cab87744c8
Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"
...
and some stuff to make favorites still work
This reverts commit 039a407400
2019-01-17 21:46:03 +03:00
0f8baff5a3
forgot the file
2019-01-17 21:26:02 +03:00
1e61c8140b
tests for the tests god! bugfixes for bugfixes throne!
2019-01-17 20:44:37 +03:00
a2ef716f3b
consistency in tests too
2019-01-17 19:27:57 +03:00
9682ee66ce
added conversions to ids for consistency from the get-go
2019-01-17 19:23:14 +03:00
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
387bf794ff
fixx?????
2019-01-16 18:52:30 +03:00
Henry Jameson