Commit graph

1397 commits

Author SHA1 Message Date
kaniini
48391a45ba Merge branch 'bugfix/fetch-friends-id' into 'develop'
Pass user id to fetchFriends

See merge request pleroma/pleroma-fe!326
2018-08-31 04:09:33 +00:00
meireikei
2e37e8cf39 Pass user id to fetchFriends
It looks like the API that fetchFriends expects was changed, to require
an ID.
2018-08-31 04:07:25 +00:00
kaniini
e71b0411aa Merge branch 'post-button-labels' into 'develop'
Add labels to post buttons

See merge request pleroma/pleroma-fe!323
2018-08-31 04:04:44 +00:00
kaniini
84aa1ecdcd Merge branch 'feature/rich-text' into 'develop'
initial rich text authoring support

See merge request pleroma/pleroma-fe!325
2018-08-31 03:54:37 +00:00
William Pitcock
cabcb5c81b i18n: make "plain text" translatable 2018-08-31 03:42:12 +00:00
William Pitcock
9a43ba73e6 add the ability to select a post's content type 2018-08-31 03:42:11 +00:00
Henry Jameson
8c07e63f77 fix 2018-08-31 04:39:07 +03:00
Henry Jameson
76df311899 Revert "add the ability to select a post's content type"
This reverts commit 38e3c2493d.
2018-08-31 04:31:59 +03:00
Henry Jameson
c2a4ae3654 Merge branch 'polish' into shigusegubu
* polish:
  added option for logo in navbar to follow color scheme of the rest of the site also fixed potential mess-up between api/static configs
  i18n: make "plain text" translatable
  add the ability to select a post's content type
2018-08-31 04:21:46 +03:00
Henry Jameson
46d8b55d44 Merge remote-tracking branch 'upstream/develop' into polish
* upstream/develop:
  i18n: make "plain text" translatable
  add the ability to select a post's content type
2018-08-31 04:20:40 +03:00
Henry Jameson
e99534ef71 added option for logo in navbar to follow color scheme of the rest of the site
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
William Pitcock
20a67e6809 i18n: make "plain text" translatable 2018-08-31 00:44:25 +00:00
William Pitcock
38e3c2493d add the ability to select a post's content type 2018-08-31 00:42:42 +00:00
Henry Jameson
8205cdd9f7 Merge branch 'polish' into shigusegubu
* polish:
  fix
  vodka translations
2018-08-30 23:00:06 +03:00
Henry Jameson
63fdad8703 fix 2018-08-30 22:59:52 +03:00
Henry Jameson
1461a52ade vodka translations 2018-08-30 20:45:50 +03:00
Henry Jameson
5b98b694d3 vodka translations 2018-08-30 20:43:24 +03:00
Henry Jameson
6421b40141 Simplified image sensitivity label 2018-08-30 20:30:04 +03:00
Henry Jameson
62e9a2a120 Merge branch 'polish' into shigusegubu
* polish:
  fix
2018-08-30 20:16:46 +03:00
Henry Jameson
065d1c7f49 fix 2018-08-30 20:16:36 +03:00
Henry Jameson
24dcc2674b Merge branch 'polish' into shigusegubu
* polish:
  fix
2018-08-30 19:53:27 +03:00
Henry Jameson
3b9cb1384a fix 2018-08-30 19:53:13 +03:00
Henry Jameson
aaba8432c2 Merge branch 'polish' into shigusegubu
* polish: (21 commits)
  fixed #87
  fixup! panel styling cleanup
  fixup! fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
  fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
  fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
  fixes broken nsfw hider in notifications
  restored "progress" cursor indicator for loading nsfw images
  fixed #72
  Added ability to hide certain types of notifications
  fixup! Separated tab-switcher into a reusable component. This depends on JSX addition
  minor style tweaks
  panel styling cleanup
  moved replies filtering to "filter" category in settings, made it more consistent
  settings page update
  tabs for settings
  allow multiple file upload
  Show lock icon instead of hiding repeat button, tusky-style. Added hint explaining what's going on. Fixes favorite button jumping left and right depending on post visibility
  Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
  fixed still-image not preserving original aspect ratio and resolution.
  Separated tab-switcher into a reusable component. This depends on JSX addition
  ...
