shpuld
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
shpuld
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
Henry Jameson
9f914824cb
i should take it easy
2019-01-25 17:55:56 +03:00
Henry Jameson
eb33951186
hotfix
2019-01-25 16:24:41 +03:00
Henry Jameson
f48e3d0db8
quickfix
2019-01-25 01:39:19 +03: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
416424d048
review
2019-01-24 20:27:20 +03:00
Hakaba Hitoyo
efa0c85ac0
Fix who to follow panel shuffling
2019-01-24 15:17:35 +00: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
shpuld
8761e039d0
Merge dev fix conflicts
2019-01-20 15:52:35 +02:00
shpuld
485a061287
Polish for videos, smaller sizes, remove gif-looping options
2019-01-20 12:46:11 +02: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
Henry Jameson
6c70e9950c
some more post fields
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
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
Henry Jameson
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
Henry Jameson
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
shpuld
e1c3691a72
Add escape button support
2019-01-16 17:27:23 +02:00
Hakaba Hitoyo
05ead45fb7
Show who to follow in the mobile view
2019-01-16 02:33:08 +00:00
lambda
502a76be0a
Merge branch 'summary-html' into 'develop'
...
Sync with backend: Use summary_html.
See merge request pleroma/pleroma-fe!463
2019-01-15 20:16:11 +00:00
shpuld
17735943d5
Add media viewer module and media module component, modify attachment behavior
2019-01-14 19:23:13 +02:00
Henry Jameson
f9fb85ee42
Merge remote-tracking branch 'upstream/develop' into favorites
...
* upstream/develop:
Add Korean translation
Change emptlyTl to take userId
better fix
fixes #265 and also that thin line below gradient on chrome (UGH)
fix #262 part of user profiles not being able to load previous posts
Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson
519f49e29b
separated normalization into a another file, removed catchall and added more stuff
2019-01-13 22:14:55 +03:00
scarlett
de8dfef252
Remove reply detection hack
2019-01-13 13:41:02 +00:00
scarlett
0fd7e7eb68
Sync with backend: Use summary_html.
2019-01-13 13:38:00 +00:00
Henry Jameson
039a407400
some initial work to make it possible to use "unregistered" timelines, i.e. not
...
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03:00
Henry Jameson
ef2585e32b
Remove all explicit and implicit conversions of statusId to number, changed
...
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
Shpuld Shpludson
a51167fa72
Merge branch 'fix-265-fix-user-profiles-again' into 'develop'
...
fixes #265 and also that thin line below gradient on chrome (UGH)
Closes #265
See merge request pleroma/pleroma-fe!456
2019-01-09 20:57:00 +00:00
Henry Jameson
f4b499b044
better fix
2019-01-09 16:31:53 +03:00
Henry Jameson
d13f36a2ad
fixes #265 and also that thin line below gradient on chrome (UGH)
2019-01-09 15:36:09 +03:00
Henry Jameson
0b8f616af1
fix #262 part of user profiles not being able to load previous posts
2019-01-09 14:18:36 +03:00
Hakaba Hitoyo
a60fc390a0
Add instance information page for mobile
2019-01-07 17:26:47 +00:00
Hakaba Hitoyo
702f013225
[Debug] Avoid duplicates in the who to follow panel
2019-01-04 08:43:00 +00:00
rinpatch
c25cf29533
Fix translation typo in registration.vue
2019-01-03 19:42:43 +01:00
Shpuld Shpludson
76cfb15b3c
Merge branch 'feature/replace-panel-switcher' into 'develop'
...
Mobile side drawer
See merge request pleroma/pleroma-fe!443
2018-12-31 17:35:31 +00:00
Shpuld Shpludson
fb8f774383
Fix profiles without statuses not loading
2018-12-31 01:57:22 +00:00
shpuld
354fd32e7b
Fix conflicting styles
2018-12-30 22:41:31 +02:00
shpuld
16c7bd0199
merge develop, fix conflicts, fix logged out bug
2018-12-29 16:25:45 +02:00
lambda
1555a5fef3
Merge branch 'restore-routes' into 'develop'
...
Restore old routes, enable user route as fallback.
See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00