fristi/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
2185 commits 11 branches 24 tags 20 MiB
Commit graph

1822 commits

Author SHA1 Message Date
shpuld
aaa5f1a638 Adjust margins for attachments/previews 2019-01-30 21:41:07 +02:00
shpuld
c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
lambda
b1facdf7ad Merge branch 'fix/timeline-too-eager-flush' into 'develop' 
Fix #290 Add a better check for fresh TL flushing

Closes #290

See merge request pleroma/pleroma-fe!494
 2019-01-30 17:51:12 +00:00
lambda
1717e70046 Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop' 
fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496
 2019-01-30 17:49:27 +00:00
lambda
0bd77149a0 Merge branch 'fix/tall-statuses-v2' into 'develop' 
More tall status related fixes that I didn't know was borkd

See merge request pleroma/pleroma-fe!498
 2019-01-30 17:47:46 +00:00
lambda
d0df98f99b Merge branch 'fix/reply-to-using-wrong-id' into 'develop' 
Fix #295 reply-to link pointing to wrong id

Closes #295

See merge request pleroma/pleroma-fe!499
 2019-01-30 17:46:52 +00:00
lambda
7b0e3dc471 Merge branch 'feat/make-mentions-use-internal-routing' into 'develop' 
Fix #289 Make more user links use internal routing

Closes #289

See merge request pleroma/pleroma-fe!500
 2019-01-30 17:46:18 +00:00
shpuld
15603981f8 Capture clicks on statuses to hijack mention clicks, match mention href to user somehow 2019-01-30 19:24:47 +02:00
shpuld
16a5272726 Fix a simple typo 2019-01-30 16:57:19 +02:00
shpuld
0a39159fdf Adjust scrolling logic and document it, make sure to never show 'show less' if it's not a tall status 2019-01-30 16:38:28 +02:00
Maxim Filippov
298cea8f6d Split hide_network into hide_followers & hide_followings 2019-01-30 01:11:40 +03:00
shpuld
7666d50d8a Change panel-footing style to be more fitting 2019-01-29 21:11:00 +02:00
shpuld
62e9525724 Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses 2019-01-29 21:04:52 +02:00
shpuld
0a0dffa793 Fix favs timeline fetching when opening profile via direct url 2019-01-29 19:12:47 +02:00
shpuld
89bfc41174 Add a better check for fresh TL flushing 2019-01-29 18:40:49 +02:00
lambda
3cfbf0141f Merge branch 'fix/nav-panel-shadow' into 'develop' 
Add missing shadow to nav panel

See merge request pleroma/pleroma-fe!491
 2019-01-29 15:57:52 +00:00
lambda
bd6c446b33 Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop' 
fix #288 - Don't connect WS when chat is disabled

Closes #288

See merge request pleroma/pleroma-fe!492
 2019-01-29 15:57:36 +00:00
shpuld
b042c48fa7 Fix TypeError crash when using url of an invalid user 2019-01-29 17:38:55 +02:00
shpuld
41c4d59341 Connect only after-store instead of when user gets token 2019-01-29 17:16:25 +02:00
shpuld
1f3cf6d1fc add missing shadow to nav panel 2019-01-29 16:32:34 +02:00
lambda
4185452b52 Merge branch 'feature/link-preview' into 'develop' 
link previews

See merge request pleroma/pleroma-fe!481
 2019-01-29 14:12:18 +00:00
lambda
de91998317 Merge branch 'fix/tall-status-handling' into 'develop' 
Tall status fixes/improvements

See merge request pleroma/pleroma-fe!490
 2019-01-28 20:09:40 +00:00
shpuld
c3a931610a remove log 2019-01-28 22:03:25 +02:00
shpuld
0460728a8c Fix tall status expanding needing extra clicks, make tall status expand automatically in conversation when focused 2019-01-28 21:59:17 +02:00
lambda
fcd99ebc5b Merge branch 'fix/make-user-by-name-case-insensitive' into 'develop' 
Make userByName case-insensitive

