Commit graph

745 commits

Author SHA1 Message Date
Henry Jameson
f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199 initial vers 2018-07-06 20:12:09 +03:00
Ole Bertram
2a87e29180
Add validation of the imported theme and the corresponding warning message 2018-07-04 14:25:40 +02:00
Ole Bertram
8f79193883
Unify button styles and use min-width
This seemed to be the same across multiple components anyway.

Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
2018-07-04 13:49:31 +02:00
Vivian Lim
158342fc39 Fix lint warnings 2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797 Add configuration option to enable click-through content warnings 2018-06-28 23:39:55 -07:00
Vivian Lim
ab86e87e85 Also hide attachments behind clickthrough. 2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9 Differentiate content warning block if it is on lightbg 2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f Carry forward content warnings in replies 2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113 Add click-to-show content warnings on posts 2018-06-28 23:39:01 -07:00
Ole Bertram
d2b79856c6
Add theme import feature 2018-06-28 03:28:23 +02:00
Ole Bertram
f36984c4a4
Refactor theme settings state initialization 2018-06-28 02:07:50 +02:00
Ole Bertram
29f69de240
Add theme export feature 2018-06-28 01:23:19 +02:00
Ole Bertram
44428e8b09
Add warning/info text on appriopriate status scopes 2018-06-23 22:10:15 +02:00
Ole Bertram
05bc6fa8e8
Add title text with description to scope icons 2018-06-23 22:09:13 +02:00
Francis Dinh
556eb4b8a3 add unretweet action to statuses.js 2018-06-14 17:17:36 -04:00
Francis Dinh
d05fcfa1a8 Add unretweet support 2018-06-14 05:00:11 -04:00
Roger Braun
d4f5b3feec Use parents scope if available. 2018-06-12 19:28:48 +02:00
lambda
97ae186aaa Merge branch 'improve-settings-ui' into 'develop'
Improve user settings ui

See merge request pleroma/pleroma-fe!273
2018-06-12 17:01:35 +00:00
lambda
6ea5cfe71e Merge branch 'feature/locked-accounts' into 'develop'
Feature/locked accounts

See merge request pleroma/pleroma-fe!274
2018-06-12 16:57:18 +00:00
lambda
71dcf120ed Merge branch 'tr-fix' into 'develop'
Translate username input placeholder

See merge request pleroma/pleroma-fe!275
2018-06-08 13:34:07 +00:00
Roger Braun
d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
Astra
d62e702994 should resolve a 3/4 things 2018-06-07 17:31:43 -04:00
Astra
a759378b4d more lint fixes 2018-06-07 05:18:54 -04:00
Astra
f49229974a correct linter problems 2018-06-07 05:08:39 -04:00
Astra
92a8ca0011 crt's compose box changes 2018-06-07 05:03:50 -04:00
riking
da1112297a fix: enable translating login form placeholder 2018-06-06 23:44:11 -07:00
William Pitcock
d7d787b84c user card: show that the account is locked if it is 2018-06-07 02:16:30 +00:00
William Pitcock
7389f07115 follow requests: refactor to properly leverage vuex 2018-06-07 01:24:31 +00:00
William Pitcock
f3a27764aa add follow requests UI 2018-06-07 00:58:44 +00:00
User
32d7646db1 Fix the height of file inputs 2018-05-29 21:44:45 +02:00
User
890312a0dc Visually separate the settings items 2018-05-29 21:34:19 +02:00
William Pitcock
7a08ba43e2 user settings: enable locking/unlocking an account 2018-05-29 14:19:28 +00:00
Syldexia
5ae7fb871e Fix formatting 2018-05-21 23:01:33 +01:00
Syldexia
e0ba6a5876 Added change password to user settings 2018-05-21 23:01:09 +01:00
Roger Braun
f06fef26b1 Display visibility if available. 2018-05-20 18:28:01 +02:00
Roger Braun
959b2d9d66 Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion 2018-05-20 13:16:49 +02:00
chip
fcc1ab1d85 Pass the "Collapse" label throught the translation function 2018-05-19 20:35:14 +02:00
lambda
5da881e98d Merge branch 'develop' into 'develop'
use es6 notation for exportFollows

