Commit graph

337 commits

Author SHA1 Message Date
Henry Jameson 0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop: (36 commits)
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Count spoiler text in the character count. Fixes #135.
  Added Irish (Gaeilge) Language
  Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
  simplify code
  adapt to destructive change of api
  Adds Occitan locale
  Updated italian translation
  Update oc.json
  Update oc.json
  Update of the oc.json file Actualizacion del fichièr oc.json
  Sort messages object by language code so that it's easier from the UI to browse them.
  explicitly set collapseMessageWithSubject to undefined
  Fall back to instance settings consistently
  ...
2018-11-26 04:33:41 +03:00
Henry Jameson 18e0828ee7 last shadow override i wanted to make for now. also small tweak 2018-11-21 21:40:45 +03:00
Henry Jameson dc3df7bc4e fixes 2018-11-21 18:22:05 +03:00
Roger Braun 2c2c4452b9 Fix posting. 2018-11-08 19:34:59 +01:00
Roger Braun 6f668df697 Count spoiler text in the character count. Fixes #135. 2018-11-07 17:20:33 +01:00
Henry Jameson 96804d42f0 Some themeing is working!! 2018-10-07 19:59:22 +03:00
Henry Jameson ef968d8e1e now it actually works 2018-09-25 15:16:26 +03:00
Henry Jameson 394153380d more missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson 82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson 89f9b3a468 fixed autocomplete 2018-09-12 11:46:02 +03:00
Henry Jameson 36101abc22 Simplified image sensitivity label 2018-09-03 18:52:07 +03:00
Henry Jameson 17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
William Pitcock f9bfe2ea37 post status form: styling fixes for content-type selector, align icons with selector 2018-08-31 04:23:06 +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
scarlett 74a6df8a55 Match users using startsWith instead of match. 2018-08-26 13:51:21 +01:00
scarlett b68ebf3056 Match emoji using startsWith instead of match. 2018-08-26 13:50:36 +01:00
scarlett 54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
scarlett a7811e7bd9 Add a checkbox for marking a post's attachments as NSFW 2018-08-25 22:18:43 +01:00
William Pitcock 95e6bccec5 Revert "Unify button styles and use min-width"
This reverts commit 8f79193883.
2018-08-20 18:06:29 +00:00
kaniini 9982376f9a Merge branch 'feature/theme-export-import' into 'develop'
Theme import & export

Closes #119

See merge request pleroma/pleroma-fe!290
2018-08-20 00:03:35 +00:00
kaniini 702dfcec10 Merge branch 'develop' into 'fixes-and-tweaks'
# Conflicts:
#   src/i18n/messages.js
2018-08-19 23:59:15 +00:00
William Pitcock 61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00:00
Henry Jameson 627e227076 fixes hella ton of annoyances with file upload display 2018-08-15 14:53:40 +03:00
lambda db6ff4824a Merge branch 'feature/focus_reply_form' into 'develop'
Focus textarea when clicking "reply"

See merge request pleroma/pleroma-fe!298
2018-08-12 10:48:08 +00:00
Henry Jameson d5efa10946 hopefully, fix linter 2018-08-06 09:52:07 +03:00
Henry Jameson 976444064f Fixes broken custom emoji in autocomplete when proxying to remote BE 2018-08-06 09:45:22 +03:00
Toromino 88a81406e3 Remove trailing whitespace 2018-08-05 19:41:34 +00:00
Toromino fd484a1a62 Textarea is now focused when replying 2018-08-05 19:17:11 +00:00
lambda 17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'"
This reverts merge request !291
2018-07-12 07:20:39 +00:00
Ole Bertram 8f79193883
Unify button styles and use min-width
This seemed to be the same across multiple components anyway.

Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
2018-07-04 13:49:31 +02:00
Vivian Lim b3e122d31f Carry forward content warnings in replies 2018-06-28 23:39:01 -07:00
Ole Bertram 44428e8b09
Add warning/info text on appriopriate status scopes 2018-06-23 22:10:15 +02:00
Ole Bertram 05bc6fa8e8
Add title text with description to scope icons 2018-06-23 22:09:13 +02:00
Roger Braun d4f5b3feec Use parents scope if available. 2018-06-12 19:28:48 +02:00
Roger Braun d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
Astra d62e702994 should resolve a 3/4 things 2018-06-07 17:31:43 -04:00
Astra a759378b4d more lint fixes 2018-06-07 05:18:54 -04:00
Astra f49229974a correct linter problems 2018-06-07 05:08:39 -04:00
Astra 92a8ca0011 crt's compose box changes 2018-06-07 05:03:50 -04:00
Henry Jameson 4c3d62da04 fixed autocomplete lacking highlight 2018-05-12 15:19:53 +03:00
Henry Jameson 55aeb5b4b2 fix 2018-05-12 15:19:53 +03:00
Henry Jameson fc1283da83 fixed nsfw hider having very small height, some border-radii for consistency 2018-05-12 15:19:53 +03:00
Henry Jameson 57e91bc783 fix jumping inputbox's height 2018-05-12 15:19:53 +03:00
Roger Braun 462eeb90b9 Add message preset functionality. 2018-04-29 16:44:08 +02:00
shpuld ce0b551c59 some ugly hack to prevent the jump in form height when you input first character 2018-04-16 17:52:43 +03:00
Henry Jameson e9e37a034c fml 2018-04-15 20:30:06 +03:00
Henry Jameson e1dce2c5af better approach 2018-04-15 19:05:16 +03:00
Henry Jameson 600b2d5bbd Added resizing inputbox on focus so that replying to The Discourse™ is less painful 2018-04-15 18:38:10 +03:00
shpuld a1f6ef1dca Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein. 2018-04-11 19:34:40 +03:00
Francis Dinh 52d72599ee Forgot to fix other tabs 2018-04-11 04:29:46 -04:00
Francis Dinh 11a89ee06d Replace tab indentation with spaces 2018-04-11 04:28:27 -04:00
Francis Dinh 3d8d941d89 Make autocomplete case insensitive 2018-04-11 04:23:13 -04:00
Henry Jameson cc02672e14 made alerts use red with transparent theme red. some UI improvs 2018-04-08 03:22:03 +03:00
Henry Jameson 65f82cf294 <select> styling (abeit somewhat not pretty code-wise), default colors for
default schemes.
2018-04-07 21:58:29 +03:00
Henry Jameson 529643d35a indents 2018-04-07 19:30:27 +03:00
Henry Jameson 3df7c1977f fixes 2018-04-07 16:40:08 +03:00
Henry Jameson 33b1d85921 border-radii moved to variables, made rgbo colors use theme data, customizable
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson acdb5e5c7a cleanup. added fallback mechanism for IE11 and unsupported browsers. 2018-04-07 16:36:35 +03:00
Henry Jameson aa0564406a getting rid of baseXX, some small fixes. Seems to be usable. 2018-04-07 16:34:11 +03:00
eal cbd113f762 Merge branch 'feature/user-picker-keyboard-support' into 'develop'
Add keyboard support for user/emoji picker.

