Commit Graph

1033 Commits

Author SHA1 Message Date
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
lambda 25edb8675d Merge branch 'update-es-translation' into 'develop'
Update Spanish translation

See merge request pleroma/pleroma-fe!204
2018-02-09 16:10:26 +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 082a119fd7 Merge branch 'fix/component-list-keys' into 'develop'
Add keys to all component lists.

See merge request pleroma/pleroma-fe!203
2018-02-05 14:05:07 +00:00
eal e647bb22bb Add keys to all component lists. 2018-02-04 17:26:46 +02:00
eal 7957489aa0 Merge branch 'theme-edit-color-fields' into 'develop'
HTML5  <input type="color"> for theme editing

See merge request pleroma/pleroma-fe!172
2018-02-04 14:42:04 +00: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
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