See merge request pleroma/pleroma-fe!263
2018-05-18 10:45:08 +00:00
aka
3c525d6a3b use es6 notation for exportFollows 2018-05-18 07:34:36 -03:00
lambda
166d9294c4 Merge branch 'feature/follows-export' into 'develop'
Adds an option to export follows (fixed)

See merge request pleroma/pleroma-fe!261
2018-05-18 07:51:00 +00:00
aka
fed8781583 fix linting 2018-05-16 19:51:52 -03:00
aka
fae7a40aeb Adds an option to export follows 2018-05-13 20:47:08 -03:00
Syldexia
327b6fb5dc Added delete account section to user settings 2018-05-13 15:24:42 +01:00
Henry Jameson
dc33c0aaac alternate usercard 2018-05-12 16:17:04 +03:00
Henry Jameson
4c3d62da04 fixed autocomplete lacking highlight 2018-05-12 15:19:53 +03:00
Henry Jameson
55aeb5b4b2 fix 2018-05-12 15:19:53 +03:00
Henry Jameson
e93ce99198 small fix + white color for user-card + opaque outline for text 2018-05-12 15:19:53 +03:00
Henry Jameson
fc1283da83 fixed nsfw hider having very small height, some border-radii for consistency 2018-05-12 15:19:53 +03:00
Henry Jameson
57e91bc783 fix jumping inputbox's height 2018-05-12 15:19:53 +03:00
Henry Jameson
15a7151ade Entire area around user counters are clickable now, not just the header-link 2018-05-12 15:19:53 +03:00
Henry Jameson
f1478935da user card no longer uncomfortably close to user name in timeline 2018-05-12 15:19:53 +03:00
Henry Jameson
bc85e5f0c1 Further usercard readibility. Made it visible which "tab" is actiavated - should
be enough to hint user that you can click "following" / "followers". Fixes #77
2018-05-12 15:19:53 +03:00
Henry Jameson
a6fa913f45 Input fields separate radii 2018-05-12 15:19:53 +03:00
Henry Jameson
008b36dc24 gave text some shadow-outline to make it more readable on white backgrounds +
fixed weird layout (WHY)
2018-05-12 15:19:53 +03:00
Henry Jameson
e23986e239 unnecessary styles removed (fixes transparent color userstyle) 2018-05-12 15:19:53 +03:00
Henry Jameson
c46795c692 use semi-transparent faint color + fix 2018-05-12 15:19:53 +03:00
hakabahitoyo
36b1c09831 add space 2018-05-06 11:33:53 +09:00
Hakaba Hitoyo
d9d6a497d9 debug 2018-05-05 01:02:39 +09:00
Hakaba Hitoyo
2471b71aab osa-compatible who to follow provider 2018-05-05 00:53:40 +09:00
hakabahitoyo
0691af1367 debug 2018-05-05 00:43:18 +09:00
Hakaba Hitoyo
2ade177d5a configurable who to follow panel 2018-05-05 00:20:19 +09:00
Hakaba Hitoyo
77ffa89464 Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable 2018-05-04 23:50:14 +09:00
Roger Braun
462eeb90b9 Add message preset functionality. 2018-04-29 16:44:08 +02:00
Roger Braun
3ffb17c0ae Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading 2018-04-27 09:59:31 +02:00
bb92798b74 Collapse chat by default 2018-04-24 07:48:30 +00:00
lambda
9557ec59a8 Update timeline.js 2018-04-22 20:16:28 +00:00
csaurus
59f98aecd9 Stop blink from loading more statuses with every scroll. 2018-04-22 16:12:34 -04:00
Hakaba Hitoyo
033170212f merge 2018-04-22 00:48:06 +09:00
shpuld
ce0b551c59 some ugly hack to prevent the jump in form height when you input first character 2018-04-16 17:52:43 +03:00
Henry Jameson
e9e37a034c fml 2018-04-15 20:30:06 +03:00
Henry Jameson
e1dce2c5af better approach 2018-04-15 19:05:16 +03:00
Henry Jameson
600b2d5bbd Added resizing inputbox on focus so that replying to The Discourse™ is less painful 2018-04-15 18:38:10 +03:00
shpuld
fa8fa2d330 Force oembeds to use 100% width 2018-04-14 15:45:38 +03:00
shpuld
c3bea8dfd1 Fix rt heading alignment again 2018-04-14 14:28:20 +03:00
shpuld
1a2bd28f53 Merge branch 'develop' into fix/status-heading-alignment-issues 2018-04-14 14:26:07 +03:00
shpuld
424e9166d9 Fix alignment issues in status heading and repeat info 2018-04-14 14:24:05 +03:00
Shpuld Shpludson
9587c6dac1 Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
Fix/better timeline min max id behavior