Closes #56

See merge request pleroma/pleroma-fe!200
2018-02-24 08:08:41 +00:00
dtluna 591dadad13 Disable the submit button and apply error class to the characters left indicator 2018-02-11 17:07:29 +03: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
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
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
aka 84b0d54cd0 Fixes issue #58 2018-01-31 14:48:09 -03:00
eal b67c506062 Merge branch 'develop' into feature/normal-emoji-completion 2017-12-23 19:52:16 +02:00
Henry Jameson 1f413bb816 pasting images from clipboard, fuck ye 2017-11-28 23:31:40 +03: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
eal 581e3e836a Add completion for normal emoji. 2017-11-20 20:32:51 +02:00
shpuld 280758f867 Hide unknown type attachments, polish the upload preview styling 2017-11-20 13:27:45 +02:00
shpuld 44073e72fd Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency. 2017-11-17 02:17:36 +02:00
Henry Jameson ec55d49b88 kiinteät venytetyt tunteet 2017-11-13 00:57:41 +03:00
shpuld 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. 2017-11-08 12:34:15 +02:00
eal 447ec91176 Actually actually fix image url. 2017-09-19 22:58:15 +03:00
eal f4b1319eff Actually fix image url. 2017-09-19 22:54:54 +03:00
eal 70d66c48ad Fix image url. 2017-09-19 22:50:08 +03:00
eal 2162ef20b0 Add emoji completion. 2017-09-19 22:43:20 +03:00
eal 8a51bc6e22 Fix hide and cancel buttons on chromium 2017-09-10 13:33:02 +03:00
Shpuld Shpuldson 7061675e96 whoops lint 2017-08-24 16:25:26 +03:00
Shpuld Shpuldson c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments 2017-08-24 16:16:06 +03:00
Shpuld Shpuldson 2ef915c9f1 Don't allow posting again while previous hasn't returned 2017-08-22 11:43:03 +03:00
Shpuld Shpuldson d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts. 2017-08-21 15:35:14 +03:00
Shpuld Shpuldson 42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing. 2017-08-20 13:16:41 +03:00
Shpuld Shpuldson b284689313 Hotfix for JS error in auto completion in firefox. 2017-06-23 16:49:11 +03:00
Shpuld Shpuldson 3785a863cb Update branch and fix conflicts. 2017-06-19 11:32:40 +03:00
Shpuld Shpuldson 5dc22e9273 Clicking autocomplete will return focus to text area, make the autocomplete box disappear after clicking on a name. 2017-06-16 10:26:54 +03:00
Shpuld Shpuldson b24b891c1c Clean up styling a bit. 2017-06-16 10:15:10 +03:00
Shpuld Shpuldson 81d262af42 Fancier visuals for autocomplete list, with small avatar previews and all that. 2017-06-16 01:13:54 +03:00
Shpuld Shpuldson d0d95c59aa fix lint 2017-06-15 23:26:16 +03:00
Shpuld Shpuldson e0e8965c08 update branch and fix merge conflicts 2017-06-15 23:25:19 +03:00
Shpuld Shpuldson 7d46e3965d Fix meta-enter hotkey on osx 2017-06-15 22:21:14 +03:00
Shpuld Shpuldson b6b0a221c6 please the linter 2017-05-31 17:43:43 +03:00
Shpuld Shpuldson 7447f7c64d Set minimum height of 3 lines for textarea on focus, make it reset on post. 2017-05-31 17:36:22 +03:00
Shpuld Shpuldson 5465791372 eslint fix 2017-05-31 14:11:07 +03:00
Shpuld Shpuldson e704e1daaf Make post-status-form automatically resize to fit the input. 2017-05-31 14:02:54 +03:00
Roger Braun 48725ff9d0 Make linter happy. 2017-04-24 20:34:36 +02:00
Roger Braun 0c41adccff Remove tributejs
Alternative autocompletion is in the works and this one has injection problems.
2017-04-24 20:30:09 +02:00
Shpuld Shpuldson 88309b446f Adjust attachment preview margins. 2017-04-17 11:42:33 +03:00
Shpuld Shpuldson a3a9d8edd1 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/post-form-improvement 2017-04-17 11:21:40 +03:00
Shpuld Shpuldson 6b75874136 Move attachments below buttons to prevent the buttons from shifting after uploading. 2017-04-17 11:18:06 +03:00
Shpuld Shpuldson ca8755a6f3 Make X icon parent position: relative; to prevent it from floating on its own. 2017-04-17 10:45:12 +03:00
Roger Braun a766e886f5 Add a registration form. 2017-04-15 18:29:46 +02:00
Roger Braun 44923afbee Make linter happy. 2017-03-15 17:14:51 +01:00
Roger Braun 5249b1d23a Add basic mention completion. 2017-03-15 17:08:17 +01:00
shpuld 142a8a1a76 Fix poor choice of colors for input/textarea borders, adjust login form padding. 2017-02-24 19:43:27 +02:00
shpuld 9dfcf8a301 Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency. 2017-02-24 17:32:41 +02:00
Roger Braun 9778d4cfc0 More eslint fixes. 2017-02-22 22:43:40 +01:00
Roger Braun 5abf857705 Style fixes. 2017-02-22 22:33:28 +01:00
shpuld ded2d54cca Merged existing changes from 'develop' 2017-02-22 15:04:28 +02:00
shpuld 6c385ae80a Make drag&drop work on more browsers/platforms, make the Upload button accept drops as well. 2017-02-22 14:53:05 +02:00
Roger Braun 892b826df5 Small style adjustment, add meta-enter posting. 2017-02-21 21:48:48 +01:00
Roger Braun 34a593aa27 Merge branch 'develop' into feature/drag_and_drop_for_media_upload 2017-02-21 21:30:16 +01:00
Roger Braun 40fe40d96b Better attachment removal styling. 2017-02-21 15:24:35 +01:00
shpuld ca71722c1e Files dropped into post_status_form text box get sent to media_upload for attachment upload, media_upload reorganized a bit to allow reuse of existing code. 2017-02-21 15:13:19 +02:00
shpuld 2639427236 Ctrl-enter posts status 2017-02-19 01:41:51 +02:00
hakui 0faaeb02f3 fixed line-height for text box 2017-02-18 01:54:54 -06:00
hakui 734597b43f hello world 2017-02-18 01:48:35 -06:00
Roger Braun aa4a9fb24f Get mentioning names from central state store. 2016-11-30 18:30:43 +01:00
Roger Braun 5badc930c9 Search through both name and screen_name. 2016-11-30 17:07:50 +01:00
Roger Braun e1d6174689 Add basic username completion.
We need to get users into the store, though.
2016-11-30 13:39:17 +01:00
Roger Braun b812adf0ba Move submitDisable into data.
It's not a prop, these are only for passing data, not for local data.
2016-11-26 12:38:33 +01:00
dtluna 01edb7dbe4 Add remove attachment button 2016-11-26 05:00:06 +03:00
dtluna 6f0c73c30a Added previews for videos and audios 2016-11-26 03:19:25 +03:00
dtluna 4f8d476a2b Add fileTypeService 2016-11-25 20:21:25 +03:00
dtluna 96b4997492 Disable the submit button while uploading attachment 2016-11-25 01:07:21 +03:00
dtluna 93be453037 Set cursor to hand when hovering over buttons 2016-11-23 01:58:25 +03:00
Roger Braun c9ab70db8e Login form, post status form, status css fixes. 2016-11-12 21:31:41 +01:00
Roger Braun f0f5d8c913 CSS fixes for attachments in status posts. 2016-11-12 21:05:01 +01:00
Roger Braun 93eb6671c6 Linting fixes. 2016-11-07 15:04:27 +01:00
Roger Braun e21a60096c Add media upload to PostStatusForm. 2016-11-06 19:30:35 +01:00
Roger Braun 572aceb7e7 Hide after posting. 2016-11-03 17:35:49 +01:00
Roger Braun 9ff8bf4c14 Make mention strings work. 2016-11-03 17:17:32 +01:00
Roger Braun 7e2c52b12c Add replies. 2016-11-03 16:59:27 +01:00
Roger Braun 7980558461 Basic status posting. 2016-10-30 16:54:44 +01:00