Commit Graph

3913 Commits

Author SHA1 Message Date
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
Shpuld Shpludson
47a7a3ae6f Merge branch 'fix/show-fav-and-rt-counts' into 'develop'
Show fav/RT counts even if not logged in.

See merge request pleroma/pleroma-fe!199
2018-02-02 05:36:35 +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
Shpuld Shpludson
ecb75a73d3 Merge branch 'develop' into 'develop'
Completes portuguese translation, Fixes issue #58

Closes #58

See merge request pleroma/pleroma-fe!194
2018-02-01 15:31:12 +00: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
eal
1c067f8562 Merge branch 'update-ger-translation' into 'develop'
update ger translation

See merge request pleroma/pleroma-fe!189
2018-01-03 15:12:25 +00:00
Sebastian Huebner
235c1c2651
update ger translation 2018-01-03 11:40:30 +01:00
lambda
28872d8da4 Merge branch 'feature/follow-import' into 'develop'
Add feature: follow import.

See merge request pleroma/pleroma-fe!188
2017-12-23 20:20:59 +00: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
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