See merge request pleroma/pleroma-fe!233
2018-04-14 09:52:54 +00:00
shpuld
3153bb5b05 Also fix wrong color in user card 2018-04-14 10:24:39 +03:00
shpuld
96692454a0 change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally. 2018-04-14 10:19:09 +03:00
shpuld
1db9b1e1ad Fix long names in notifications too 2018-04-14 08:59:55 +03:00
shpuld
121f7424dc Fix overflowing long maes in statuses and repeats. 2018-04-14 07:44:59 +03:00
shpuld
ab2546ab38 Fix timeline error not using correct styling while at it 2018-04-13 23:04:31 +03:00
shpuld
dc0fd8177c Fix status preview loader having different offset from the actual stats preview 2018-04-12 20:03:03 +03:00
shpuld
8db70ffa85 Fix missing border radii and read button text color 2018-04-12 19:51:33 +03:00
shpuld
974702efc6 aha, found another bug in oembed text 2018-04-11 19:47:03 +03:00
shpuld
ee883d0f88 Remove some commented lines and logs 2018-04-11 19:40:59 +03:00
shpuld
a1f6ef1dca Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein. 2018-04-11 19:34:40 +03:00
Francis Dinh
52d72599ee Forgot to fix other tabs 2018-04-11 04:29:46 -04:00
Francis Dinh
11a89ee06d Replace tab indentation with spaces 2018-04-11 04:28:27 -04:00
Francis Dinh
3d8d941d89 Make autocomplete case insensitive 2018-04-11 04:23:13 -04:00
Shpuld Shpludson
748e01d3e9 Merge branch 'feature/chat-styling-and-hiding' into 'develop'
Feature/chat styling and hiding

See merge request pleroma/pleroma-fe!224
2018-04-11 03:37:42 +00:00
Shpuld Shpludson
020d2f83f9 Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'
Rewrite status and notifications and preview, graceful handling of linkless attachments

See merge request pleroma/pleroma-fe!223
2018-04-11 03:37:25 +00:00
Shpuld Shpludson
daa018aecf Merge branch 'feature/link-to-remote-user-profile-page' into 'develop'
Add link to original (remote) user profile page

