Commit Graph

4093 Commits

Author SHA1 Message Date
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
eal 6fd309452a Merge branch 'fixImgOrient' into 'develop'
Fixes attachment images not following EXIF (i think) orientation

See merge request pleroma/pleroma-fe!187
2017-12-18 21:26:11 +00:00
Henry Jameson f99e872c35 fix australian images 2017-12-19 00:15:25 +03:00
lambda 3de128cb17 Merge branch 'feature/update-de-translation' into 'develop'
Update de translation

See merge request pleroma/pleroma-fe!185
2017-12-09 09:51:09 +00: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
lambda bf7b5a7105 Merge branch 'fix/unicode-passwords' into 'develop'
Fix basicauth base64 encoding for unicode passwords.

See merge request pleroma/pleroma-fe!180
2017-12-05 09:13:16 +00: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
eal da9cfdd06c Merge branch 'fix/notifications-star-not-colored' into 'develop'
Make star icon in notifications behave like the other icons..

See merge request pleroma/pleroma-fe!178
2017-11-27 09:44:11 +00: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 Shpludson 527cc8358a Merge branch 'fix/give-icons-active-colors-back' into 'develop'
Add specifity to active icon classes to make them override theme colors.

See merge request pleroma/pleroma-fe!176
2017-11-25 09:09:57 +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
lambda 1dfb8d14b2 Merge branch 'fix/dont-stretch-panel-switcher' into 'develop'
Fix content sizing to not allow empty scrolling, make panel-switcher not grow on mobile

See merge request pleroma/pleroma-fe!175
2017-11-24 07:29:08 +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
Shpuld Shpludson 222b0aa982 Merge branch 'feature/configurable-default-path' into 'develop'
Feature/configurable default path

See merge request pleroma/pleroma-fe!173
2017-11-22 19:24:16 +00: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
lambda 118d60b871 Merge branch 'fix/fix-usercard-breaking-with-certain-colors-restructure' into 'develop'
Various fixes with usercard (and attachments), clean up

See merge request pleroma/pleroma-fe!170
2017-11-21 12:56:57 +00: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