Commit graph

304 commits

Author SHA1 Message Date
HJ
8f53796420 Merge branch 'develop' into 'eslint-fix'
# Conflicts:
#   src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
Henry Jameson
8d6750d9c2 eslint --fix --ext .js,.vue src 2019-07-05 10:17:44 +03:00
taehoon
6c6aa8446d place scope selector on the left consistently 2019-07-03 12:19:25 -04:00
taehoon
0c102deeed hide text format when only plaintext is available 2019-07-02 16:36:14 -04:00
Shpuld Shpludson
30a340955e Move character counter into the input box 2019-06-22 13:41:02 +00:00
lain
0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
HJ
69eff65130 Merge branch 'refactor-emoji-input' into 'develop'
EmojiInput refactoring

Closes #565

See merge request pleroma/pleroma-fe!824
2019-06-18 19:17:37 +00:00
Henry Jameson
0032802f0a review 2019-06-18 21:30:35 +03:00
Henry Jameson
e3638af031 Removed formattingOptionsEnabled in favor of relying on BE-provided list of
accepted formatting options
2019-06-16 20:16:52 +03:00
Henry Jameson
e536a56250 Linting 2019-06-09 22:40:38 +03:00
Henry Jameson
76b9a66e98 fixed several bugs 2019-06-09 20:40:46 +03:00
Henry Jameson
8872b4802e standartized autocomplete panel suggesions format, fixed some bugs 2019-06-08 16:23:58 +03:00
Henry Jameson
96f31716f9 slot-based emoji input/autocomplete component 2019-06-07 00:17:49 +03: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
taehoon
e01ffc67c6 move visibility-tray css in local scope 2019-05-19 14:28:29 -04:00
taehoon
9e6a91e755 refactor css for visibility tray 2019-05-19 14:28:29 -04:00
Shpuld Shpludson
81278651d9 Line up rich text format picker with the status form 2019-05-15 19:53:33 +00:00
Henry Jameson
addeb85220 fix prod build 2019-05-13 21:54:25 +03:00
eugenijm
a89010843d Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice. 2019-05-08 16:50:39 +03:00
eugenijm
4af343374a Move scope visibility notice to the status form, make it dismissible 2019-05-07 19:13:45 +03:00
eugenijm
befaa477a3 Display additional scope description above the status form for mobile users. 2019-05-06 18:10:58 +03:00
jared
885f4c9924 #101 - bind outside click, add emoji to post status form 2019-04-08 12:02:50 -04:00
dave
67258571c5 #469 - update behavior of safe_dm 2019-04-02 11:19:45 -04:00
dave
9d5ed04147 #469 - clean up 2019-04-02 10:28:38 -04:00
dave
c9a9b3122d #469 - DM warning text should vary based on BE setting 2019-04-02 10:26:14 -04:00
Henry Jameson
4dc64438e9 aaaaggghh 2019-03-30 12:41:42 +02:00
Henry Jameson
9f4a9bff46 Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
* upstream/develop: (173 commits)
  Fix: Change condition
  fix typo
  update store according to retweeted status
  #433 - update sort by for conversation
  display replies_count right after reply icon
  expose replies_count from mastodon api
  Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
  make side drawer use gesture service and fix its animations
  review/remove error hiding
  errata
  review
  #433 - sort conversation for retweets and clean up
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  Remove console log
  Fix warnings in user profile routing
  Add tests for gesture service, fix bug with perpendicular directions
  #255 - clean up autocomplete form
  #255 - clean up user settings page with self-closing html tags
  ...
2019-03-30 12:31:50 +02:00
Henry Jameson
bf927122df Review 2019-03-30 12:25:23 +02:00
jared
8fe9101f0b #255 - clean up autocomplete form 2019-03-26 14:53:27 -04:00
jared
2927454233 #255 - support textarea and update user settings page 2019-03-26 13:40:37 -04:00
jared
b97a033839 #255 - add emoji input component 2019-03-25 22:38:15 -04:00
Shpuld Shpludson
57b82e9236 Merge branch 'file-paste' into 'develop'
#455 - prevent text pasting if image is pasted

Closes #455