See merge request pleroma/pleroma-fe!489
 2019-01-28 19:25:25 +00:00
shpuld
a593c2cb8c Make userByName case-insensitive 2019-01-28 21:21:11 +02:00
shpuld
ca78623b34 fix user tl clearing and give it a test 2019-01-28 20:15:00 +02:00
shpuld
51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
lambda
bb2ee04f04 Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop' 
fix/don't fetch favs if the profile isnt current user

See merge request pleroma/pleroma-fe!484
 2019-01-28 16:22:03 +00:00
shpuld
4d3907b86a Formatting 2019-01-28 17:48:00 +02:00
shpuld
1b76a5a9ea Add back that login error thing that someone removed 2019-01-28 17:43:51 +02:00
shpuld
82ef57cd59 dont fetch favs if profile isnt us 2019-01-28 16:59:01 +02:00
lambda
3b1cafc19f Merge branch 'fix/fix-warnings' into 'develop' 
Fix annoying console warnings

See merge request pleroma/pleroma-fe!480
 2019-01-28 10:52:24 +00:00
shpuld
96c36af731 refactor the FE parts 2019-01-28 05:50:12 +00:00
William Pitcock
2b86f6e883 status: only show link preview in main post view 2019-01-28 05:50:12 +00:00
William Pitcock
0924907c64 add link-preview component 2019-01-28 05:50:12 +00:00
William Pitcock
b27ec058ca entity normalizer: add support for opengraph cards 2019-01-28 05:50:12 +00:00
Shpuld Shpludson
2585dfa4c2 Merge branch 'develop' into 'develop' 
Add Dutch translation

See merge request pleroma/pleroma-fe!482
 2019-01-28 04:32:55 +00:00
lain
e4303da372 Properly handle websocket token (fixes chat). 2019-01-27 21:38:33 +01:00
spctrl
d40a2f0429 Add Dutch translation 2019-01-27 19:44:17 +01:00
Shpuld Shpludson
6e945ee14b Merge branch 'fix/following-status-on-usercard' into 'develop' 
Fix follow-button on usercard not showing following status correctly

See merge request pleroma/pleroma-fe!479
 2019-01-27 14:14:59 +00:00
