moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,233 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

1018 Commits

Author SHA1 Message Date
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 61fd0b65d9 i18n 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 2b64432f9a semi-transparent inputbox style 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
lambda 68cb614db9 Merge branch 'develop' into 'develop' 
Added a complete Esperanto translation.

See merge request pleroma/pleroma-fe!240
 2018-04-29 14:52:39 +00:00
lambda bff20a29b7 Merge branch 'nb' into 'develop' 
Add Norwegian localization

See merge request pleroma/pleroma-fe!241
 2018-04-29 14:52:01 +00:00
lambda 805410b933 Merge branch 'feature/redirect-root-by-login-or-not' into 'develop' 
Redirect root by login ro not login

See merge request pleroma/pleroma-fe!251
 2018-04-29 14:51:15 +00:00
Roger Braun 462eeb90b9 Add message preset functionality. 2018-04-29 16:44:08 +02:00
Hakaba Hitoyo 150b815407 lint 2018-04-29 18:09:49 +09:00
Hakaba Hitoyo b1d1c7cfc4 lint 2018-04-29 18:07:40 +09:00
Hakaba Hitoyo 2a6721ea56 redirect root by login or not 2018-04-29 17:55:23 +09:00
Roger Braun 3ffb17c0ae Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading 2018-04-27 09:59:31 +02:00
Hakaba Hitoyo bb92798b74 Collapse chat by default 2018-04-24 07:48:30 +00:00
Roger Braun 935b7745ea Fix nsfw in notifications again. 2018-04-23 19:22:28 +02:00
Roger Braun 39026f8bc3 Fix repeat nsfw hiding. 2018-04-23 19:07:47 +02: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
morguldir 741cd8cb67 Add Norwegian localization 2018-04-21 02:19:55 +02:00
Tirifto dcf07253bc Added Esperanto to the list of language codes. 2018-04-21 01:24:33 +02:00
Tirifto acf96f207d Added a complete Esperanto translation. 2018-04-21 01:03:29 +02:00
Exilat ef4e052ede Small Update messages.js [OC] 2018-04-19 04:57:36 +00:00
Shpuld Shpludson cb240a3e95 Merge branch 'patch-5' into 'develop' 
Translated the latest update to french

See merge request pleroma/pleroma-fe!237
 2018-04-17 16:52:19 +00:00
eal 7ad837f506 Fix follow import typo. 2018-04-17 15:03:10 +00:00
shpuld 9c90a24133 Merge branch 'fix/no-nsfw-in-repeats' into develop 2018-04-16 18:24:31 +03:00
shpuld 573f01650b Copy parent status nsfw into retweeted_status 2018-04-16 18:19:42 +03: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
Azurolu 58ae14f184 Update messages.js 2018-04-15 20:44:52 +00:00
Azurolu e9891354df Translated the latest update to french 2018-04-15 18:42:00 +00:00
Azurolu 13d9f12cf3 Update messages.js 2018-04-15 18:14:29 +00:00
Shpuld Shpludson 8a7ed79fd3 Merge branch 'fix/additionalInputboxHeightUpdates' into 'develop' 
Fix/additional inputbox height updates

See merge request pleroma/pleroma-fe!235
 2018-04-15 17:33:58 +00: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 Shpludson 6ef2385d14 Merge branch 'patch-3' into 'develop' 
Update messages.js: Added "streaming" french translation and corrected typo.

See merge request pleroma/pleroma-fe!221
 2018-04-15 05:12:07 +00:00
shpuld 208b2ed125 Additional check to make console shut up 2018-04-15 00:06:00 +03:00
shpuld e88bb1a23e I broke timelines again, fixed now again (hopefully). 2018-04-14 22:13:28 +03:00
shpuld 3488141fdd Whoops, broke older statuses accidentally 2018-04-14 17:18:07 +03:00
shpuld fb7a5af303 Merge branch 'fix/add-back-timeline-id-overlap' into develop 2018-04-14 16:40:28 +03:00
shpuld dff27357d4 remove +1/-1 from min/max id checking 2018-04-14 16:33:53 +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 a0e7803e42 change timeline min/max id updating behavior to not get stuck with 20 wrong type of activities on fetch older. 2018-04-13 22:35:55 +03:00
dtluna e168837f24 Update Russian l10n 2018-04-13 17:01:02 +03:00
dtluna a7ec41d726 Update Russian l10n 2018-04-13 16:57:28 +03:00
Roger Braun a30f90c768 Update polish translation (thanks, roka!) 2018-04-13 10:29:28 +02:00
Exilat a2f478a769 [i18n] OC: new strings 2018-04-13 05:17:04 +00: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
lambda 7ccbec217a Merge branch 'feature/update-de-translation' into 'develop' 
updated german translation

See merge request pleroma/pleroma-fe!230
 2018-04-12 15:48:26 +00:00
lambda de4664a2ac Merge branch 'patch-2' into 'develop' 
[i18n] Update OC: colour settings.

See merge request pleroma/pleroma-fe!227
 2018-04-12 15:47:51 +00:00
Sebastian Huebner 1e48a2a402
updated german translation 2018-04-12 17:40:15 +02:00
imncls 168c3b04cf
Add missing Japanese translation and Update some Japanese translation 2018-04-12 23:43:43 +09:00
Exilat ad0fd9f8f2 Update messages.js 2018-04-12 04:57:57 +00:00
Exilat e23f43cafc [i18n] Update OC: colour settings. 
Update messages.js
 2018-04-12 04:56:56 +00: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 Shpludson 716e37d95c Merge branch 'cssOverhaul' into 'develop' 