See merge request pleroma/pleroma-fe!705
2019-03-25 16:52:25 +00:00
Shpuld Shpludson
182eab051d Merge branch 'develop' into 'develop'
Remove border radius of suggested emojis

See merge request pleroma/pleroma-fe!704
2019-03-25 16:52:01 +00:00
taehoon
909c315a44 Get correct mimetype through entity_normalizer 2019-03-24 21:16:57 -04:00
taehoon
9802344603 Switch to mastoapi for posting status and uploading media 2019-03-24 21:16:56 -04:00
nik
b241539d4d prevent text pasting if image is pasted 2019-03-23 22:45:24 -05:00
nik
05634d222d remove border radius of suggested emojis 2019-03-23 22:26:31 -05:00
dave
3468c0fd04 #432 - prevent post status form textarea keydown event propagation 2019-03-08 13:53:46 -05:00
Shpuld Shpludson
bf1fa52e5e Merge branch 'fix/post-content-type' into 'develop'
#327: Load post status content type from instance config

Closes #327

See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
Edijs
292cdfb24b Merge content types translations 2019-03-06 20:13:04 -08:00
Henry Jameson
6184c88ac7 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:45:17 +02:00
dave
bbab1b1dc6 #346: Hyperlink is not included 2019-02-28 21:03:35 -05:00
dave
09822cc15b #383: content type error 2019-02-21 11:16:11 -05:00
dave
f2ce2e9176 #344 - replace float: with flexbox, clean up 2019-02-11 22:35:24 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
dave
97fbc1d402 #312 - media uploader not working with same file in adjacent order 2019-02-04 10:45:26 -05:00
3c4cf5ed11 Only generate mentions string if there are mentions
Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder.
2019-01-31 00:50:19 +00:00
HJ
698328dfbe Merge branch 'fix_textfields' into 'develop'
Fix textarea not resizing correctly and probably cursor position

Closes #230

See merge request pleroma/pleroma-fe!430
2018-12-25 01:29:18 +00:00
Henry Jameson
18d7684f32 fix for non-shrinking main post form 2018-12-25 04:25:19 +03:00
Henry Jameson
5970bf4e85 fixed incorrect height when empty text 2018-12-20 07:27:29 +03:00
Henry Jameson
afa2baec0c I suppose SOME browsers don't do this by default... 2018-12-20 07:17:54 +03:00
Henry Jameson
ae7b96abbf Fix resize not working properly for textareas 2018-12-20 07:17:54 +03:00
Henry Jameson
c7514be46f Fixed some settings not using defaults from instance config. Made some parts of
code more readable
2018-12-18 23:31:10 +03:00
Shpuld Shpludson
67c2a607aa Feature/bigger icons for mobile / #211 2018-12-18 18:26:14 +00:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Rinpatch
6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +03:00
HJ
e443716bcd Merge branch 'fix-scope-copy' into 'develop'
Fix typo that prevented scope copy from working.

Closes #214

See merge request pleroma/pleroma-fe!413
2018-12-13 10:39:50 +00:00
Henry Jameson
9f48055261 Fix typo that prevented scope copy from working. 2018-12-13 13:34:47 +03:00
Rinpatch
bf8bb9ce13 Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n 2018-12-12 16:38:01 +03:00
rinpatch
4fde987e34 Fix formating 2018-12-08 22:39:58 +01:00
rinpatch
f69331e49d Improve error messages 2018-12-08 22:36:54 +01:00
Rinpatch
ba188eddab [pleroma#36] Add upload errors 2018-12-08 18:23:21 +03:00
Maxim Filippov
6532462b95 Move old routes to /p, use /nickname for user profiles 2018-12-06 22:09:54 +03:00
Henry Jameson
51cf4dc298 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
Henry Jameson
b34097a5c1 Added option to auto-hide subject field when it's empty. 2018-12-03 06:47:35 +03:00
Henry Jameson
a806d43f05 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop: (60 commits)
  whoops
  whoops
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  On logout switch to public timeline.
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Put oauth text into description.
  Display OAuth login on login form button.
  ...
2018-11-26 05:21:58 +03:00
Henry Jameson
b948234aec whoops 2018-11-26 04:44:54 +03:00
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