shpuld
b9142e6fac Move following to qvitter only space 2019-01-27 16:10:55 +02:00
shpuld
20f113e811 Remove logs 2019-01-27 11:35:29 +02:00
shpuld
ff5f5095df Fix replies to deleted posts/users pushing vue warnings 2019-01-27 11:31:23 +02:00
shpuld
2d94a49798 Fix registration path warning and translation warnings 2019-01-27 11:13:32 +02:00
shpuld
4c9f3b946d Add forgotten prop to entity normalizer 2019-01-27 08:42:34 +02:00
shpuld
474fbf6bf4 use translate over margin animation (stupid me) 2019-01-27 08:27:41 +02:00
shpuld
676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
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
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
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
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
Hakaba Hitoyo
efa0c85ac0 Fix who to follow panel shuffling 2019-01-24 15:17:35 +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
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
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
d231a45644 support for extended fields (for future, doesn't work yet), fix reply bug 2019-01-19 04:10:16 +03: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
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
1e61c8140b tests for the tests god! bugfixes for bugfixes throne! 2019-01-17 20:44:37 +03:00
Henry Jameson
9682ee66ce added conversions to ids for consistency from the get-go 2019-01-17 19:23:14 +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
Henry Jameson
387bf794ff fixx????? 2019-01-16 18:52:30 +03:00
shpuld
e1c3691a72 Add escape button support 2019-01-16 17:27:23 +02:00
Henry Jameson
7d15720339 fix notifications? 2019-01-16 17:30:47 +03:00
hakabahitoyo
fc83d76ab5 update japanese translation 2019-01-16 18:14:15 +09: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
Henry Jameson
d7bd294666 migrated some tests to normalizer, fixed some potential bug, fixed tests to use 
normalized naming instead of raw qvitter api objects. needs more tests tho.
 2019-01-15 18:39:24 +03:00
Henry Jameson
966a9e78af cleanup 2019-01-14 22:59:44 +03:00
Henry Jameson
fd27c78c4b fixes, guards 2019-01-14 22:58:23 +03:00
Henry Jameson
790fcf37d2 notifications now also undergo some parsing, hypothetically could use MastoAPI 
notifications, maybe.
 2019-01-14 22:38:37 +03:00
shpuld
17735943d5 Add media viewer module and media module component, modify attachment behavior 2019-01-14 19:23:13 +02:00
Henry Jameson
e0fd6d12ed user normalizer works 2019-01-14 15:30:14 +03:00
Henry Jameson
5a3c9cfc9b post-merge fix 2019-01-13 22:25:48 +03: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
4be737b4df moved some stuff from statuses to api service. added initial adapter (currently 
mastoapi status -> qvitter status, would change some naming in the future)

favorites timeline works somewhat, notifications are broken because they are
fetched using same code to fetch usual timeline/using old architechture
 2019-01-13 01:26:24 +03: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
22e0686395 fix lint 2019-01-11 03:41:57 +03:00
Henry Jameson
b18e27c6d4 fix tests, removed one unused function, fix real problem that tests helped to 
surface
 2019-01-11 03:38:23 +03:00
Henry Jameson
48e811e6ed added some more explicit to string conversion since BE seem to be sending 
numbers and it could cause an issue.
 2019-01-11 03:00:11 +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
kjwon15
d4eb3cb36b Add Korean translation 2019-01-10 14:56:05 +09: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
Shpuld Shpludson
499c6b85d4 Merge branch 'fix/user-timeline-not-loading' into 'develop' 
Fix #262 user timelines bugging

Closes #262

See merge request pleroma/pleroma-fe!454
 2019-01-09 20:56:09 +00:00
shpuld
b8b18b198d Change emptlyTl to take userId 2019-01-09 22:19:02 +02: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
shpuld
a8f6099be2 Retain userId on clearing user timeline, don't flush when empty timeline 2019-01-08 23:09:03 +02: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
Shpuld Shpludson
35d75be1d6 Merge branch 'develop' into 'develop' 
updated German translation

See merge request pleroma/pleroma-fe!449
 2019-01-03 21:00:21 +00:00
Vinzenz Vietzke
681b4e665d updated German translation 
* added theme settings
 * added various missing single strings
 2019-01-03 19:53:53 +01: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
ace042015e Remove commented out back button 2018-12-29 23:42:01 +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
shpuld
747e4090ca Cleanup and remove divider element in side drawer 2018-12-29 12:44:21 +02:00
shpuld
650655709d fix conflict in user card content 2018-12-28 21:44:09 +02:00
shpuld
85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
Maxim Filippov
0f530de397 Add "noAttachmentLinks" to src/modules/instance.js 2018-12-27 19:59:56 +03:00
Maxim Filippov
85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
Maxim Filippov
13855f46e2 No attachment links 2018-12-27 02:37:36 +03:00
HJ
754cb23f35 Merge branch 'improve_push' into 'develop' 
Improve web push notifications

Closes #231

See merge request pleroma/pleroma-fe!438
 2018-12-26 13:58:11 +00:00
Lambda
f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
HJ
fa8ecb1c39 User Card Content fixes and updates 2018-12-26 09:19:25 +00:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Egor Kislitsyn
c5847349e0 improve web push notifications 2018-12-25 20:43:18 +07:00
HJ
0ad837846a Merge branch 'push_fix' into 'develop' 
Fixes for push notifications

Closes #235

See merge request pleroma/pleroma-fe!433
 2018-12-25 11:33:00 +00:00
Henry Jameson
500b4bd374 fix 2018-12-25 14:28:49 +03:00
Hakaba Hitoyo
8ae3518a9a Update japanese translation 2018-12-25 09:03:05 +00:00
HJ
a80c8fd24c Merge branch 'refactor-recommendations' into 'develop' 
remove unneeded numbered variables who_to_follow

See merge request pleroma/pleroma-fe!436
 2018-12-25 02:35:30 +00:00
Hannah Ward
ed2393c970
fix inconsistencies within who_to_follow_panel 2018-12-25 01:32:20 +00:00
HJ
698328dfbe Merge branch 'fix_textfields' into 'develop' 
Fix textarea not resizing correctly and probably cursor position

Closes #230

See merge request pleroma/pleroma-fe!430
 2018-12-25 01:29:18 +00:00
Henry Jameson
18d7684f32 fix for non-shrinking main post form 2018-12-25 04:25:19 +03:00
Henry Jameson
e3cac42cc7 Merge remote-tracking branch 'upstream/develop' into push_fix 
* upstream/develop:
  Add a translation to the captcha strings in the registration form
  Small UI improvements for the CAPTCHA field
  Add encrypted captcha_answer_data for stateless captcha
  fixes many problems related to user profile
 2018-12-25 03:46:51 +03:00
Henry Jameson
a4f0902926 small refactor, added push unsub notice for BE 2018-12-25 03:46:19 +03:00
Hannah Ward
6fa993c122
remove unneeded numbered variables who_to_follow 2018-12-25 00:34:33 +00:00
shpuld
4752081818 Add closed-check for touchmove 2018-12-23 20:14:40 +02:00
shpuld
e46b560ead move closing logic to drawer, add swipe to close 2018-12-23 19:50:19 +02:00
shpuld
f72b1d048e Merge branch 'develop' into feature/replace-panel-switcher 2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74 Add some more routes to side drawer 2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528 Add a translation to the captcha strings in the registration form 2018-12-21 15:12:46 +03:00
Ekaterina Vaartis
661efc51b7 Small UI improvements for the CAPTCHA field 2018-12-21 00:25:36 +03:00
Ekaterina Vaartis
8470856045 Add encrypted captcha_answer_data for stateless captcha 2018-12-21 00:25:09 +03:00
shpuld
67263cde05 works but hacky 2018-12-20 22:20:04 +02:00
Henry Jameson
957b2a6f7e simplified some code, made it possible to unregister serviceworker altogether 2018-12-20 09:17:59 +03:00
Henry Jameson
d0b47488fb default webPush to false, because having it at true leads to some problems with 
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
 2018-12-20 09:17:51 +03:00
Henry Jameson
b7962a224c fixes many problems related to user profile 2018-12-20 07:54:55 +03:00
Henry Jameson
5970bf4e85 fixed incorrect height when empty text 2018-12-20 07:27:29 +03:00
Henry Jameson
afa2baec0c I suppose SOME browsers don't do this by default... 2018-12-20 07:17:54 +03:00
Henry Jameson
ae7b96abbf Fix resize not working properly for textareas 2018-12-20 07:17:54 +03:00
HJ
b65ac128c1 Merge branch 'remove_favorite_hacks' into 'develop' 
no more "broken favorite"

Closes #218 and #145

See merge request pleroma/pleroma-fe!431
 2018-12-19 14:57:25 +00:00
Shpuld Shpludson
c54b1fd0c5 Merge branch 'fix_defaults' into 'develop' 
Fixed some settings not using defaults from instance config.

Closes #228

See merge request pleroma/pleroma-fe!429
 2018-12-19 04:51:21 +00:00
Henry Jameson
5c2030e467 no more "broken favorite" 2018-12-19 01:55:53 +03:00
Henry Jameson
c7514be46f Fixed some settings not using defaults from instance config. Made some parts of 
code more readable
 2018-12-18 23:31:10 +03:00
shpuld
640a287892 Merge branch 'develop' into feature/replace-panel-switcher 2018-12-18 22:09:27 +02:00
Henry Jameson
81c83566cd Merge remote-tracking branch 'upstream/develop' into user-profile-overhault 
* upstream/develop: (24 commits)
  Feature/bigger icons for mobile / #211
  Fix oauth url
  Make user profile page cleaner
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Implement user_profile.spec.js
  Use babel polyfill in karma
  Use 'userProfileLink' to generate user-profile link
  Rollback disableDotRule
  Use "-1" in indexOf
  Add generateProfileLink
  Use "~" as a route namespace symbol
  Disable dot rule
  Pass userName instead of userId
  Typo in tests
  Fix redirect paths
  Fix typo
  ...
 2018-12-18 22:43:26 +03:00
Shpuld Shpludson
67c2a607aa Feature/bigger icons for mobile / #211 2018-12-18 18:26:14 +00:00
lambda
2f28bf95fd Merge branch 'feature/new-user-routes' into 'develop' 
Make domain.com/username routes work

Closes pleroma#395

See merge request pleroma/pleroma-fe!392
 2018-12-18 15:26:00 +00:00
Maxim Filippov
63ad08050e Fix oauth url 2018-12-17 21:58:16 +03:00
Henry Jameson
485a531d57 clean up the unused stuff 2018-12-17 21:02:16 +03:00
Henry Jameson
be27494ca1 Make user profile page cleaner 2018-12-17 20:42:14 +03:00
Henry Jameson
56fdbf18c5 missing string and unification with counters (order) 2018-12-17 19:21:05 +03:00
Henry Jameson
bf805361d0 collateral fix for tab display 2018-12-17 19:18:57 +03:00
Henry Jameson
292ac59d08 Merge remote-tracking branch 'upstream/develop' into user-profile-overhault 
* upstream/develop:
  Fix style
  Add a way to get new captcha on click
  Fix style
  Separate captcha into the backendInteractor
  more visual fixes
  changed bottom-shadow hiding method to be more compatible with overflow
  small fix for overflowing tab-switcher
  Support disabling captcha
  Base support for CAPTCHA (kocaptcha)
 2018-12-17 19:18:35 +03:00
Henry Jameson
23d434c40c collateral fixes for user-card: use still-image, styles for custom emoji 2018-12-17 19:17:03 +03:00
Henry Jameson
8f255fbad4 Refactor follower/friends out of statuses/timeline into user_profile where it 
belongs. Changed display of profile to single panel with tabs.
 2018-12-17 19:14:38 +03:00
Shpuld Shpludson
b124dbf44e Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma-fe!424
 2018-12-17 13:36:56 +00:00
Maxim Filippov
f671adae37 Redirect to /main/all 2018-12-17 03:01:24 +03:00
Maxim Filippov
ea6977cd4d Move userProfile link to methods 2018-12-17 02:52:27 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Maxim Filippov
5fc0fe28e4 Add temporary redirects 2018-12-17 02:26:40 +03:00
Ekaterina Vaartis
d2984b9bc5 Fix style 2018-12-16 22:55:11 +03:00
Ekaterina Vaartis
ab6f1904fa Add a way to get new captcha on click 2018-12-16 22:47:52 +03:00
Ekaterina Vaartis
3c9c8052f7 Fix style 2018-12-16 20:55:09 +03:00
Ekaterina Vaartis
a525df32c9 Separate captcha into the backendInteractor 2018-12-16 20:53:41 +03:00
Henry Jameson
1b9a5a3efe more visual fixes 2018-12-16 02:40:32 +03:00
Henry Jameson
a1d00b9398 changed bottom-shadow hiding method to be more compatible with overflow 2018-12-16 02:07:32 +03:00
Henry Jameson
fc7cd6eaf6 small fix for overflowing tab-switcher 2018-12-16 02:02:49 +03:00
shpuld
bd2ed617a7 Remove panel switcher, add rudimentary drawer 2018-12-15 19:13:01 +02:00
Maxim Filippov
828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
HJ
eaf065c751 Merge branch 'fix-name' into 'develop' 
Fix impossible to change name

See merge request pleroma/pleroma-fe!425
 2018-12-15 00:38:47 +00:00