Transition to CSS-variables for themes and stuff.

See merge request pleroma/pleroma-fe!217
 2018-04-09 20:29:06 +00: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
imncls b6a608b447
Improve some Japanese translation 2 2018-04-08 19:11:46 +09:00
imncls b97ef22a32
Improve some Japanese translation 2018-04-08 19:07:08 +09:00
imncls 01c56547d0
Add missing Japanese translation and Update some Japanese translation 2018-04-08 18:58:33 +09: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
Azurolu 986dbab3d2 Update messages.js: Added "streaming" french translation and corrected typo. 2018-04-07 03:28:23 +00:00
hakabahitoyo 02bfea4af3 Change color 2018-04-04 15:04:44 +09:00
Hakaba Hitoyo c72cc431ec Add link to original (remote) user profile page 2018-04-04 05:45:01 +00:00
Roger Braun 936ca1a38c Merge branch 'Exilat_a_Tolosa/pleroma-fe-patch-1' into develop 2018-04-03 18:21:57 +02:00
Exilat 845bdb3dfb Update messages.js 2018-04-03 16:06:28 +00:00
Exilat f62646c2f0 Update messages.js 2018-04-03 16:05:32 +00:00
lambda 6f9ff6edcf Merge branch 'patch-1' into 'develop' 
Update messages.js for pt fix

See merge request pleroma/pleroma-fe!214
 2018-04-03 09:15:45 +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
lambda 214dd1f6d1 Merge branch 'fix/typerror-in-delete-button' into 'develop' 
fix typeError in delete_button.js

See merge request pleroma/pleroma-fe!215
 2018-04-03 09:13:44 +00:00
Exilat 8cb95be4df Update messages.js 2018-04-02 19:21:39 +00:00
Exilat 146538c126 Update messages.js 2018-04-02 18:48:01 +00:00
Exilat 83dbb81acd Update messages.js 2018-04-02 18:46:56 +00:00
Exilat 362cde1c03 Update messages.js 
Occitan language added + corrections in French
 2018-04-02 09:27:04 +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
Daniel Cobalto d57dec6fb4 Update messages.js for pt fix 2018-03-20 01:24:20 +00:00
Sebastian Huebner f6fb592ba1
updated german translation 2018-03-12 11:11:07 +01: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 cd3bf461db Merge branch 'develop' into 'develop' 
Always include bio in updates, because it might be empty (optional)

See merge request pleroma/pleroma-fe!209
 2018-02-24 08:37:08 +00: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
Ekaterina Vaartis cfde2fe439 Always include bio in updates, because it might be empty (optional) 2018-02-21 23:33:04 +03:00
lambda e45cb91e24 Merge branch 'feature/forbid-posting-when-status-length-is-over-the-limit' into 'develop' 
Disable the status submit button when status length is over the limit

See merge request pleroma/pleroma-fe!206
 2018-02-14 08:06:11 +00:00
dtluna 586faf6317 Add Russian translation 2018-02-11 18:59:17 +03: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 fe1044dfdf Update main.js 2018-02-10 01:25:51 +00:00
Hakaba Hitoyo ebd8300e36 slove conflict 2018-02-10 10:17:58 +09:00
Hakaba Hitoyo f23940a153 Update App.js 2018-02-10 01:09:49 +00:00
lambda b0f248c483 Merge branch 'feature/post-length-indicator' into 'develop' 
Add an indicator for characters left before hitting the limit

See merge request pleroma/pleroma-fe!205
 2018-02-09 16:13:16 +00: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
dtluna e49cf7b67a Add textlimit 2018-02-09 16:37:32 +03:00
dtluna e2248bcf4f Use `name` and `closed` from the backend 2018-02-09 16:02:26 +03:00
Aka 402f8ead69 Completes spanish translation 2018-02-08 00:51:33 -03:00
Aka 474c13003a Completes spanish translation 2018-02-08 00:46:50 -03:00
eal e647bb22bb Add keys to all component lists. 2018-02-04 17:26:46 +02:00
Hakaba Hitoyo 5dd4631860 debug 2018-02-04 08:43:31 +09: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 8010c42768 Merge branch 'fix/chat-visibility' into 'develop' 
Show chat only if channel is joined.

See merge request pleroma/pleroma-fe!197
 2018-02-02 07:31:17 +00: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
eal 043e14d5cb Show chat only if channel is joined. 2018-02-01 19:18:47 +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 90175a1872 Fix name clash on unicode and custom emoji 2018-02-01 18:12:23 +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
aka 33d828d048 Completes portuguese translation 2018-01-31 01:02:36 -03:00
Roger Braun 92289e545a Move chat to sidebar. 2018-01-26 15:11:34 +01:00
Sebastian Huebner 235c1c2651
update ger translation 2018-01-03 11:40:30 +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
eal 8f3926a096 Detect backend. 2017-12-23 11:31:43 +02:00
Henry Jameson f99e872c35 fix australian images 2017-12-19 00:15:25 +03:00
Sebastian Huebner 64b1b6bcb4
linting again 2017-12-08 17:31:17 +01:00
Sebastian Huebner 15a5d9ef50
linting 2017-12-08 17:28:13 +01:00
Sebastian Huebner 6ce18b58bd
update ger translation 2017-12-08 17:24:06 +01: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 fe269b2cf9 Merge branch 'fix/gs-emoji-error' into 'develop' 
Suppress emoji fetch error on gs.

See merge request pleroma/pleroma-fe!183
 2017-12-07 21:42:00 +00:00
eal 1db1529dec Suppress emoji fetch error on gs. 2017-12-07 23:37:05 +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