Commit Graph

1202 Commits

Author SHA1 Message Date
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
eal 63d29eab3f Merge branch 'feature/chat' into 'develop'
Feature/chat

See merge request pleroma/pleroma-fe!182
2017-12-07 17:08:20 +00: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
eal 612fb18367 Add option for disabling chat. 2017-12-07 18:20:44 +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
eal f4f63d32e2 Fix basicauth base64 encoding for unicode passwords. 2017-12-04 23:15:03 +02: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 Shpludson f50aed3a63 Merge branch 'fix/mobile-layout' into 'develop'
Fix big gap between panel switcher and column body on mobile

See merge request pleroma/pleroma-fe!177
2017-11-25 09:11:34 +00:00
shpuld 326859464c Add the forgotten flex prop to make everything nice and tight again 2017-11-25 00:09:28 +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 1ade284293 Fix content sizing to not allow empty scrolling, make panel-switcher not grow on mobile 2017-11-23 15:55:53 +02:00
shpuld 6b773902e8 Fix mistake in flushMarker init, make startFetching behave properly with older statuses existing. 2017-11-23 13:46:37 +02:00
Roger Braun 2691579ab7 Make default path configurable. 2017-11-22 16:28:05 +01: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
lambda 6ac8a43e28 Merge branch 'fix/style-fixes-again' into 'develop'
More style fixes

See merge request pleroma/pleroma-fe!167
2017-11-20 11:51:52 +00:00
shpuld 280758f867 Hide unknown type attachments, polish the upload preview styling 2017-11-20 13:27:45 +02:00
Roger Braun 099bac517a Fix mention timeline. 2017-11-20 12:13:17 +01:00
shpuld 90c8d80279 give nav-bar a shadow 2017-11-20 13:04:55 +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
Sebastian Huebner 6940aa1992
updated ger translation 2017-11-19 19:42:54 +01: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
lambda 86e685ac34 Merge branch 'fix/timeline-softlock' into 'develop'
Fix timeline softlock when switching from a loading timeline

See merge request pleroma/pleroma-fe!164
2017-11-16 13:56:48 +00:00
eal 0b0d206295 Fix timeline softlock when switching from a loading timeline 2017-11-16 15:50:26 +02:00
Sebastian Huebner a9829b8735
updated german translation 2017-11-15 10:36:59 +01: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
Shpuld Shpludson ff63be4afd Merge branch 'fix/user-finder-leading-@' into 'develop'
Remove leading @ in user search.

Closes pleroma#71

See merge request pleroma/pleroma-fe!160
2017-11-14 15:21:35 +00:00
eal a5d05bcb10 Remove leading @ in user search. 2017-11-14 17:03:42 +02:00
shpuld dc4755f2ff Make goto-check use the correct property to make it work again 2017-11-14 08:55:21 +02:00
shpuld ed84c6acc0 First version with naive color extrapolation. 2017-11-14 01:37:49 +02:00
lambda 55c4818084 Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'
Better handling of taller posts

Closes #40

See merge request pleroma/pleroma-fe!158
2017-11-13 18:17:50 +00:00
lambda 024b9ca724 Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'
In-reply-to previews for posts on timeline

See merge request pleroma/pleroma-fe!157
2017-11-13 18:17:34 +00:00
shpuld a169abcec2 Give tall notifications either a scrollbar (mentions), or just cap them and use a cool hider (fav/rt). 2017-11-13 19:23:43 +02:00
shpuld e19a617de1 Add a scrollbar for tall spammy posts. 2017-11-13 18:39:27 +02:00
shpuld ab1d1b3dd0 Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading. 2017-11-13 16:33:54 +02:00
lambda 8fdedb4c79 Merge branch 'french-update' into 'develop'
Update french translation.

See merge request pleroma/pleroma-fe!146
2017-11-13 12:23:41 +00:00
lambda 9681f58949 Update messages.js 2017-11-13 12:20:26 +00:00
lambda 7403c6c3dc Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'
Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue.

See merge request pleroma/pleroma-fe!156
2017-11-13 10:57:33 +00:00
Shpuld Shpludson 03190ab124 Merge branch 'fix/persisted-stream-setting' into 'develop'
Persist streaming setting between sessions.

See merge request pleroma/pleroma-fe!155
2017-11-13 10:07:25 +00:00
shpuld 4cc73cfe21 Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue. 2017-11-13 12:00:08 +02:00
eal 29e32416bc Persist streaming setting between sessions. 2017-11-13 11:44:28 +02:00
lambda c3b401167d Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'
CSS fixes

Closes #39

See merge request pleroma/pleroma-fe!154
2017-11-13 09:34:16 +00:00
lambda d7e4279c59 Merge branch 'fix/sidepanel-gap-consistency-fix' into 'develop'
Fix sidepanel gap

See merge request pleroma/pleroma-fe!148
2017-11-13 09:11:50 +00:00
lambda d6478068f8 Merge branch 'feature/streaming-posts' into 'develop'
Streaming posts

See merge request pleroma/pleroma-fe!151
2017-11-13 09:10:44 +00:00
shpuld bac092d953 Make oembeds behave properly, hide empty html attachments, hide overflowing timeline background. 2017-11-13 11:08:34 +02:00
Henry Jameson 764331c80b fix white line below buttons in notifications 2017-11-13 08:28:21 +03:00
Shpuld Shpludson 0584272cf1 Merge branch 'web-notifs' into 'develop'
Web Notifications

