Commit graph

3072 commits

Author SHA1 Message Date
kaniini
b4796ccbf6 Merge branch 'feature/notification-controls' into 'develop'
wire up notification settings

See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
feld
9c0ec9b794 Merge branch 'fix/interactions-i18n' into 'develop'
Interactions i18n

See merge request pleroma/pleroma-fe!817
2019-05-31 15:19:10 +00:00
Mark Felder
f67f14495b i18n 2019-05-31 10:13:06 -05:00
Shpuld Shpludson
50618b81c8 Merge branch '543' into 'develop'
Fix "stale user settings shown after save"

Closes #543

See merge request pleroma/pleroma-fe!813
2019-05-29 17:08:27 +00:00
Shpuld Shpludson
6045708a5d Merge branch 'fix-dropdown' into 'develop'
move drowdown menu to popper

Closes #559

See merge request pleroma/pleroma-fe!814
2019-05-29 16:55:28 +00:00
taehoon
0532995847 wire up user.description with masto api data 2019-05-29 12:32:14 -04:00
HJ
152617e20d Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'
i18n/Add Japanese with kanji (2)

Closes #522

See merge request pleroma/pleroma-fe!816
2019-05-29 05:31:03 +00:00
Hakaba Hitoyo
443794b000 i18n/Add Japanese with kanji (2) 2019-05-29 05:31:03 +00:00
Henry Jameson
6c7eeb93fe move drowdown menu to popper 2019-05-27 00:13:08 +03:00
William Pitcock
855566f887 notification controls: redesign entirely 2019-05-25 23:44:36 +00:00
William Pitcock
ac97cd3e46 entity normalizer: collapse data.pleroma if blocks 2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576 wire up notification settings 2019-05-25 07:34:59 +00:00
HJ
ab34a75bcf Merge branch '556' into 'develop'
Fix User links/mentions opening in new tab issue

Closes #556

See merge request pleroma/pleroma-fe!808
2019-05-23 05:34:15 +00:00
taehoon
2af35b8404 do not miss statusnet_profile_url of mentions 2019-05-22 23:47:20 -04:00
HJ
45961331b6 Merge branch 'update-hebrew-transalation' into 'develop'
Update he.json

See merge request pleroma/pleroma-fe!807
2019-05-22 18:50:32 +00:00
j1t
4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00
j1t
3b3e4ffc54 Translate up to settings. 2019-05-22 01:46:08 +03:00
HJ
233506f6c1 Merge branch 'fix-pipelines' into 'develop'
Fix pipelines and clean up console output

See merge request pleroma/pleroma-fe!804
2019-05-21 18:27:43 +00:00
Henry Jameson
52475dbf23 Fix pipelines and clean up console output 2019-05-21 21:22:00 +03:00
HJ
0fc7cbfa24 Merge branch 'fetags' into 'develop'
add tags to data and to status component

See merge request pleroma/pleroma-fe!801
2019-05-20 21:02:29 +00:00
HJ
b78ad8998d Merge branch 'masto-remains' into 'develop'
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that

See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
Moonman
0f824ff311 switch from method to computed property 2019-05-20 15:23:36 -04:00
HJ
b436e0dd12 Merge branch 'webpack-4-dart-sass' into 'develop'
Massive update for dependencies

See merge request pleroma/pleroma-fe!734
2019-05-20 18:09:14 +00:00
Shpuld Shpludson
5b8f5eddbf Merge branch 'feature/remove-hypenation' into 'develop'
Remove auto-hyphenation

See merge request pleroma/pleroma-fe!800
2019-05-20 16:43:15 +00:00
Moonman
f6600a35a5 formatting 2019-05-20 00:15:58 -04:00
Moonman
fc9acf8fb6 add tags to data and to status component 2019-05-20 00:03:50 -04:00
Senko-san
229c65959e Remove auto-hyphenation
Auto-hyphenation has terrible heuristics on all browsers, disable it.

Source: https://justmarkup.com/articles/2019-01-28-a-look-at-css-hyphenation-in-2019/
2019-05-20 00:43:35 +01:00
HJ
4ea0db5cb1 Merge branch '540' into 'develop'
Fix wrong mouse pointer hot zone in the post status box

Closes #540

See merge request pleroma/pleroma-fe!795
2019-05-19 19:39:19 +00:00
taehoon
205a9821e6 make staff label visible 2019-05-19 14:28:29 -04:00
taehoon
e01ffc67c6 move visibility-tray css in local scope 2019-05-19 14:28:29 -04:00
taehoon
34ffcb028a refactor css 2019-05-19 14:28:29 -04:00
taehoon
9adbc2c17f make only screen name as link 2019-05-19 14:28:29 -04:00
taehoon
9e6a91e755 refactor css for visibility tray 2019-05-19 14:28:29 -04:00
Henry Jameson
15b3651a30 moved setting styles into common to avoid bug with shared styles 2019-05-19 20:42:44 +03:00
HJ
facf076d47 Merge branch '542' into 'develop'
Hide three dot menu button if has no items

Closes #542

See merge request pleroma/pleroma-fe!797
2019-05-19 14:38:57 +00:00
taehoon
07d0143bda hide three dot menu button if has no items 2019-05-19 09:16:47 -04:00
Shpuld Shpludson
5bf208f2d1 Merge branch 'fix/mobile-zoom' into 'develop'
Eliminate automatic zooming on mobile

See merge request pleroma/pleroma-fe!799
2019-05-18 16:56:20 +00:00
Mark Felder
0a6858eab8 Eliminate automatic zooming on mobile 2019-05-18 11:00:50 -05:00
kaniini
e14a15845c Merge branch 'bugfix/emoji-tooltip' into 'develop'
entity normalizer: add tooltip text to emojis

Closes #544

See merge request pleroma/pleroma-fe!798
2019-05-17 20:15:12 +00:00
William Pitcock
00ad97fcfa entity normalizer: add tooltip text to emojis 2019-05-17 20:10:50 +00:00
HJ
23c4c0c758 Merge branch '541' into 'develop'
Update Admin API urls in accordance with new docs

Closes #541

See merge request pleroma/pleroma-fe!796
2019-05-16 18:30:12 +00:00
taehoon
2457dd9b91 rename for consistency's sake 2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af update admin api urls in accordance with new docs 2019-05-16 13:21:14 -04:00
HJ
2be3d5fd5f Merge branch 'fix/line-up-text-format-picker' into 'develop'
Line up rich text format picker with the status form

See merge request pleroma/pleroma-fe!785
2019-05-15 19:53:33 +00:00
Shpuld Shpludson
81278651d9 Line up rich text format picker with the status form 2019-05-15 19:53:33 +00:00
HJ
fedcc71676 Merge branch '468-pin-status' into 'develop'
Add ability to pin posts

Closes #468

See merge request pleroma/pleroma-fe!770
2019-05-15 18:26:09 +00:00
Henry Jameson
aa24ac7ea6 fix lint 2019-05-15 20:49:46 +03:00
Henry Jameson
7976d118ca Cleanup, little documentation, localization 2019-05-15 20:44:35 +03:00
taehoon
2ce0186327 update api service functions 2019-05-15 12:04:26 -04:00
taehoon
daba688f46 remove needless importing 2019-05-15 12:04:26 -04:00