2018-08-30 18:37:36 +03:00
Henry Jameson
fa4c4c9122 fixed #87 2018-08-30 18:23:43 +03:00
Henry Jameson
fa1116249d fixup! panel styling cleanup 2018-08-30 17:13:54 +03:00
Henry Jameson
42584b1a34 fixup! fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing. 2018-08-30 16:52:38 +03:00
Henry Jameson
4589466917 fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing. 2018-08-30 16:34:24 +03:00
Henry Jameson
507d5bc444 fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing. 2018-08-30 16:27:35 +03:00
Henry Jameson
1246463f96 fixes broken nsfw hider in notifications 2018-08-30 16:21:10 +03:00
Henry Jameson
fb7f65481e restored "progress" cursor indicator for loading nsfw images 2018-08-30 16:11:31 +03:00
Henry Jameson
e58221fb87 fixed #72 2018-08-30 16:02:53 +03:00
Henry Jameson
b0e0686c7f Added ability to hide certain types of notifications 2018-08-28 21:21:29 +03:00
Henry Jameson
66a22762c2 fixup! Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-28 16:22:49 +03:00
Henry Jameson
da362b2b88 minor style tweaks 2018-08-28 16:20:04 +03:00
Henry Jameson
330288b4cd panel styling cleanup 2018-08-28 16:14:32 +03:00
Henry Jameson
c3b27ab4c2 moved replies filtering to "filter" category in settings, made it more consistent 2018-08-28 15:47:42 +03:00
Henry Jameson
cff4177bf3 settings page update 2018-08-28 15:38:07 +03:00
Henry Jameson
b48a3210a3 tabs for settings 2018-08-28 14:28:05 +03:00
Henry Jameson
8e560676f1 allow multiple file upload 2018-08-28 14:05:03 +03:00
Henry Jameson
68d15f665e Show lock icon instead of hiding repeat button, tusky-style. Added hint
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
2018-08-28 13:42:44 +03:00
Henry Jameson
226849b26e Added logic to process reply to favorite request and update likes counter
accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-27 23:15:58 +03:00
Henry Jameson
fd604dfd2a fixed still-image not preserving original aspect ratio and resolution. 2018-08-27 22:40:30 +03:00
Henry Jameson
eacbd9b500 Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-27 22:22:25 +03:00
Henry Jameson
b4cc1e020b added JSX support 2018-08-27 21:25:00 +03:00
Henry Jameson
16ec650b71 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (37 commits)
  Match users using startsWith instead of match.
  Match emoji using startsWith instead of match.
  remove-unused-settings
  Preserve subject in replies.
  Don't use nsfw clickthrough if the post is collapsed by default.
  correct /static/config.json decoding
  save /api/statusnet/config.json connection
  rename apiStatusnetConfigSitePleromafe to apiConfig
  fix typo
  Add a checkbox for marking a post's attachments as NSFW
  When a post with a subject is collapsed, hide its attachments.
  Make interface language configurable from settings
  attachment: add support for rendering alt text on images
  Don't hide replies when inConversation.
  Fix indentation
  Remove old implementation of isReply.
  Add settings for changing the visibility of replies in the timeline.
  Update Russian translations
  update
  fixed error not displaying for 500 error.
  ...
2018-08-27 14:32:55 +03:00
Ekaterina Vaartis
d2640d4bb5 Add titles to source/expand buttons 2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
kaniini
2dd99c7dd9 Merge branch 'emoji-shortcode-startswith' into 'develop'
For user and emoji shortcode autocomplete, match using startsWith() instead of match().

Closes #135

See merge request pleroma/pleroma-fe!320
2018-08-26 20:32:00 +00:00
kaniini
257da5c740 Merge branch 'remove-unused-settings' into 'develop'
Remove unused settings

See merge request pleroma/pleroma-fe!319
2018-08-26 20:31:25 +00:00
scarlett
74a6df8a55 Match users using startsWith instead of match. 2018-08-26 13:51:21 +01:00