See merge request pleroma/pleroma-fe!149
2017-11-12 23:28:41 +00:00
shpuld 46f23b7de7 Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts. 2017-11-13 01:06:48 +02:00
Henry Jameson c18aace3da imo this looks ugly, compared to general timeline appearance 2017-11-13 01:28:08 +03:00
Henry Jameson 46765d5c1a some fixes towards how conversations appear 2017-11-13 01:26:43 +03:00
Henry Jameson 6a44d1c9ac small shadows + show placeholder for empty panel body 2017-11-13 01:08:06 +03:00
Henry Jameson ec55d49b88 kiinteät venytetyt tunteet 2017-11-13 00:57:41 +03:00
Henry Jameson cbab830d8a fixes fullscreen video having borders and border-radius in firefox 2017-11-13 00:50:18 +03:00
shpuld c682a4b007 Don't add notification on self mention, (and fix that pesky pleroma vs gs delete bug) 2017-11-12 23:15:47 +02:00
Henry Jameson 4cf580ee31 moved notification asking from page load to login event. Added image in
notifications support (doesn't work for native KDE notifications for me tho)
2017-11-13 00:11:55 +03:00
Henry Jameson 3dc375f442 initial implementation for desktop notifications 2017-11-12 23:34:08 +03:00
shpuld 8745fd4bdf please the linter 2017-11-12 20:42:26 +02:00
shpuld 07dc195234 Add a hack to a hack to make it look much less hacky. 2017-11-12 20:24:20 +02:00
Aka 1390513de0 Adds Portuguese translation 2017-11-11 01:21:49 -03:00
Roger Braun b19fe6e004 Update french translation. 2017-11-10 10:52:10 +01:00
shpuld 72806b4a99 Check if logged-in when rendering the block button. 2017-11-09 10:33:10 +02:00
Shpuld Shpludson 56a0665b2f Merge branch 'fix/pleromabe-is-other-user' into 'develop'
Fix isOtherUser on pleroma-be

See merge request pleroma/pleroma-fe!137
2017-11-09 08:23:19 +00:00
lambda 9913601080 Merge branch 'feature/timeago-locales' into 'develop'
Revert to English timeago for latin script languages.

See merge request pleroma/pleroma-fe!144
2017-11-09 08:06:35 +00:00
eal 26416ed15c Revert to English timeago for latin script languages. 2017-11-09 09:45:02 +02:00
shpuld d2ef145115 Don't show repeats that have been shown already. 2017-11-09 08:36:11 +02:00
lambda bbd80c54bf Merge branch 'ro-translation' into 'develop'
Romanian translation

See merge request pleroma/pleroma-fe!142
2017-11-09 05:32:15 +00:00
Roger Braun 80ccc2ac27 Add spanish translation.
Thanks, Aemon!
2017-11-09 06:30:49 +01:00
Tibike 510015b044 Corrected the const en to const ro for romanian 2017-11-09 02:49:37 +02:00
Tibike e8f325f345 Added romanian translations 2017-11-09 02:28:33 +02:00
Tibike b35ef607c4 Added missing hungarinan translations 2017-11-09 01:53:53 +02:00
lambda 0c2f343a66 Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'
Make mentions-timeline use i18n.

See merge request pleroma/pleroma-fe!141
2017-11-08 22:00:37 +00:00
lambda 241fcd12f5 Merge branch 'feature/timeago-locales' into 'develop'
Add timeago locales.

See merge request pleroma/pleroma-fe!140
2017-11-08 22:00:20 +00:00
Shpuld Shpludson 421221997f Make mentions-timeline use i18n. 2017-11-08 21:54:48 +00:00
eal ceb13a6405 Add timeago locales. 2017-11-08 22:20:50 +02:00
lambda 3cad733593 Merge branch 'develop' into 'develop'
Update Estonian translation

See merge request pleroma/pleroma-fe!138
2017-11-08 17:43:02 +00:00
lambda 5322f90c15 Merge branch 'fix/attachment-fixes' into 'develop'
Fix #38 and video CSS

Closes #38

See merge request pleroma/pleroma-fe!136
2017-11-08 17:42:42 +00:00
eal be943445e9 Fix isOtherUser on pleroma-be 2017-11-08 19:32:11 +02:00
obrez bce37767f2 Update Estonian translation 2017-11-08 19:30:33 +02:00
naf 26d27165d6 add japanese translation 2017-11-08 22:10:13 +09:00
shpuld 0e716e3cd9 Fix oembeds from overflowing on Firefox, fix video border color as well as vertical size. 2017-11-08 15:09:02 +02:00
Roger Braun 23d1354046 Update polandish. 2017-11-08 13:41:11 +01:00
lambda 7d84147500 Merge branch 'fix/missing-localization-strings' into 'develop'
Fix #37: Missing localization strings

Closes #37

See merge request pleroma/pleroma-fe!133
2017-11-08 11:03:51 +00:00
shpuld 4d5782b51f Fix conflict 2017-11-08 12:55:10 +02:00
lambda 83297aba15 Merge branch 'develop' into 'develop'
Add Estonian translation

See merge request pleroma/pleroma-fe!134
2017-11-08 10:54:08 +00:00
obrez a7b2d76347 Add Estonian translation 2017-11-08 12:44:33 +02:00
shpuld 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. 2017-11-08 12:34:15 +02:00
shpuld 176421163b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons 2017-11-08 11:27:22 +02:00
shpuld bfa04bfb11 Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out. 2017-11-08 11:26:42 +02:00
Roger Braun 5dca57cc05 Add Polish translation.
Thanks, Roka!
2017-11-08 09:57:51 +01:00
Roger Braun 62a3c63082 Unify statuses/notices. 2017-11-08 09:31:52 +01:00
Roger Braun cadd42c1b2 Merge branch 'develop' into tibike/pleroma-fe-hu-translation 2017-11-08 09:13:35 +01:00
Roger Braun c65974c8c8 Fix typo. 2017-11-08 09:12:48 +01:00
Roger Braun 483fef731a Fix typo. 2017-11-08 09:10:32 +01:00
Roger Braun 32cb5e1a48 Add italian translation.
Thank, Eidon!
2017-11-08 09:09:34 +01:00
Roger Braun 38bd0dbfcd Add french translation.
Thanks, azu!
2017-11-08 09:05:10 +01:00
Tibike d6c89a9c09 Added Hungarian translation 2017-11-08 02:14:18 +02:00
eal 608d1e6776 Add blocks. 2017-11-07 22:38:28 +02:00
lambda 7ab7ac7be6 Merge branch 'feature/ger-translation' into 'develop'
Add DE translation

See merge request pleroma/pleroma-fe!128
2017-11-07 17:50:39 +00:00
Roger Braun 5cf972b348 Update ja translation. 2017-11-07 18:44:43 +01:00
Sebastian Huebner 0320f03cd2
make linter happy 2017-11-07 18:43:28 +01:00
Sebastian Huebner 8a3118d1a7 added ger translation 2017-11-07 18:37:51 +01:00
Roger Braun 33ad62bf72 Japanese is ja. 2017-11-07 18:34:12 +01:00
Roger Braun 71395ebca2 Add japanese translation.
Thanks, https://knzk.me/@imncls!
2017-11-07 18:20:40 +01:00
Shpuld Shpludson f89f120c44 Add fi to localization. 2017-11-07 16:55:08 +00:00
Roger Braun 74b513122e Set locale from browser settings. 2017-11-07 15:23:00 +01:00
Roger Braun 7516cd859f Prepare for i18n. 2017-11-07 15:14:37 +01:00
lambda 81b0849889 Merge branch 'fix/friendica-html' into 'develop'
Fix issue #33

Closes #33

See merge request pleroma/pleroma-fe!126
2017-11-07 10:33:02 +00:00
Shpuld Shpuldson acde0b316c Changes inside status html: restrict image/video sizes, make blockquotes waste less space. 2017-11-07 12:22:33 +02:00
eal 784eb8426c Send credentials when fetching remote profile. 2017-11-07 00:20:51 +02:00
lambda fb8b625d9a Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'
Stop inappropriate auto fetching on scroll

See merge request pleroma/pleroma-fe!123
2017-11-02 14:59:31 +00:00
Shpuld Shpuldson f897c656fc Also disable select on buttons 2017-11-02 16:27:34 +02:00
Shpuld Shpuldson 10bc83018c Deregister scroll listener properly, only fetch more if timeline is visible. 2017-11-02 16:26:17 +02:00
Shpuld Shpuldson 226f435a17 Add user-select: none to i elements. 2017-11-02 11:27:52 +02:00
eal ba9b04a8ba Use the API endpoint for emoji completion. 2017-10-19 23:39:21 +03:00
eal 447ec91176 Actually actually fix image url. 2017-09-19 22:58:15 +03:00
eal f4b1319eff Actually fix image url. 2017-09-19 22:54:54 +03:00
eal 70d66c48ad Fix image url. 2017-09-19 22:50:08 +03:00
eal 2162ef20b0 Add emoji completion. 2017-09-19 22:43:20 +03:00
eal c96a7b582b Remove another cache file. 2017-09-17 14:42:04 +03:00
eal 59f07c0704 Remove cache file. 2017-09-17 14:37:48 +03:00
eal 9abfcb34ef Add tag timeline view. 2017-09-17 14:26:35 +03:00
lambadalambda 3eaaa4c16d Merge branch 'fix/set-cookie' into 'develop'
Set cookies on fetch

See merge request !114
2017-09-13 04:47:23 -04:00
lambadalambda 7abcb13ec0 Merge branch 'feature/login-with-cookie' into 'develop'
Try logging in with the existing cookie.

See merge request !116
2017-09-13 04:47:03 -04:00
lambadalambda c6b909570a Merge branch 'fix/upload-buttons-clickable' into 'develop'
Fix hide and cancel buttons on chromium

See merge request !119
2017-09-13 04:46:24 -04:00
eal 5e6ffc0e45 Make user finder more pleasant. 2017-09-10 20:46:42 +03:00
eal 8a51bc6e22 Fix hide and cancel buttons on chromium 2017-09-10 13:33:02 +03:00
eal 298bf5cfca Revert "Include cookie in every request"
This reverts commit 00589a9af1.
Changing same-origin to the unsafer include did not fix the
bug it was supposed to.
2017-09-02 21:12:55 +03:00
Roger Braun 8b4f59e1f7 Try logging in with the existing cookie. 2017-09-02 19:50:02 +03:00
eal 00589a9af1 Include cookie in every request 2017-09-02 19:29:45 +03:00
eal 2b0811dddc Make sure options exists every time on fetch() 2017-09-02 19:29:16 +03:00
eal 522110c0bc Set cookies on fetch 2017-08-31 11:23:17 +03:00
eal 587cd7bcfa Fix 'Statuses' being different color 2017-08-27 13:10:25 +03:00
eal ad6d0a1f0c Move the cog to avatar height 2017-08-25 14:59:55 +03:00
Shpuld Shpuldson 87b18da811 Merge branch 'fix/pleromabe-follow-notifs' into 'develop'
Add regex for follows from pleromabe

See merge request !109
2017-08-25 03:19:01 -04:00
eal 5bd6abc134 Add regex for follows from pleromabe 2017-08-24 21:53:31 +03:00
Shpuld Shpuldson 7061675e96 whoops lint 2017-08-24 16:25:26 +03:00
Shpuld Shpuldson c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments 2017-08-24 16:16:06 +03:00
Shpuld Shpuldson bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict. 2017-08-23 20:33:20 +03:00
Shpuld Shpuldson 2bc261afba Merge branch 'feature/follow-lists' into 'develop'
Feature/follow lists

See merge request !106
2017-08-23 12:40:39 -04:00
eal e1ec01dc3e Appease linter. 2017-08-23 19:21:15 +03:00
eal ccfc2e57d0 Add follower and following views 2017-08-23 19:14:06 +03:00
lambadalambda 5a1ad84092 Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'
Add regex to check if you're the one being followed before adding notification.

See merge request !102
2017-08-22 06:18:41 -04:00
lambadalambda e5d0965ff1 Merge branch 'fix/user-card-changes-and-fixes' into 'develop'
User card changes and fixes

See merge request !104
2017-08-22 06:13:10 -04:00
Shpuld Shpuldson 6ad5052044 Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel. 2017-08-22 12:38:12 +03:00
Shpuld Shpuldson 2ef915c9f1 Don't allow posting again while previous hasn't returned 2017-08-22 11:43:03 +03:00
Shpuld Shpuldson 3d9d59915b Add regex to check if you're the one being followed before adding notification. 2017-08-21 23:31:38 +03:00
eal 4291263cec Add link to profile on usercard avatar and @handle 2017-08-21 23:14:05 +03:00
Shpuld Shpuldson b5e5a8d1e3 Use _original profile pic instead of the 48x48 thumbnail in the user card content. 2017-08-21 16:45:45 +03:00
Shpuld Shpuldson d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts. 2017-08-21 15:35:14 +03:00
Shpuld Shpuldson dbf2f1621e Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right 2017-08-20 16:53:48 +03:00
Shpuld Shpuldson 42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing. 2017-08-20 13:16:41 +03:00
lambadalambda fb3408d64f Merge branch 'feature/profile-editing' into 'develop'
Feature/profile editing

See merge request !95
2017-08-19 03:32:44 -04:00
Shpuld Shpuldson 1136db24cc Fix issue with trying to match() on undefined 2017-08-18 12:38:47 +03:00
Shpuld Shpuldson 052befa581 fix the very annoying thing where favs from pleromabe would not generate notifs when on GS 2017-08-18 12:26:07 +03:00
Shpuld Shpuldson 9503b8fa41 Remove the profile pic change from the old settings menu since it's in the new profile edit menu. 2017-08-18 12:00:59 +03:00
Shpuld Shpuldson 1526b4560c Clean up to have much less redundant code. 2017-08-18 11:51:17 +03:00
Shpuld Shpuldson 2084c92dff Force user profile timeline update when the user id changes (like when another user has been searched/found). 2017-08-16 16:40:09 +03:00
Shpuld Shpuldson 6d7d173e4d Make linter happy. 2017-08-16 00:46:55 +03:00
Shpuld Shpuldson c4920f2d86 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing 2017-08-16 00:15:00 +03:00
lambadalambda dbad99cb4f Merge branch 'feature/follow-notifications' into 'develop'
Add follow notifications.

See merge request !92
2017-08-10 12:34:02 -04:00
lambadalambda 3c2073bc8e Merge branch 'fix/user-card-visual-buggery' into 'develop'
User card content visual bugfixes

See merge request !91
2017-08-10 12:29:05 -04:00
eal 701112f043 Add follow notifications. 2017-08-10 19:17:40 +03:00
Shpuld Shpuldson acf3fd5d91 Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service. 2017-08-02 22:09:40 +03:00
Roger Braun b1d9cbaebd Add fetch polyfill. 2017-07-31 16:35:07 +02:00
Roger Braun 9c5f001fd2 Add back relative numbering. 2017-07-29 19:10:09 +02:00
Roger Braun 32e20b2e02 Only run through replies once. 2017-07-29 18:53:49 +02:00
Roger Braun 9e61ab577b Revert "Throttle getReplies so it isn't called that often."
This reverts commit 86773579ed.
2017-07-28 15:52:05 +02:00
Roger Braun 86773579ed Throttle getReplies so it isn't called that often. 2017-07-28 11:20:54 +02:00
Roger Braun da3b604d9d Fix too long words in profile. 2017-07-27 15:54:34 +02:00
Roger Braun 7d59051fc5 Add logout button. 2017-07-02 12:25:34 +02:00
Shpuld Shpuldson f81d1b0eea Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares. 2017-06-23 17:43:34 +03:00
Shpuld Shpuldson b284689313 Hotfix for JS error in auto completion in firefox. 2017-06-23 16:49:11 +03:00
lambadalambda 937705ccb0 Merge branch 'feature/registration' into 'develop'
Add a registration form.

See merge request !76
2017-06-21 12:22:28 -04:00
Shpuld Shpuldson 2d5fd21558 Make mobile panel switcher buttons obey the colors of the current style. 2017-06-21 17:43:59 +03:00
Shpuld Shpuldson c1f1599f2f Another minor consistency fix. 2017-06-21 17:32:41 +03:00
Shpuld Shpuldson 97bb03a00c Fix consistency in font families between chromium and ff 2017-06-21 17:19:56 +03:00
Shpuld Shpuldson bf84a87821 Make buttons stand out with some shading. 2017-06-21 17:15:45 +03:00
Shpuld Shpuldson 1a5ee95ee4 Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled. 2017-06-20 10:37:51 +03:00
Shpuld Shpuldson bfbc94d697 Move customizable terms-of-service into its separate .html file. 2017-06-19 16:35:35 +03:00
Shpuld Shpuldson 95605c32f1 Automatic square cropping for avatar upload, preview of the new avatar. 2017-06-19 12:26:33 +03:00
Shpuld Shpuldson 3785a863cb Update branch and fix conflicts. 2017-06-19 11:32:40 +03:00
Roger Braun 8e5d17a659 Use tags array in status if available. 2017-06-18 19:19:17 +02:00
Roger Braun 7d93546d98 Loop videos. 2017-06-18 19:17:14 +02:00
Shpuld Shpuldson 5dc22e9273 Clicking autocomplete will return focus to text area, make the autocomplete box disappear after clicking on a name. 2017-06-16 10:26:54 +03:00
Shpuld Shpuldson b24b891c1c Clean up styling a bit. 2017-06-16 10:15:10 +03:00
Shpuld Shpuldson 81d262af42 Fancier visuals for autocomplete list, with small avatar previews and all that. 2017-06-16 01:13:54 +03:00
Shpuld Shpuldson d0d95c59aa fix lint 2017-06-15 23:26:16 +03:00
Shpuld Shpuldson e0e8965c08 update branch and fix merge conflicts 2017-06-15 23:25:19 +03:00
Shpuld Shpuldson 7d46e3965d Fix meta-enter hotkey on osx 2017-06-15 22:21:14 +03:00
Roger Braun e663420260 Fix notification deletion. 2017-06-13 12:01:47 +02:00
Roger Braun 48a6d2e987 Don't use too advanced features. 2017-06-12 17:35:04 +02:00
Roger Braun bbb9a9c93c Fetch user from timeline. 2017-06-12 17:07:10 +02:00
Roger Braun 5328aca1ef Use userId in timeline. 2017-06-12 16:34:41 +02:00
Roger Braun bda0a76c89 Clear timeline on user change. 2017-06-12 16:30:56 +02:00
Roger Braun 2e7029b670 Display user timeline 2017-06-12 16:20:02 +02:00
Roger Braun 090148ef60 Start fetching user timelines. 2017-06-12 16:00:46 +02:00
Roger Braun 85cf036acd Fix race condition in color calculation. 2017-06-12 15:59:54 +02:00
lambadalambda fc341aa40d Merge branch 'feature/reply-previews' into 'develop'
Reply previews in conversations

See merge request !89
2017-06-07 12:18:55 -04:00
Roger Braun 0effef236a Small cleanup. 2017-06-07 18:15:15 +02:00
Shpuld Shpuldson dcd7d52eb5 lint fix 2017-06-07 18:13:24 +03:00
Roger Braun 9982296866 Don't crash on unknown status deletion. 2017-06-07 17:03:14 +02:00
Shpuld Shpuldson f915ae174d Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already.. 2017-06-07 17:58:24 +03:00
Roger Braun 72de959221 Remove notifications for deleted messages. 2017-06-06 15:54:08 +02:00
Roger Braun 9af18e014d Re-use conversation property. 2017-06-05 12:15:30 +02:00
Shpuld Shpuldson 64a7db1d8b Change replies element flex to cover more width if needed. 2017-06-05 12:03:32 +03:00
Shpuld Shpuldson 12000536aa remove commented lines, make linter happy 2017-06-05 00:02:14 +03:00
Shpuld Shpuldson 4fabeda3ec Add list of replies under the name/links in conversation statuses, clicking them will highlight the statuses and scroll you to them, expanding a status will scroll you to that status once the conversation has opened. 2017-06-04 23:58:15 +03:00
Shpuld Shpuldson d82fa5516b remove whitespace 2017-06-03 23:52:23 +03:00
Shpuld Shpuldson bac1d3bd57 Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu. 2017-06-03 23:42:54 +03:00
Shpuld Shpuldson 67452923a5 Hotfix for firefox to prevent loading on every scroll event. 2017-06-03 19:53:23 +03:00
Shpuld Shpuldson 65646c5a12 Add an option to initiate fetching older statuses automatically when scrolled 750 pixels or less from the bottom. 2017-06-03 18:51:55 +03:00
Roger Braun e901e064de Key notifications so the open reply windows won't switch places. 2017-06-02 17:04:59 +02:00
Shpuld Shpuldson 24b7d7d9d4 Add mouseover tooltips for names in notif headings and timeline repeats, make the timeline repeat name into a link to the repeater profile and use the word 'repeat' instead of 'retweet'. 2017-06-02 13:05:03 +03:00
lambadalambda b92be6a7ef Merge branch 'feature/status-improvement-cleanup' into 'develop'
Status improvements and cleanup

See merge request !83
2017-06-01 11:50:00 -04:00
lambadalambda 934bbd16f1 Merge branch 'feature/autoresize-post-status-form' into 'develop'
Make text input grow to a minimum height of 3 lines on focus

See merge request !82
2017-06-01 11:25:12 -04:00
Shpuld Shpuldson c149330e50 Fix bugginess with heading links overlapping icons on the right. 2017-06-01 17:50:09 +03:00
Shpuld Shpuldson 52e6b470be Revert some of those mobile optimizations, breaks mention notifs. 2017-06-01 17:43:37 +03:00
Shpuld Shpuldson d063607b9d Mobile optimizations. 2017-06-01 17:35:00 +03:00
Shpuld Shpuldson 807c0d1464 Remove silly opacity from timestamp, make unmute icon line up with the rest better. 2017-06-01 01:11:57 +03:00
Shpuld Shpuldson ea8a700796 Move a bunch of status-related styles from App to status component, alter status header layout for better user experience hopefully, make status actions placing more consistent, adjust margins. 2017-06-01 01:02:04 +03:00
Shpuld Shpuldson b6b0a221c6 please the linter 2017-05-31 17:43:43 +03:00
Shpuld Shpuldson 7447f7c64d Set minimum height of 3 lines for textarea on focus, make it reset on post. 2017-05-31 17:36:22 +03:00
lambadalambda 9723d7285d Merge branch 'feature/notification-improvements' into 'develop'
Feature/notification improvements

See merge request !79
2017-05-31 08:16:43 -04:00
lambadalambda bf7190bfca Merge branch 'feature/custom-timestamps' into 'develop'
Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago'

See merge request !80
2017-05-31 08:03:10 -04:00
Shpuld Shpuldson 5465791372 eslint fix 2017-05-31 14:11:07 +03:00
Shpuld Shpuldson e704e1daaf Make post-status-form automatically resize to fit the input. 2017-05-31 14:02:54 +03:00
Shpuld Shpuldson 3a1ae3a30e Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' 2017-05-31 12:45:03 +03:00
Shpuld Shpuldson 960577ca28 Revert main.js to what it was in develop 2017-05-31 12:07:21 +03:00
Shpuld Shpuldson 1b79ae09e0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements 2017-05-31 11:58:32 +03:00
Shpuld Shpuldson 5ad4d043e7 Enable reply/rt/fav for mention notifications by using a barebones status in place of plain notification content. 2017-05-31 11:47:18 +03:00
Shpuld Shpuldson e621be1428 Cut notification header length from 3 lines to 1. 2017-05-30 00:24:08 +03:00
Roger Braun d389d3a763 Copy cool retweet look. 2017-05-22 13:50:10 +02:00
Roger Braun 76624c9e4b Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-05-12 18:54:33 +02:00
Roger Braun 2ec7069b3c Add user finder. 2017-05-12 18:54:12 +02:00
Roger Braun 48725ff9d0 Make linter happy. 2017-04-24 20:34:36 +02:00
Roger Braun 32d1d2178a Make linter happy. 2017-04-24 20:34:06 +02:00
Roger Braun 3fdc420990 Merge branch 'develop' into feature/hash-routed 2017-04-24 20:31:08 +02:00
Roger Braun 0c41adccff Remove tributejs
Alternative autocompletion is in the works and this one has injection problems.
2017-04-24 20:30:09 +02:00
Shpuld Shpuldson c2db700544 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/hash-routed 2017-04-21 19:15:54 +03:00
Shpuld Shpuldson 143aa3b990 Started captcha and better avatar control, improved login form to fit register link better. 2017-04-21 18:52:42 +03:00
Shpuld Shpuldson b3b6d43dcc Add ToS field into registration form (still need to make it fetch it somewhere.) Make the register form look more polished. 2017-04-17 13:57:02 +03:00
Shpuld Shpuldson 88309b446f Adjust attachment preview margins. 2017-04-17 11:42:33 +03:00
Shpuld Shpuldson a3a9d8edd1 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/post-form-improvement 2017-04-17 11:21:40 +03:00
Shpuld Shpuldson 6b75874136 Move attachments below buttons to prevent the buttons from shifting after uploading. 2017-04-17 11:18:06 +03:00
Roger Braun ce896d393b Fix linting. 2017-04-17 10:12:30 +02:00
Shpuld Shpuldson ca8755a6f3 Make X icon parent position: relative; to prevent it from floating on its own. 2017-04-17 10:45:12 +03:00
Roger Braun dede7f7f2f Update existing currentusers if there is one. 2017-04-16 16:05:13 +02:00
Roger Braun 37c10be5e2 Add basic avatar changing. 2017-04-16 13:44:11 +02:00
Roger Braun 55edd6d8c2 Restore old media upload endpoint. 2017-04-16 11:15:06 +02:00
Roger Braun 4228cfc342 Add email field to registration. 2017-04-16 11:02:03 +02:00
Roger Braun a766e886f5 Add a registration form. 2017-04-15 18:29:46 +02:00
Roger Braun 6d7fcb057d Add missing route-link end tags. 2017-04-14 22:08:08 +02:00
Shpuld Shpuldson ea184f33b0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/reply-navigation 2017-04-14 16:11:09 +03:00
Shpuld Shpuldson c708ebb5d2 Fix statusoid == undefined bug that prevented conversation opening in new tabs. 2017-04-14 15:58:34 +03:00
lambadalambda dcced2d2e1 Merge branch 'feature/sidepanel-independent-scrolling' into 'develop'
Sidepanel independent scrolling

See merge request !72
2017-04-14 07:50:45 -04:00
Shpuld Shpuldson e64905d88b Change attachments margin to not cause the element to overflow. 2017-04-14 13:43:53 +03:00
Shpuld Shpuldson 2efddaf874 Tweak values to minimize distracting artifacting when scrollbars are smaller or don't exist. 2017-04-13 23:36:16 +03:00
Shpuld Shpuldson 69ef9101d4 Fix login screen, (remove one duplicate line from user card css). 2017-04-13 17:57:20 +03:00
Shpuld Shpuldson f1764796e1 Fixed flex issue between 980 and 960 pixels width 2017-04-13 17:01:18 +03:00
Shpuld Shpuldson ff9142d7ab Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/sidepanel-independent-scrolling 2017-04-13 16:32:15 +03:00
Shpuld Shpuldson 83205b8c0e Make sidepanel scroll independently from timeline, allows for seeing notifications and posting new statuses even when scrolled deep down. 2017-04-13 16:17:57 +03:00
lambadalambda 7a948ba3a5 Merge branch 'feature/reply-navigation' into 'develop'
Reply navigation (up only)

See merge request !70
2017-04-12 13:14:43 -04:00
Shpuld Shpuldson d8a01454dc another lint fix 2017-04-12 19:10:38 +03:00
Shpuld Shpuldson c989170321 lint fixes 2017-04-12 19:07:55 +03:00
Shpuld Shpuldson 3f477986cf Removed smooth scrolling, does not work in other browsers than FF 2017-04-12 18:47:47 +03:00
Shpuld Shpuldson a675cfbb3e Goto-original-arrow button now sets conversation highlight/focus even when inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded. 2017-04-12 18:25:19 +03:00
wakarimasen 66b59f2752 Fix daily average on accounts younger than a day 2017-04-11 11:47:19 +02:00
Roger Braun 36655002d0 Merge branch 'develop' into feature/hash-routed 2017-04-09 22:23:14 +02:00
Roger Braun cd959d9df8 Remove completely empty words. 2017-04-09 22:15:49 +02:00
Roger Braun 40b607bdea Set state to loaded if it crashes while loading. 2017-04-09 22:15:35 +02:00
Roger Braun 1ea19dcf1d Take unmuting out of expandable condition. 2017-04-09 16:39:19 +02:00
Roger Braun e531c78079 Only persist state after we loaded one. 2017-04-09 16:30:21 +02:00
Roger Braun a53555254a Add word-based muting to settings / statuses. 2017-04-09 15:53:23 +02:00
lambadalambda f3ca011fbe Add chrome picture stretching fix back in. 2017-04-09 08:26:30 -04:00
Shpuld Shpuldson 05dfd96571 Revert nsfw image sizing, give attachments max-height to reduce scrolling 2017-04-09 14:28:21 +03:00
Shpuld Shpuldson 39a6867557 Make muted notifications take much less space (handy for bot spam). 2017-03-30 15:11:32 +03:00
Roger Braun 44923afbee Make linter happy. 2017-03-15 17:14:51 +01:00
Roger Braun 5249b1d23a Add basic mention completion. 2017-03-15 17:08:17 +01:00
Roger Braun 024230c7f4 Basic word position and completion service. 2017-03-15 16:22:36 +01:00
Shpuld Shpuldson 0c7450252a Merge branch 'fix/small-buttons-chrome-tweak' into 'develop'
Fix the appearance of 'Read'/'Show new' buttons on Chrome

See merge request !65
2017-03-11 12:44:44 -05:00
Shpuld Shpuldson d427eaca90 Merge branch 'feature/daily-avg' into 'develop'
Add a daily post average to the user card

See merge request !63
2017-03-11 06:48:17 -05:00
shpuld 9061fa36ac Change the small buttons (Read and Show new) to look better on chrome and other non-firefox browsers. 2017-03-11 03:23:34 +02:00
shpuld 21111878be Give link attachments a rounded border, give images and links base03 border. 2017-03-10 23:28:55 +02:00
wakarimasen fe5082023d Add a daily post average to the user card 2017-03-10 21:37:13 +01:00
lambadalambda 9e42472679 Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'
Change the base16 colors used by the navpanel

See merge request !61
2017-03-10 09:58:05 -05:00
shpuld c1681d53ba Add a border to conversation heading to add distinction between it and a hilighted post. (TODO: add the same base03-border to all headings for consistency's sake if it looks alright?) 2017-03-10 15:26:36 +02:00
Roger Braun 112adcf8f8 Merge branch 'develop' into feature/hash-routed 2017-03-10 13:27:58 +01:00
wakarimasen 896de016ad Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop 2017-03-10 12:38:47 +01:00
shpuld 3bb5f86d0d Use conditional class for reply icon color. 2017-03-10 00:49:22 +02:00
shpuld 6f450fe7b0 base01 -> base00, base02 -> base01 2017-03-10 00:45:16 +02:00
shpuld df4dad1804 Separate reply form from inside status to make it resistant to hilighting, make the reply button light up when reply window is open. 2017-03-09 21:32:54 +02:00
Shpuld Shpuldson 2f0fcd14c9 Merge branch 'fix/no-border-on-last-notif' into 'develop'
Fix red border not appearing on the last notification.

See merge request !59
2017-03-09 13:04:10 -05:00
shpuld bd7a05dee1 Fix red border not appearing on the last notification. 2017-03-09 19:57:20 +02:00
wakarimasen d669c37f13 Remove unused fetchMentions() 2017-03-09 18:21:42 +01:00
wakarimasen bfd530aaea Let timeline component fetch mentions 2017-03-09 18:20:16 +01:00
Shpuld Shpuldson 7aa1f02e38 Merge branch 'feature/timeline-fetch-error' into 'develop'
Use one error variable for all timelines

See merge request !57
2017-03-09 08:06:59 -05:00
wakarimasen e064d2da4d Use one error variable for all timelines 2017-03-09 13:38:32 +01:00
shpuld 00531ad9df lint fix 2017-03-09 12:48:43 +02:00
shpuld d99b9bdac1 Merged with changes in develop & fixed conflicts. 2017-03-09 12:45:12 +02:00
Roger Braun 0eeccb87ce Merge branch 'develop' into feature/hash-routed 2017-03-09 10:33:21 +01:00
Roger Braun 2f52669380 Merge branch 'develop' into wakarimasen/pleroma-fe-develop 2017-03-09 09:19:40 +01:00
lambadalambda 64d71b75cf Merge branch 'feature/nav-panel-hover-state' into 'develop'
themeable hover states for nav-panel

See merge request !53
2017-03-09 03:10:31 -05:00
lambadalambda 7a5bed0684 Merge branch 'feature/animated-favorite-and-boost' into 'develop'
add a spin animation to favorite and boost actions

See merge request !52
2017-03-09 03:08:59 -05:00
lambadalambda e808df0285 Merge branch 'cleanups' into 'develop'
Cleanups

See merge request !54
2017-03-09 03:02:55 -05:00
Roger Braun b11c1f57a9 Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading 2017-03-09 09:00:09 +01:00
Roger Braun 08297ea83e Remove redirect on login
This is to enable this workflow:

1. Open conversation in new tab
2. Login
3. Interact with the conversation

We can add this again once we have persistent logins.
2017-03-09 08:51:33 +01:00
xj9 d94cd15467 fix cursor style 2017-03-08 22:38:14 -07:00
xj9 aff432a572 themeable hover states for nav-panel 2017-03-08 22:36:03 -07:00
xj9 459fdaf10f add a spin animation to favorite and boost actions 2017-03-08 21:45:40 -07:00
xj9 502757da28 improvements on fature/better-nsfw-image-loading
- loading indicator
- avoid hitting the cache if we already know the image was loaded
- more responsive toggle
2017-03-08 20:23:10 -07:00
Shpuld Shpuldson ba4f7ef3ef Merge branch 'feature/failed-login-error' into 'develop'
Visual feedback on failed login

See merge request !49
2017-03-08 19:21:36 -05:00
shpuld 9511691c94 Make the error into a div instead of a button to get rid of the hover effects. 2017-03-09 02:21:23 +02:00
Shpuld Shpuldson aeda390da0 Merge branch 'feature/timeline-fetch-error' into 'develop'
Move rejection handler

See merge request !48
2017-03-08 19:03:06 -05:00
shpuld 507fe79050 Add base03 border to timeline bottom fetcher too. 2017-03-09 01:13:37 +02:00
shpuld 6c8fc99d5a Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses. 2017-03-09 01:09:23 +02:00
Roger Braun 0d39ed809b Add caching system to statuses. 2017-03-08 21:04:48 +01:00
wakarimasen 0810b2d51a Fix typo 2017-03-08 19:31:39 +01:00
wakarimasen ccc460bb5e Give more specific reason for failed login 2017-03-08 19:22:56 +01:00
wakarimasen c0e8111d64 Clear username and password field on failed login 2017-03-08 19:08:01 +01:00
wakarimasen a6b6fe95c0 Show visual feedback on login error, redirect on success 2017-03-08 18:28:41 +01:00
Roger Braun 5699872bb5 Use user cache in users module. 2017-03-08 18:04:53 +01:00
Roger Braun 480a1ba253 Use cache to quickly access users. 2017-03-08 17:59:12 +01:00
Roger Braun bde1241843 eslint fixes. 2017-03-08 17:58:49 +01:00
Roger Braun ccbfc64bfc Don't redirect after login. 2017-03-08 16:54:06 +01:00
wakarimasen 7d52258378 Move rejection handler 2017-03-07 21:38:55 +01:00
Shpuld Shpuldson d954db0221 Merge branch 'feature/timeline-fetch-error' into 'develop'
Visual feedback on failure to fetch new statuses

See merge request !47
2017-03-07 12:15:37 -05:00
lambadalambda 3a62ad3c4c Merge branch 'feature/more-visible-notifications' into 'develop'
Notifications inside a red circle and the red line more visible

See merge request !46
2017-03-07 11:27:46 -05:00
wakarimasen 086dd832d3 Visual feedback on failure to fetch new statuses 2017-03-07 17:27:12 +01:00
shpuld ae570ea0ff Put conversation 'Collapse' back on the same line with the rest of the heading.' 2017-03-07 16:00:45 +02:00
shpuld 58fdf9e70d Put the number of notifications inside a red circle (kinda like qvitter and everyone else does), make the red notification line slightly less transparent. 2017-03-07 15:55:00 +02:00
lambadalambda aa0d207c94 Merge branch 'fix/highlight-expanded-retweets' into 'develop'
Highlight original notice when expanding retweets

See merge request !43
2017-03-07 06:06:43 -05:00
Roger Braun e64a5beb35 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-03-07 08:44:53 +01:00
Roger Braun 5143ae7f72 Switch to localforage to use indexeddb by default. 2017-03-07 08:43:48 +01:00
shpuld a4ebf44f24 Fix overlapping styles in timeline and notifications that screwed up user-card. 2017-03-06 23:51:39 +02:00
Roger Braun 990047725a Revert "Temporarily remove persistence."
This reverts commit 0bb1ec30d0.
2017-03-06 19:57:00 +01:00
Roger Braun 0bb1ec30d0 Temporarily remove persistence. 2017-03-06 19:55:08 +01:00
wakarimasen 9d56721533 Highlight original notice when expanding retweets 2017-03-06 16:21:11 +01:00
shpuld 31c0a2dfef Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading 2017-03-06 14:51:01 +02:00
Roger Braun 51160f0fdb Style fixes. 2017-03-05 20:36:22 +01:00
shpuld e19bfb9a22 Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else. 2017-03-05 19:00:35 +02:00
wakarimasen 42ae57dace Remove unused import 2017-03-05 16:49:45 +01:00
wakarimasen 289326855c Add focused prop to status 2017-03-05 16:31:01 +01:00
wakarimasen c921662036 Add inConversation prop to status 2017-03-05 14:34:14 +01:00
wakarimasen 22e8258a56 Highlight current notice in conversation-page, add backlinks 2017-03-05 11:56:28 +01:00
wakarimasen 6bcbed38d0 Add option to only hide attachments on timeline 2017-03-04 21:25:59 +01:00
xj9 9107facaca issue #1 - better nsfw image loading
preload the image when it is toggled, but wait to replace it until
it has loaded.
2017-03-02 20:01:19 -07:00
Roger Braun a4c58aab13 Unify notice timelines to make changes easier. 2017-03-01 20:36:37 +01:00
lambadalambda 51294082e0 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make use of template literals instead of string concat.

See merge request !34
2017-03-01 11:14:18 -05:00
shpuld 4d1183cc1f Fix the very visible padding offset in unread notification caused by the border. 2017-02-27 19:21:40 +02:00
shpuld 8c43b3f505 Remove newlines from template literal. 2017-02-26 22:42:22 +02:00
shpuld 015bf78dd9 Heading text floats left, initial attempt at load more in the right side of the heading. 2017-02-26 22:36:54 +02:00
Roger Braun 290180a987 Merge branch 'develop' into feature/hash-routed 2017-02-26 11:39:42 +01:00
shpuld 960ed9540d Make use of template literals instead of string concat. 2017-02-25 14:34:05 +02:00
lambadalambda bebd5c3328 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make the profile background use a new calculated color using the theme

See merge request !33
2017-02-25 06:33:14 -05:00
lambadalambda e2ba7d9037 Merge branch 'fix/various-style-fixes-all-over-the-place' into 'develop'
Fix/various style fixes all over the place

See merge request !32
2017-02-25 06:32:19 -05:00
shpuld e9820326e3 Clean up whitespace 2017-02-25 13:19:37 +02:00
shpuld 536a7176df Make the profile background use a new calculated color using the theme 2017-02-25 13:13:08 +02:00
lambadalambda 614cbb556a Remove old commented style. 2017-02-24 16:50:32 -05:00
shpuld 142a8a1a76 Fix poor choice of colors for input/textarea borders, adjust login form padding. 2017-02-24 19:43:27 +02:00
shpuld cac47f7128 Make user card buttons more light-theme friendly without compromising the dark ones. 2017-02-24 19:12:57 +02:00
shpuld 2bfd2190a0 Mark unread notifs with the red line, make read notifs base01 again, center the heading text and move the button to the right of the panel. 2017-02-24 18:53:53 +02:00
shpuld 9dfcf8a301 Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency. 2017-02-24 17:32:41 +02:00
shpuld e0e507348c Give buttons cursor: pointer; Make border radii more consistent by not using em everywhere. 2017-02-24 10:17:41 +02:00
Roger Braun 2b2061b03f Switch to lz-string.
Pako was very slow in Chromium.
2017-02-23 19:11:22 +01:00
Roger Braun d030462d12 Indentation. 2017-02-23 01:54:22 +01:00
Hector A. Escobedo c338940084 Fix syntax errors and hiding logic.
This has been tested.
2017-02-22 19:31:49 -05:00
Hector A. Escobedo a7db72d7a7 Add setting to toggle NSFW hiding. 2017-02-22 18:39:56 -05:00
Roger Braun b939f70d17 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-23 00:26:52 +01:00
Roger Braun 74931dece7 Revert "Show actual status in notifications when mentioned."
This reverts commit 0e1ab69c33.
2017-02-23 00:26:37 +01:00
lambadalambda 854faf905e Merge branch 'feature/user-card-improvements' into 'develop'
User card visual improvements

See merge request !29
2017-02-22 18:09:54 -05:00
Roger Braun 7c0f3ea666 Add setting to hide all attachments. 2017-02-23 00:04:47 +01:00
shpuld 9237f0b918 Removed unnecessary debug stuff 2017-02-23 00:39:41 +02:00
Roger Braun 0e1ab69c33 Show actual status in notifications when mentioned. 2017-02-22 23:37:12 +01:00
shpuld 715bfb3dca Make gradient use the theme colors, adjust user interction elements, make profiles without bg use a darker gray solid color to not drown out white text. 2017-02-23 00:24:37 +02:00
Roger Braun 9778d4cfc0 More eslint fixes. 2017-02-22 22:43:40 +01:00
Roger Braun 5abf857705 Style fixes. 2017-02-22 22:33:28 +01:00
lambadalambda b9be4708e6 Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop'
Proper handling of drag/drop for most platforms

See merge request !28
2017-02-22 16:31:59 -05:00
shpuld 1072cd6c02 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/user-card-improvements 2017-02-22 23:08:49 +02:00
shpuld ede4d77cfd Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card. 2017-02-22 23:08:14 +02:00
Roger Braun ec5d8b9833 Set colors into config so they can be used for more dynamic styles. 2017-02-22 21:14:55 +01:00
shpuld ded2d54cca Merged existing changes from 'develop' 2017-02-22 15:04:28 +02:00
shpuld 6c385ae80a Make drag&drop work on more browsers/platforms, make the Upload button accept drops as well. 2017-02-22 14:53:05 +02:00
lambadalambda 935c0e09c6 Merge branch 'fix/dont_display_following_when_logged_out' into 'develop'
Hide Follow-button and 'Follows you' text when not logged in

Closes #14

See merge request !27
2017-02-22 05:11:18 -05:00
shpuld 874f976531 Hide Follow-button and 'Follows you' text when not logged in 2017-02-22 11:54:09 +02:00
Roger Braun 8d4d8b6b6c Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-22 10:32:59 +01:00
Roger Braun aa3512205d Only save every minute. 2017-02-22 10:32:44 +01:00
Roger Braun 892b826df5 Small style adjustment, add meta-enter posting. 2017-02-21 21:48:48 +01:00
Roger Braun 34a593aa27 Merge branch 'develop' into feature/drag_and_drop_for_media_upload 2017-02-21 21:30:16 +01:00
Roger Braun 40fe40d96b Better attachment removal styling. 2017-02-21 15:24:35 +01:00
Roger Braun 137a7e643d Remove flex from general attachments. 2017-02-21 15:24:05 +01:00
shpuld ca71722c1e Files dropped into post_status_form text box get sent to media_upload for attachment upload, media_upload reorganized a bit to allow reuse of existing code. 2017-02-21 15:13:19 +02:00
Roger Braun 7661357cf6 Merge branch 'develop' into feature/hash-routed 2017-02-21 11:48:55 +01:00
Roger Braun abc9f06d93 Use runtime only build. 2017-02-21 11:48:08 +01:00
Roger Braun b98cfbfade Merge branch 'develop' into feature/hash-routed 2017-02-21 11:24:01 +01:00
shpuld 3d69a91aba cleanup/better naming 2017-02-21 10:22:04 +02:00
shpuld c244067787 Use a red border for expanded statuses 2017-02-21 10:19:42 +02:00