See merge request pleroma/pleroma-fe!219
2018-04-11 03:35:13 +00:00
shpuld
2258c9c1e7 Make collapsed-state hide chat and not the wrong way around 2018-04-11 00:20:42 +03:00
shpuld
49aa2d5fb7 cleanup 2018-04-11 00:19:28 +03:00
shpuld
f69a12a912 Make chat collapsable and expandable, make chat look a tiny bit nicer (still works like crap when it comes to scrolling) 2018-04-11 00:17:05 +03:00
shpuld
896fea7dbd Fixes from review 2018-04-10 22:12:59 +03:00
shpuld
da1a222cab Add back the status animation 2018-04-10 19:58:25 +03:00
shpuld
a327d83e62 Add target _blank to attachment links. 2018-04-10 19:44:57 +03:00
shpuld
6a5116c349 Fixes to notification style issues mostly 2018-04-10 19:25:24 +03:00
shpuld
8835c98529 Merge hj's css overhaul and fix conflicts 2018-04-10 00:28:24 +03:00
shpuld
c214197cee Separate notification into its own component, fix follow notification type 2018-04-09 20:44:37 +03:00
shpuld
ec2a719f0d some cleanup 2018-04-09 19:45:42 +03:00
shpuld
f4f9b3fa26 small fixes 2018-04-09 19:43:31 +03:00
Henry Jameson
bf2d4516d5 small fix for still-gifs 2018-04-09 02:10:04 +03:00
Henry Jameson
bc8ae96cac indent fix (my editor screws up here) 2018-04-08 14:46:36 +03:00
Henry Jameson
4bbc3ada5d fix some incorrect radii 2018-04-08 14:45:12 +03:00
Henry Jameson
38d366f9aa some more improvements. changed the way user-card is layout, but should look the
same, except that longer user names should be properly ellipsis-ed.
2018-04-08 04:23:43 +03:00
Henry Jameson
59a05081c5 some styles fixes 2018-04-08 03:43:07 +03:00
Henry Jameson
cc02672e14 made alerts use red with transparent theme red. some UI improvs 2018-04-08 03:22:03 +03:00
Henry Jameson
2e95193559 localisations and stuff 2018-04-08 02:52:15 +03:00
Henry Jameson
b23bd076c3 raddi customization UI 2018-04-08 02:39:39 +03:00
Henry Jameson
65f82cf294 <select> styling (abeit somewhat not pretty code-wise), default colors for
default schemes.
2018-04-07 21:58:29 +03:00
Henry Jameson
529643d35a indents 2018-04-07 19:30:27 +03:00
Henry Jameson
94195024e6 another post-rebase fix 2018-04-07 16:55:51 +03:00
Henry Jameson
5ded84e982 post-rebase fix 2018-04-07 16:48:49 +03:00
Henry Jameson
3df7c1977f fixes 2018-04-07 16:40:08 +03:00
Henry Jameson
33b1d85921 border-radii moved to variables, made rgbo colors use theme data, customizable
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson
acdb5e5c7a cleanup. added fallback mechanism for IE11 and unsupported browsers. 2018-04-07 16:36:35 +03:00
Henry Jameson
aa0564406a getting rid of baseXX, some small fixes. Seems to be usable. 2018-04-07 16:34:11 +03:00
hakabahitoyo
02bfea4af3 Change color 2018-04-04 15:04:44 +09:00
c72cc431ec Add link to original (remote) user profile page 2018-04-04 05:45:01 +00:00
lambda
e4b2fdf124 Merge branch 'stillGifs' into 'develop'
Still gifs

See merge request pleroma/pleroma-fe!193
2018-04-03 09:14:42 +00:00
hakabahitoyo
ef67bd693e using router-link in who-to-follow-panel 2018-03-28 18:18:36 +09:00
hakabahitoyo
5a97cfb959 who-to-follow-panel using internal user link 2018-03-28 17:45:35 +09:00
Hakaba Hitoyo
caad818009 using internal link to users 2018-03-28 16:56:47 +09:00
Hakaba Hitoyo
96426425b8 refactoring 2018-03-28 15:57:11 +09:00
Hakaba Hitoyo
6b6b740684 Merge remote-tracking branch 'origin/feature/who-to-follow-panel' into feature/who-to-follow-panel-2 2018-03-28 14:55:12 +09:00
qwexvf
0a62341135
fix typeError in delete_button.js
not a big thing just fixes a typeError.
2018-03-20 22:33:43 +09:00
dtluna
bfb2d481bb Add i18n for User Timeline 2018-03-12 03:59:03 +03:00
Henry Jameson
0c4dc26808 after nine years of development, hopefully, it has been worth the weight 2018-03-12 02:31:33 +03:00
Henry Jameson
5efd8a4aa6 fixes 2018-03-12 01:30:27 +03:00
Henry Jameson
55bc1a3414 fixed stretched spurdo in notifications, misc fixes, detect gif by extension for now 2018-03-12 01:30:27 +03:00
Henry Jameson
3257991f41 unfinished fetch() version that doesn't work 2018-03-12 01:30:27 +03:00
Henry Jameson
b10787d23c first ver 2018-03-12 01:30:27 +03:00
Hakaba Hitoyo
b32573138b Add who-to-follow-panel 2018-02-24 23:04:44 +09:00
eal
cbd113f762 Merge branch 'feature/user-picker-keyboard-support' into 'develop'
Add keyboard support for user/emoji picker.

Closes #56

See merge request pleroma/pleroma-fe!200
2018-02-24 08:08:41 +00:00
dtluna
591dadad13 Disable the submit button and apply error class to the characters left indicator 2018-02-11 17:07:29 +03:00
Hakaba Hitoyo
ebd8300e36 slove conflict 2018-02-10 10:17:58 +09:00
dtluna
dcbbd7c53e Add styles on the characters left indicator 2018-02-09 18:22:29 +03:00
dtluna
6c424c355c Add characters left being displayed 2018-02-09 17:51:04 +03:00
eal
e647bb22bb Add keys to all component lists. 2018-02-04 17:26:46 +02:00
Hakaba Hitoyo
013f11497f slove-conflict 2018-02-04 08:36:10 +09:00
Henry Jameson
338245eb63 updated css and stuff for color picker in styles 2018-02-03 22:23:38 +03:00
Henry Jameson
71bdbdf146 wip, styles are a bit broken tho 2018-02-03 21:15:43 +03:00
hakabahitoyo
95cba854f3 add instance specific panel 2018-02-04 00:27:33 +09:00
eal
88c8818deb Add keyboard support for user/emoji picker.
Tab cycles between candidates, shift-tab cycles backwards.
Enter does the action.
2018-02-03 16:59:47 +02:00
Roger Braun
d97e6777ba Update vue version. 2018-02-03 15:47:51 +01:00
shp
06265078d8 Fix typo in fav/rt fix 2018-02-03 10:18:53 +02:00
eal
f3f0155d60 Fix fav/RT buttons in notifications. 2018-02-02 12:27:31 +02:00
lambda
97854eec58 Merge branch 'remote-follow-button' into 'develop'
Add remote follow button to local user profiles.

See merge request pleroma/pleroma-fe!198
2018-02-02 07:30:58 +00:00
Shpuld Shpludson
f2f9343d2a Merge branch 'fix/emoji-align' into 'develop'
Align custom emoji to middle of line.

See merge request pleroma/pleroma-fe!196
2018-02-02 05:38:57 +00:00
eal
664a55fc79 Show fav/RT counts even if not logged in. 2018-02-02 00:45:29 +02:00
eal
689afecb65 Add remote follow button to local user profiles. 2018-02-01 21:30:49 +02:00
lambda
3ff39f9b39 Merge branch 'feature/normal-emoji-completion' into 'develop'
Add completion for normal emoji.

Closes #15

See merge request pleroma/pleroma-fe!169
2018-02-01 16:26:43 +00:00
eal
36e68fba96 Merge branch 'develop' into feature/normal-emoji-completion 2018-02-01 18:19:36 +02:00
eal
fe2e5ba6f0 Align custom emoji to middle of line 2018-02-01 17:18:51 +02:00
aka
84b0d54cd0 Fixes issue #58 2018-01-31 14:48:09 -03:00
Roger Braun
92289e545a Move chat to sidebar. 2018-01-26 15:11:34 +01:00
eal
b67c506062 Merge branch 'develop' into feature/normal-emoji-completion 2017-12-23 19:52:16 +02:00
eal
a058941aed Add follow import to user settings. 2017-12-23 17:08:45 +02:00
Henry Jameson
f99e872c35 fix australian images 2017-12-19 00:15:25 +03:00
Shpuld Shpludson
389c413357 Merge branch 'fix/hide-read-button' into 'develop'
Don't show "read" button if there are no new notifications.

See merge request pleroma/pleroma-fe!184
2017-12-07 22:00:30 +00:00
eal
07354cc45d Don't show "read" button if there are no new notifications. 2017-12-07 23:54:03 +02:00
eal
855f8b4f27 Merge branch 'fix/usercard-width' into 'develop'
Fixed width usercards in follow lists.

Closes #48

See merge request pleroma/pleroma-fe!181
2017-12-07 17:18:33 +00:00
eal
05f053219b Fixed width usercards in follow lists. 2017-12-07 19:11:42 +02:00
eal
ecb8acb155 Some css fixes.
Scale chat panel size to viewport height, fit message field to width.
2017-12-07 19:03:26 +02:00
Roger Braun
6c4e3a509a Don't display if we don't have a chat. 2017-12-05 14:20:34 +01:00
Roger Braun
a03b92e252 Post on submit, not on enter. 2017-12-05 12:09:54 +01:00
Roger Braun
6ad27959a6 Linting. 2017-12-05 11:49:40 +01:00
Roger Braun
27be1e0fa3 Move chat to own module. 2017-12-05 11:47:10 +01:00
Roger Braun
0e51fac2b2 Add missing component code. 2017-12-05 11:02:41 +01:00
Roger Braun
fbee80474b Basic frontend changes for chat. 2017-12-04 19:08:33 +01:00
Shpuld Shpludson
f72d6ec83e Merge branch 'clipboardImage' into 'develop'
Added ability to copy-paste image right from the clipboard.

See merge request pleroma/pleroma-fe!179
2017-11-28 20:37:56 +00:00
Henry Jameson
1f413bb816 pasting images from clipboard, fuck ye 2017-11-28 23:31:40 +03:00
shpuld
bcd10b3475 Make star icon in notifications behave like the other icons.. 2017-11-25 12:57:55 +02:00
shpuld
f02229fed2 Add specifity to active classes to make them override theme colors. 2017-11-24 23:55:46 +02:00
lambda
2431d35277 Merge branch 'feature/flush-timeline-with-holes' into 'develop'
Clear timeline when there's holes between old and new

Closes #54

See merge request pleroma/pleroma-fe!171
2017-11-24 07:30:17 +00:00
lambda
38cab5e4b6 Merge branch 'fix/better-icon-colors' into 'develop'
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.

See merge request pleroma/pleroma-fe!174
2017-11-24 07:29:49 +00:00
shpuld
6b773902e8 Fix mistake in flushMarker init, make startFetching behave properly with older statuses existing. 2017-11-23 13:46:37 +02:00
shpuld
10be553910 Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors. 2017-11-22 01:00:25 +02:00
shpuld
912be5aed9 Make the timeline button use the correct func for its text. 2017-11-22 00:47:20 +02:00
shpuld
fc1736618b attempt to recognize when holes in timeline for various reasons, clear timeline and fetch older when showing new to get rid of holes 2017-11-21 16:12:47 +02:00
shpuld
4e07b89bcf not so \!important after all 2017-11-21 10:52:09 +02:00
shpuld
592c1cfd78 Fix padding at user card bottom, mismatching border-radii. Sneak in fixes for attachment previews. 2017-11-21 10:30:30 +02:00
shpuld
f6b2f6eaee Fix usercard from breaking with certain colors, clean up code structure a bit. 2017-11-20 22:45:09 +02:00
eal
581e3e836a Add completion for normal emoji. 2017-11-20 20:32:51 +02:00
lambda
8020363680 Merge branch 'fix/attachment-fixes-media-upload-unknown-type' into 'develop'
Hide unknown type attachments, polish the upload preview styling

See merge request pleroma/pleroma-fe!168
2017-11-20 11:52:46 +00:00
shpuld
280758f867 Hide unknown type attachments, polish the upload preview styling 2017-11-20 13:27:45 +02:00
shpuld
95cbd19254 Unhide completions, strengthen shadows a bit, force the 0.1 shade to always span the full height, make usercard use correct borders. 2017-11-20 13:03:02 +02:00
shpuld
a7500410ff Fix color inputs to wrap on mobile, fix timeline background color to not clash with panel headings. 2017-11-18 17:41:43 +02:00
shpuld
3534a9a62f Make defaulting to pleroma-dark work when config.json has an invalid theme. Remove logging. 2017-11-18 13:27:37 +02:00
shpuld
d65d6e5da4 Clean up, use translations, persist theme, add more presets. 2017-11-18 13:13:51 +02:00
shpuld
21b31cf599 Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead. 2017-11-17 17:24:42 +02:00
shpuld
e13c8c3fd2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme 2017-11-17 02:17:47 +02:00
shpuld
44073e72fd Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency. 2017-11-17 02:17:36 +02:00
eal
0b0d206295 Fix timeline softlock when switching from a loading timeline 2017-11-16 15:50:26 +02:00
Shpuld Shpludson
dff1153d1c Merge branch 'fix/user-view-without-posts' into 'develop'
Use state object for user view instead of timeline.

See merge request pleroma/pleroma-fe!161
2017-11-14 16:34:32 +00:00
eal
07057043d9 Use state object for user view instead of timeline.
Also fetch user if not in the state already.
2017-11-14 18:08:03 +02:00