Commit Graph

3546 Commits

Author SHA1 Message Date
Henry Jameson 0f55359b49 fix 2019-09-25 08:43:02 +03:00
Henry Jameson 4f563e6efb account for parent padding, too 2019-09-25 08:36:30 +03:00
Henry Jameson daa0e284c3 forgotten file 2019-09-25 00:21:55 +03:00
Henry Jameson ca92e29401 WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit" 2019-09-25 00:17:04 +03:00
Henry Jameson 2154152d08 fix some bugs 2019-09-24 00:06:53 +03:00
Henry Jameson 6f0257cd7d autoscroll post form on typing + some minor improvements 2019-09-23 22:12:25 +03:00
Henry Jameson 7b4cb38734 split spam mode into two separate options (one in settings page) 2019-09-23 20:36:49 +03:00
eugenijm aafb29c589 Added a setting to hide follow/follower count from the user profile 2019-09-23 16:19:21 +03:00
Maksim Pechnikov f0b9f5d29c use `repeats` intead `boosts` 2019-09-22 14:45:42 +03:00
Maksim Pechnikov 8721fb57fc added support hide\show reblogs from a specific user 2019-09-21 16:24:47 +03:00
taehoon 7fe6ba2401 avoid using global class 2019-09-20 11:35:47 -04:00
taehoon 37ae0fd92c fix logo moving bug when lightbox is open 2019-09-20 11:35:47 -04:00
taehoon 92be5a6877 Reserve scrollbar gap when body scroll is locked 2019-09-20 11:35:47 -04:00
taehoon ae70439447 setting display: initial makes trouble, instead, toggle display: none using classname 2019-09-20 11:35:47 -04:00
taehoon ad504768fe lock body scroll 2019-09-20 11:35:47 -04:00
taehoon 8b321f6f1f add body-scroll-lock directive 2019-09-20 11:35:47 -04:00
taehoon c8a18f387c wire up props with PostStatusModal 2019-09-20 11:29:31 -04:00
taehoon d6a941a128 rename component 2019-09-20 11:29:29 -04:00
taehoon 0c8038d4f6 recover autofocusing behavior 2019-09-20 11:29:27 -04:00
taehoon a9f33272a8 refactor MobilePostStatusModal using new PostStatusModal 2019-09-20 11:29:26 -04:00
taehoon f4bbf1d4e2 add new module and modal to post new status 2019-09-20 11:29:24 -04:00
taehoon 90981dcce6 remove needless condition 2019-09-20 11:29:23 -04:00
taehoon 5ff899b455 add mention button 2019-09-20 11:29:21 -04:00
taehoon f8139e369c wire up user state with global store 2019-09-20 11:25:00 -04:00
taehoon 8618857aa3 collapse fav/repeat notifications from muted users 2019-09-20 11:25:00 -04:00
rinpatch 1306fac38f Merge branch 'develop' into 'muting-fixes'
# Conflicts:
#   src/components/status/status.js
2019-09-16 11:38:37 +00:00
HJ 3cd23ae2d4 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-16 07:23:56 +00:00
Henry Jameson 312e2aa14f fix bottom-left icons being too damn wide 2019-09-15 12:51:39 +03:00
Henry Jameson a1ed1b9b53 improved post form's icons at bottom display 2019-09-15 12:30:07 +03:00
Henry Jameson e366adbb6c updated logic for padding with spaces, improved spam mode 2019-09-15 12:30:02 +03:00
Henry Jameson d2fe797821 update status/user card to use same gradient mask fading effect instead of
background hack
2019-09-15 02:14:40 +03:00
Henry Jameson f0cb6fe03f Fixed scrollability not being obvious, added fade effect 2019-09-15 01:16:54 +03:00
taehoon baebf08d20 do not collapse thread muted posts in conversation 2019-09-13 22:59:45 -04:00
taehoon 6a3f283256 detect thread-muted posts 2019-09-13 22:59:24 -04:00
taehoon 2f79a7b4a0 do not change word based muting logic 2019-09-13 16:55:17 -04:00
taehoon b10558f721 do not collapse muted user's posts on muted user's media timeline 2019-09-13 16:17:51 -04:00
taehoon 09deb69bc7 do not collapse muted user's posts on muted user's profile page 2019-09-13 15:38:04 -04:00
Shpuld Shpludson 09db4ceb1a Merge branch 'fix/italics-not-selectable' into 'develop'
fix italics not being selectable

See merge request 
2019-09-13 17:21:15 +00:00
Shpuld Shpuldson 794481d76c fix italics not being selectable 2019-09-13 20:16:05 +03:00
Henry Jameson 3505e53756 review/naming + bugfix for stickers 2019-09-12 20:36:43 +03:00
Henry Jameson 9bd0ed7912 updated logic for hiding picker and also added ability to hide suggestions with
esc key
2019-09-12 20:25:11 +03:00
Henry Jameson 0d8b68632b Remove emoji zoom 2019-09-12 20:25:11 +03:00
Shpuld Shpludson 4a469d7fe3 Merge branch 'fix/follow-request-detection' into 'develop'
Utilize `user.requested` to display follow request status on user card

Closes 

See merge request 
2019-09-12 07:02:11 +00:00
davidyin a8cddecd41 fix some translation about blocks 2019-09-11 22:37:19 -07:00
davidyin d0fc509ad1 Complete the Chinese language file based on the version 0.9.999 2019-09-10 19:50:06 -07:00
HJ 4f0195b05c Apply suggestion to src/components/emoji_picker/emoji_picker.vue 2019-09-10 18:39:45 +00:00
tarteka 6217ef4718 fix some translates 2019-09-10 10:09:07 +02:00
Shpuld Shpludson 753d15ed37 Merge branch '651' into 'develop'
Fix "Needless context api requests when click timeago in conversation page"

Closes 

See merge request 
2019-09-09 19:47:58 +00:00
HJ 9651293956 Apply suggestion to src/components/emoji_picker/emoji_picker.js 2019-09-09 19:42:33 +00:00
Henry Jameson 9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
Henry Jameson 7360a4d9ef fix aspect 2019-09-08 17:11:45 +03:00
HJ 2237da0151 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-08 14:08:39 +00:00
Henry Jameson 4f88bb4ea1 scale emoji on hover 2019-09-08 17:01:28 +03:00
Henry Jameson 83f45167b6 added emoji zoom for picker 2019-09-08 16:56:54 +03:00
Henry Jameson 94afc5ee19 fixed scroll when switching back to emoji 2019-09-08 15:57:49 +03:00
Henry Jameson 14df84d89b fixed some bugs, added spam mode, minor collateral fixes 2019-09-08 15:51:17 +03:00
Henry Jameson db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (116 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
2019-09-08 13:44:29 +03:00
tarteka 5026d3719a fix some translates 2019-09-07 09:07:34 +02:00
tarteka 17a97ee6f5 fix some translates 2019-09-07 09:00:25 +02:00
taehoon ea5b36a597 refactor toggling body visibility using class 2019-09-06 11:17:29 -04:00
taehoon 9727009147 update prop name 2019-09-06 11:17:05 -04:00
taehoon 482cd52f77 stop fetching whole conversation when change highlighted status 2019-09-06 11:17:04 -04:00
taehoon c1f3b0dc75 refactoring 2019-09-06 11:17:04 -04:00
taehoon 214ab22c4c update prop binding 2019-09-06 11:17:04 -04:00
taehoon d7c68d408f accept status id instead of status obj as statusoid prop 2019-09-06 11:17:04 -04:00
tarteka 1167bafb19 Update es translate 2019-09-06 14:58:20 +02:00
tarteka f48d12b4bc update eu translate 2019-09-06 14:24:37 +02:00
Shpuld Shpludson e75ac9ddbc Merge branch 'mastoapi-externalprofile' into 'develop'
Replace `/api/externalprofile/show.json` with a MastoAPI equialent

See merge request 
2019-09-06 04:13:21 +00:00
Eugenij 8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +00:00
rinpatch 424d4ab57e Utilize `user.requested` to display follow request status on user card
Closes 
2019-09-05 11:17:53 +03:00
rinpatch b33667a743 Avoid iterating over statuses to set thread_muted if the backend does
not support the extension
2019-09-04 22:17:29 +03:00
rinpatch 1a5a7bbebf Set thread_muted for all statuses with the same conversation id on
status mute/unmute
2019-09-04 21:11:13 +03:00
taehoon d194431642 add a comment 2019-09-04 11:24:24 -04:00
taehoon cdbb8ca8b9 force img updating immediately 2019-09-04 11:24:24 -04:00
rinpatch 66a34b7ecf Properly detect thread-muted posts and set `with_muted` when fetching
notifications
2019-09-04 12:20:33 +03:00
Echedey López Romero d1244e4896 Fixed "sequimiento" to "seguimiento". 2019-09-03 17:51:50 +00:00
rinpatch 457290e81e Replace `/api/externalprofile/show.json` with a MastoAPI equialent
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
rinpatch 8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
Shpuld Shpludson 6238fe3633 Merge branch '652' into 'develop'
Fix "TypeError: Cannot set property 'pinned' of undefined"

Closes 

See merge request 
2019-09-03 04:48:24 +00:00
Shpuld Shpludson c43a5ab992 Merge branch 'patch-1' into 'develop'
Some corrections to the spanish translation

See merge request 
2019-09-03 04:11:16 +00:00
Shpuld Shpludson fbfedf0084 Merge branch 'fix/attachment-css' into 'develop'
Make image orientation consistent on FF, fix videos w/ modal

See merge request 
2019-09-03 04:09:56 +00:00
Echedey López Romero 66e9f17c58 "Optional" in lowercase. 2019-09-02 11:41:30 +00:00
Echedey López Romero 4f82ea0fea Update es.json 2019-09-01 21:57:07 +00:00
taehoon daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -04:00
taehoon 13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
Shpuld Shpludson 018a650166 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request 
2019-08-29 17:16:57 +00:00
taehoon 9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero 50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
taehoon e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
taehoon a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson 15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon 7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
taehoon 9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
taehoon 65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon 92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
taehoon 4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon 1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00
taehoon 4b444708f2 fix pin showing logic in conversation 2019-08-17 14:33:32 -04:00
Sergey Suprunenko d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
Shpuld Shpludson 58713e342d Merge branch 'eu-translate' into 'develop'
add Basque translate

See merge request 
2019-08-17 08:16:45 +00:00
Shpuld Shpludson 84c3403143 Merge branch 'es-translate' into 'develop'
[i18n] Spanish corrections

See merge request 
2019-08-17 08:15:06 +00:00
Shpuld Shpludson aef97bc9bc Merge branch 'update-nb' into 'develop'
Update norwegian bokmål translation

See merge request 
2019-08-17 08:14:47 +00:00
Hakaba Hitoyo 091fb5573c i18n/Update Japanese 2019-08-17 08:14:17 +00:00
Hakaba Hitoyo fc68c3907d i18n/Update pedantic Japanese 2019-08-17 08:14:00 +00:00
Shpuld Shpludson e8fad7a460 Merge branch 'telugu-translation' into 'develop'
i18n: Translated to Telugu (44.3%)

See merge request 
2019-08-17 08:13:29 +00:00
taehoon 7dfcabb543 sync profile tab state with location query 2019-08-15 13:25:38 -04:00
taehoon e8c22fbfa3 refactor TabSwitcher 2019-08-15 13:25:38 -04:00
taehoon 6e51774ccb use better name of controlled prop 2019-08-15 13:25:38 -04:00
taehoon eafd53f994 fix potential bug to render active tab in controlled way 2019-08-15 13:25:38 -04:00
taehoon 9dd9ba0205 remove unused param 2019-08-15 13:25:38 -04:00
taehoon df3e80b7c3 use key prop instead of dataset to identify active tab 2019-08-15 13:25:38 -04:00
taehoon cd14566a34 remove useless index param of onSwitch 2019-08-15 13:25:38 -04:00
taehoon 539913673f reset error state when load new profile 2019-08-15 13:25:38 -04:00
taehoon 2e0603bdca clear timelines only if load user not viewed previously 2019-08-15 13:25:38 -04:00
Hakaba Hitoyo dd340bb9e3 Fix/Fix links to external users in Who to follow page 2019-08-15 17:19:49 +00:00
taehoon 9229f28edb rel also accepts list, update rel detection logic 2019-08-13 13:11:37 -04:00
taehoon 5aa2c44487 use hashtag class detection as fallback 2019-08-12 15:22:39 -04:00
taehoon 5e99bad417 detect hashtag using rel instead of class 2019-08-12 14:48:11 -04:00
taehoon 0bce615fe8 hide ISP if the panel content is empty 2019-08-12 14:29:11 -04:00
taehoon a71d14704f fix user card overflow bug 2019-08-12 13:59:39 -04:00
Henry Jameson 5851f97eb0 fixed a lot of bugs with emoji picker, improved relevant components 2019-08-12 20:03:48 +03:00
Henry Jameson 579b5c9e77 initial attempts at making emoji-picker somewhat extensible 2019-08-12 14:20:08 +03:00
Henry Jameson 036882d27c rename for consistency 2019-08-12 13:51:05 +03:00
shpuld f1bdbeabf0 fix js error on mute 2019-08-10 15:53:46 +03:00
Joseph Nuthalpati 5e0b4e06ec
i18n: Translated to Telugu (44.3%)
Verified that the translation strings work by running Pleroma-FE locally.

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
2019-08-10 16:50:59 +05:30
HJ 7e2d48a26e Merge branch 'fix/incorrect-follow-request-status' into 'develop'
Fix sent follow request detection

See merge request 
2019-08-09 12:57:05 +00:00
rinpatch 114b5f6eff Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:26:58 +00:00
rinpatch 5f3ac6625f Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:25:58 +00:00
rinpatch e83b321ff2 Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:01:57 +00:00
rinpatch 766bcc2a72 Fix sent follow request detection
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
HJ 59f2931361 Merge branch 'fix/text-dont-media-viewer' into 'develop'
fix english settings label regarding how to view videos

See merge request 
2019-08-09 08:31:02 +00:00
matrixsasuke 3e7f0ecf9b fix english settings label regarding how to view videos 2019-08-09 08:03:21 +02:00
shpuld d4c366a123 fix extra buttons merge bug 2019-08-08 21:24:40 +03:00
Shpuld Shpludson a45f258a2c Merge branch '632' into 'develop'
Fix gif image zoom bug on hover

Closes 

See merge request 
2019-08-08 10:12:46 +00:00
Shpuld Shpludson acb788d575 Merge branch '631' into 'develop'
Hide image block in rich media preview in case of broken image

Closes 

See merge request 
2019-08-08 10:10:58 +00:00
Shpuld Shpludson 74cf601094 Merge branch '627' into 'develop'
Fix "Post status modal disappearing on mobile landscape mode"

Closes 

See merge request 
2019-08-08 10:10:23 +00:00
Shpuld Shpludson 92380652fe Merge branch 'feat/conversation-muting' into 'develop'
Add Conversation/Thread Muting

See merge request 
2019-08-08 10:09:07 +00:00
morguldir b9fd3bebc5
Update norwegian bokmål translation 2019-08-08 00:47:48 +02:00
taehoon 4d54c67daa make size of gif image and preview equal 2019-08-06 22:41:27 -04:00
taehoon 32b4d4d223 css improvements 2019-08-06 20:53:10 -04:00
taehoon a13c945143 do not unmount post status modal in desktop 2019-08-06 20:53:09 -04:00
taehoon bb9cee84a3 hide rich media preview image in case of broken image 2019-08-06 20:52:42 -04:00
Lee Starnes 4fc27414d2 Handle JSONified errors while registering
Closes 
2019-08-06 18:03:31 +00:00
tarteka c0e8d1a809 Corrections and semantics changes for Spanish translation 2019-08-05 15:23:39 +02:00
Exilat 39106dc545 Update oc.json 2019-08-03 14:04:49 +00:00
Exilat 920bd05081 Update for Interactions, new search, sticker picker, update copy. 2019-08-03 13:55:05 +00:00
tarteka 5f6456703c add Basque translate 2019-08-01 18:21:32 +02:00
Shpuld Shpludson 0e6489d840 Merge branch 'patch-2' into 'develop'
Update es.json (add sticker)

See merge request 
2019-07-31 17:46:40 +00:00
Shpuld Shpludson f031e96334 Merge branch '618' into 'develop'
Ability to enlarge profile picture in profile page

Closes 

See merge request 
2019-07-31 17:46:24 +00:00
Eugenij 254648991d Focus on the search input when the search icon is clicked 2019-07-31 17:39:35 +00:00
taehoon af75791f1b prevent scrolling top when click search input 2019-07-31 12:20:05 -04:00
taehoon be7a508d89 add zoom-in indication to avatar 2019-07-28 21:05:13 -04:00
taehoon b2bd128f05 allow zooming avatar in profile panel header 2019-07-28 21:05:13 -04:00
taehoon 5881d92eb7 use $route instead of $router.currentRoute 2019-07-28 21:05:13 -04:00
taehoon 7c2982064e enlarge avatar in profile page 2019-07-28 21:05:13 -04:00
Henry Jameson fd66afe1e5 linting 2019-07-29 00:10:43 +03:00
Henry Jameson 03c2f29b0a cleanup and appropriation for new emoji-input component API, styles updates 2019-07-28 16:07:01 +03:00
Henry Jameson 4c78fdb393 rename emoji-selector to emoji-picker 2019-07-28 14:41:22 +03:00
Henry Jameson 259e8c52ee post-merge fix 2019-07-28 13:33:05 +03:00
Henry Jameson b3aff9bbae Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (469 commits)
  Feature/add sticker picker
  guard more secure routes
  guard secure routes by redirecting to root
  closest can returns itself as well
  find inside status-content div only
  try to use the closest a tag as target
  Update es.json
  Also apply keyword filter to subjects
  Remove files I accidentally pushed in
  fix issues caused by merges in usersearch on @
  Add user search at
  fix eslint warnings
  remove vue-popperjs
  fix moderation menu partially hidden by usercard boundary
  migrate popper css
  rewrite ModerationTools using v-tooltip
  make popover position for status action dropdow relative to parent node
  rewrite ExtraButtons using v-tooltip
  install v-tooltip
  i18n/Update pedantic Japanese translation
  ...
2019-07-28 13:30:29 +03:00
Shpuld Shpludson d3f6b581d1 Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
taehoon 65ef039316 add unit test for elimination logic 2019-07-25 08:03:41 -04:00
taehoon 53c9517a4a use array.includes instead of array.indexOf 2019-07-24 22:42:06 -04:00
taehoon 0f8ace4836 update status eliminating logic 2019-07-24 21:02:37 -04:00
taehoon 876c6de806 fix typos 2019-07-24 21:02:37 -04:00
taehoon dca384f123 update prop syntax 2019-07-24 21:02:37 -04:00
taehoon d7dc070667 put two loops in one parent 2019-07-24 21:02:37 -04:00
taehoon ae829e8df1 move pinned statuses showing logic in timeline 2019-07-24 21:02:37 -04:00
taehoon 4826d72549 update prop name 2019-07-24 21:02:37 -04:00
taehoon 7f9feacd26 prevent showing pinned statuses twice 2019-07-24 21:02:37 -04:00
tarteka 6380f7df16 Update es.json (add sticker) 2019-07-24 22:06:45 +00:00
absturztaube fa6210872f Feature/add sticker picker
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00:00
taehoon 8375d7a3aa guard more secure routes 2019-07-24 11:08:05 -04:00
taehoon ad29e20324 guard secure routes by redirecting to root 2019-07-24 11:08:05 -04:00
Shpuld Shpludson 1f8f2e26e3 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request 
2019-07-24 13:32:57 +00:00
taehoon 1cefaa8446 closest can returns itself as well 2019-07-23 20:59:37 -04:00
taehoon 17ad5bbdf9 find inside status-content div only 2019-07-23 15:44:41 -04:00
taehoon 09efcb48a4 try to use the closest a tag as target 2019-07-23 15:43:03 -04:00
tarteka 51fc0a5c52 Update es.json 2019-07-23 15:16:03 +00:00
Toromino fb9f254f8d Also apply keyword filter to subjects 2019-07-20 19:06:54 +02:00
shpuld 619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03:00
Wyatt Benno 5909baba7c Add user search at 2019-07-18 03:40:02 +00:00
taehoon 051b3b5141 fix eslint warnings 2019-07-15 21:22:41 -04:00
taehoon e3ac71968b fix moderation menu partially hidden by usercard boundary 2019-07-15 21:22:41 -04:00
taehoon c4789a348f migrate popper css 2019-07-15 21:22:41 -04:00
taehoon 4f74392641 rewrite ModerationTools using v-tooltip 2019-07-15 21:22:41 -04:00
taehoon b9c547828e make popover position for status action dropdow relative to parent node 2019-07-15 21:22:41 -04:00
taehoon 005815c825 rewrite ExtraButtons using v-tooltip 2019-07-15 21:22:40 -04:00
taehoon 1727c815f8 install v-tooltip 2019-07-15 21:22:40 -04:00
HJ f734a72116 Merge branch 'fix/respect-hide-post-stats' into 'develop'
Hide favs/rts properly when hide post stats is enabled

See merge request 
2019-07-15 21:47:45 +00:00
Shpuld Shpludson e86f6edb7c Merge branch 'patch-2' into 'develop'
Update es.json

See merge request 
2019-07-15 19:21:37 +00:00
Hakaba Hitoyo 54b45ec4a3 i18n/Update pedantic Japanese translation 2019-07-15 19:18:40 +00:00
Hakaba Hitoyo f665ac83e7 i18n/Update easy Japanese trasnlation 2019-07-15 19:18:20 +00:00
Shpuld Shpludson 3370dd80dc Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +00:00
taehoon ff90d864cc fix wrong eslint comments 2019-07-12 15:11:54 -04:00
taehoon 78594f61d4 add a todo comment 2019-07-12 15:10:30 -04:00
taehoon 57c5d269b8 add bell-ringing icon 2019-07-11 12:52:05 -04:00
taehoon b2dbf01a72 eslint —fix 2019-07-10 21:01:08 -04:00
taehoon 9712e324e5 hide subscribe button unless following 2019-07-10 21:01:08 -04:00
taehoon 1237d0d2b8 use normal bell for unsubscribed state 2019-07-10 21:01:08 -04:00
taehoon 4f26299bd5 update copy 2019-07-10 21:01:08 -04:00
taehoon 0f4cccd115 improve ui 2019-07-10 21:01:08 -04:00
taehoon 38ba5fe028 change subscribe button to icon button 2019-07-10 21:01:08 -04:00
taehoon 2ab00387fe clean up + add btn-group css class 2019-07-10 21:01:07 -04:00
taehoon e1d6e56e1b clean up layout 2019-07-10 21:01:07 -04:00
taehoon 0fc154d9d4 clean up UserCard css 2019-07-10 21:01:07 -04:00
taehoon dbe2decc59 clean up UserCard template 2019-07-10 21:01:07 -04:00
taehoon 3b9ab0e343 no need to covert to boolean 2019-07-10 21:01:07 -04:00
taehoon 670cbfdd1c change subscribing to subscribed 2019-07-10 21:01:07 -04:00
taehoon 0c52d69a52 update copy 2019-07-10 21:01:07 -04:00
taehoon ace3b399ff support i18n 2019-07-10 21:01:07 -04:00
taehoon deee07d6fb show subscribe button only if user is logged in 2019-07-10 21:01:07 -04:00
taehoon 646d197bf1 mutate updated relationship to the store 2019-07-10 21:01:07 -04:00
taehoon e9e6daa76e show text in progress only when slot is given 2019-07-10 21:01:07 -04:00
taehoon f4a16e6541 add subscribing to user entity normalizer 2019-07-10 21:01:07 -04:00
taehoon 4cf402ff21 migrate SubscribeButton to the existing common component 2019-07-10 21:01:07 -04:00
jared d5e8315e83 - add subscribe button 2019-07-10 21:01:07 -04:00
jared f2c95f9d0b - add new endpoints to subscribe to the user 2019-07-10 21:01:07 -04:00
Tae Hoon 532b76eb64 Refactor user search api, better api error response handling 2019-07-10 16:58:49 +00:00
shpuld 59ade4084e Hide favs/rts properly when hide post stats is enabled 2019-07-09 16:50:23 +03:00
taehoon 0131effb01 add comments 2019-07-07 22:49:18 -04:00
taehoon ab4d7d9616 refetch favs and repeats separately 2019-07-07 22:49:18 -04:00
taehoon e9b6e0e2b7 refetch favs and repeats when stats are changed 2019-07-07 22:49:18 -04:00
taehoon 17498ef906 update favs and repeats stats using favoritedByUsers and rebloggedByUsers data 2019-07-07 22:49:18 -04:00
shpuld 7ed9d17ce7 Add thread muting to context menu of status 2019-07-07 23:02:09 +03:00
shpuld e5879e3d4d check for user before checking users props 2019-07-07 22:23:04 +03:00
Shpuld Shpludson 54b0f90133 Merge branch 'eslint-fix' into 'develop'
Fix shitton warning eslint gives

See merge request 
2019-07-07 19:12:33 +00:00
Shpuld Shpludson 171673113f Merge branch 'revoke-token' into 'develop'
Revoke oAuth token on logout

Closes pleroma#952

See merge request 
2019-07-07 18:29:36 +00:00
Shpuld Shpludson c8794b2b84 Merge branch '580' into 'develop'
Fix backend version string parsing

Closes 

See merge request 
2019-07-07 10:30:45 +00:00
Shpuld Shpludson e7ff9b5227 Merge branch '600-2' into 'develop'
Preserve formatting of status content

Closes 

See merge request 
2019-07-07 10:21:55 +00:00
Eugenij 14ec12b4f6 Set hide_follows and hide_followers settings when parsing Mastodon format 2019-07-07 10:20:55 +00:00
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
Henry Jameson 1ec4caa0bb fix merge conflict 2019-07-06 23:52:10 +03:00
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
taehoon bba4b57dd8 preserve formatting of content 2019-07-05 21:57:48 -04:00
taehoon 66842efd81 update regex for commit hash 2019-07-05 11:11:31 -04:00
Shpuld Shpludson 60b413d02c Merge branch '602' into 'develop'
Fix mixed profiles bug on user profile page

Closes 

See merge request 
2019-07-05 13:28:15 +00:00
Shpuld Shpludson 7ec02445cc Merge branch 'develop' into 'develop'
[i18n] Update of the Occitan translation

See merge request 
2019-07-05 13:22:49 +00:00
Shpuld Shpludson 4f0ba97be9 Merge branch '603' into 'develop'
Hide text format when only plaintext is available

Closes 

See merge request 
2019-07-05 13:22:04 +00:00
Henry Jameson 8d6750d9c2 eslint --fix --ext .js,.vue src 2019-07-05 10:17:44 +03:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
HJ 6bea363b9d Merge branch 'fix-android-emoji-autocompletion' into 'develop'
Fix android emoji autocompletion

Closes 

See merge request 
2019-07-04 18:55:13 +00:00
Henry Jameson f86f4b514f Support compositionupdate event to properly show autocomplete popup for IMEs and
android
2019-07-03 23:08:51 +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
taehoon b70c2bfef7 make sure that user timelines are empty when opening profile page 2019-07-02 14:43:01 -04:00
taehoon 0e9b8be88c clear userId property of timeline by default in clearTimeline action 2019-07-02 14:32:46 -04:00
Egor Kislitsyn 52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
Exilat fe500c44ed Update oc.json 2019-06-30 14:24:34 +00:00
Henry Jameson 82464b3a7e review 2019-06-26 00:34:09 +03:00
Henry Jameson 9dbafa4c78 lint fix 2019-06-25 21:39:33 +03:00
Henry Jameson 01bda605a7 fix all known problems with clicks on autocomplete emojis 2019-06-25 21:31:43 +03:00
Shpuld Shpludson b059deb551 fix specificity that made attachments misalign 2019-06-25 16:30:21 +00:00
HJ 8d33832fe1 Merge branch 'clearer-user-profile-tabs' into 'develop'
Clearer user profile tabs when status is empty

See merge request 
2019-06-25 06:32:08 +00:00
Wyatt Benno f2d84ef233 Keep statuses always enabled 2019-06-25 10:27:41 +09:00
HJ bb8e2b1933 Merge branch 'timeline-skip-fix' into 'develop'
timeline-skip-fix

See merge request 
2019-06-24 22:08:09 +00:00
taehoon 1c03bd0ebc add resolve param to user search api request 2019-06-24 07:49:22 -04:00
Wyatt Benno 7a5d06a6cf change isPinned to noIdUpdate 2019-06-24 12:01:13 +09:00
Shpuld Shpludson 947f69a953 Fix: problems with polls state 2019-06-22 14:01:36 +00:00
Shpuld Shpludson 30a340955e Move character counter into the input box 2019-06-22 13:41:02 +00:00
Wyatt Benno a1c50c3fc1 fix for 2019-06-21 10:31:00 +09:00
Wyatt Benno 308c4c9789 Make scss change for tab switcher only 2019-06-21 08:35:02 +09:00
taehoon bd377148ad delete state.token instead of setting false 2019-06-20 11:48:31 -04:00
taehoon 8a32731e4d use clientSecret in login flow 2019-06-20 11:48:30 -04:00
taehoon c23228f196 fix error breaking logout flow 2019-06-20 11:48:30 -04:00
taehoon 268e9ce504 make sure to clear old token when logout 2019-06-20 11:48:29 -04:00
Shpuld Shpludson e5e9bb27f3 Move poll state handling to its own module 2019-06-20 13:02:04 +00:00
Shpuld Shpludson 44a03922e6 Fix/messed up long polls 2019-06-20 13:00:10 +00:00
Wyatt Benno 066efd5b3c A small sass fix for 2019-06-20 16:15:49 +09:00
taehoon 90fda1f245 reset margin property of form controls 2019-06-19 07:55:54 -04:00
HJ c4fcdc7125 Merge branch 'mr-origin-740' into 'develop'
Update french translation

See merge request 
2019-06-18 20:39:59 +00:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Dashie 57dbfc269c
Update translation with review comments 2019-06-18 22:14:02 +02:00
Dashie 64d7dd60cc
Update file with current en.json 2019-06-18 21:22:22 +02:00
Satak 3fcc4ba288
Update fr.json
added missing ,
2019-06-18 21:22:21 +02:00
Satak ceffe72f6f
Update fr.json
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
HJ 69eff65130 Merge branch 'refactor-emoji-input' into 'develop'
EmojiInput refactoring

Closes 

See merge request 
2019-06-18 19:17:37 +00:00
Henry Jameson 46e0122067 review 2019-06-18 22:13:03 +03:00
Henry Jameson 0032802f0a review 2019-06-18 21:30:35 +03:00
HJ e5020d6936 Update emoji-input.js 2019-06-18 17:49:43 +00:00
Shpuld Shpludson c0c012ccf9 Merge branch 'fix-user-search' into 'develop'
fix user search

See merge request 
2019-06-18 16:32:11 +00:00
HJ 3cd4201ce4 Merge branch '573' into 'develop'
Apply font smoothing in webkit and firefox

Closes 

See merge request 
2019-06-18 16:31:33 +00:00
Shpuld Shpludson 76efbcbe92 Misc fixes: Fix uploads stretching on chrome, fix warnings in console 2019-06-18 16:31:20 +00:00
taehoon 2b5ac611c9 apply font smoothing in webkit and firefox 2019-06-17 23:34:20 -04:00
Henry Jameson de03eda9f3 fix user search 2019-06-17 23:39:30 +03:00
HJ ac46de3972 Merge branch 'mastoapi-login-and-config-fixes' into 'develop'
Mastoapi login and config fixes

See merge request 
2019-06-17 20:17:58 +00:00
HJ 22a3351208 Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js 2019-06-17 20:12:11 +00:00
Henry Jameson 5f4a8dcc05 properly position the caret after replacement 2019-06-17 21:24:10 +03:00
HJ 8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
Henry Jameson 06c84a9cf3 fix MFA crashing on user-settings page 2019-06-16 20:36:21 +03:00
Henry Jameson 6744396f82 getting and setting user background via MastoAPI 2019-06-16 20:17:59 +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
HJ 1db3c785d8 Merge branch 'masto-register-app-secret' into 'develop'
Proper clientId/secret/token caching, MastoAPI registration

Closes 

See merge request 
2019-06-16 11:18:21 +00:00
taehoon de2504ad6c fix typo 2019-06-13 15:00:13 -04:00
Henry Jameson acbeea59ff rename mutations according to actual property names 2019-06-13 10:11:17 +03:00
Henry Jameson f9c3aabea4 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
* upstream/develop:
  fix user banner
2019-06-13 10:05:53 +03:00
Henry Jameson 0988065f50 fix 2019-06-13 10:05:22 +03:00
Henry Jameson dba8d8910c fix 2019-06-13 10:00:06 +03:00
Henry Jameson d551b39859 fix logged out post-update 2019-06-13 09:48:43 +03:00
Henry Jameson d1fd3e3a1c fix user banner 2019-06-13 01:48:41 +03:00
Henry Jameson edb24da016 fix 2019-06-13 01:02:08 +03:00
Henry Jameson c8a57ad32e Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
2019-06-13 00:51:14 +03:00
Henry Jameson 1e94aecbc9 AMERICA 2019-06-13 00:47:06 +03:00
Henry Jameson 6cd4546873 comments 2019-06-13 00:44:25 +03:00
Henry Jameson af75c6d1ea No longer sending extra data, renamed some properties 2019-06-13 00:39:51 +03:00
Henry Jameson 77511a5338 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
* upstream/develop:
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  i18n/Update Japanese translation
  render modal at the root level using portal
  install portal vue
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
  remove console spam
  i18n
  wire up user.description with masto api data
  i18n/Add Japanese with kanji (2)
  move drowdown menu to popper
  notification controls: redesign entirely
  entity normalizer: collapse data.pleroma if blocks
  wire up notification settings
  do not miss statusnet_profile_url of mentions
  Translation to Hebrew of everything other than theme_helpers and style.
  Translate up to settings.
  mastoapi login works
2019-06-13 00:07:28 +03:00
Maksim 77eceedbf7 Revert "add TOTP/Recovery Form for mobile version"
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
HJ 9df99c5205 Merge branch 'masto-login-fixes' into 'develop'
MastoAPI login

See merge request 
2019-06-12 19:42:25 +00:00
HJ a7b0b07e6f Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js 2019-06-12 11:44:14 +00:00
Henry Jameson a05fd042df fix small annoyance 2019-06-12 10:56:08 +03:00
Henry Jameson 0535d2c14c fixed some bugs i found, also cleaned up some stuff + documentation 2019-06-11 21:18:09 +03:00
Hakaba Hitoyo 322c9fbfb6 i18n/Update Japanese translation 2019-06-11 12:10:47 +00:00
Henry Jameson 41eeaf35d9 self-review 2019-06-10 18:57:53 +03:00
Henry Jameson e536a56250 Linting 2019-06-09 22:40:38 +03:00
Henry Jameson 4d12cd617a fix textarea not resizing properly 2019-06-09 21:23:56 +03:00
Henry Jameson 8a02647de4 more bugfixes related to keybinds and nonworking stuff 2019-06-09 21:17:24 +03:00
Henry Jameson 20923d590c Some comments, added sorting for emojis 2019-06-09 20:41:12 +03:00
Henry Jameson 76b9a66e98 fixed several bugs 2019-06-09 20:40:46 +03:00
Henry Jameson a3cc8cc5d8 sorting 2019-06-08 17:15:48 +03:00
Henry Jameson 0a778160cc styles 2019-06-08 17:15:42 +03:00
Henry Jameson 8872b4802e standartized autocomplete panel suggesions format, fixed some bugs 2019-06-08 16:23:58 +03:00
Henry Jameson ca3140fd3e Merge remote-tracking branch 'upstream/develop' into refactor-emoji-input
* upstream/develop:
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
2019-06-08 14:31:49 +03:00
Henry Jameson 96f31716f9 slot-based emoji input/autocomplete component 2019-06-07 00:17:49 +03:00
taehoon 9c8af14908 render modal at the root level using portal 2019-06-06 13:37:27 -04:00
taehoon 5740123ee6 install portal vue 2019-06-06 13:37:26 -04:00
Hakaba Hitoyo 5b274364ce Small improve of the who to follow panel layout 2019-06-05 17:43:35 +00:00
Hakaba Hitoyo 809d872b2d Fix/Small fix in the who to follow page 2019-06-04 08:04:47 +00:00
shpuld 4526939dae remove console spam 2019-06-01 12:10:00 +03:00
kaniini b4796ccbf6 Merge branch 'feature/notification-controls' into 'develop'
wire up notification settings

See merge request 
2019-06-01 05:16:15 +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 

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

Closes 

See merge request 
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
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
taehoon 2af35b8404 do not miss statusnet_profile_url of mentions 2019-05-22 23:47:20 -04:00
j1t 4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00
Henry Jameson e7a2a7267d Proper clientId/secret/token caching, MastoAPI registration 2019-05-22 19:13:41 +03:00
j1t 3b3e4ffc54 Translate up to settings. 2019-05-22 01:46:08 +03:00
Henry Jameson fc12b63fcc mastoapi login works 2019-05-21 23:35:40 +03:00
HJ 0fc7cbfa24 Merge branch 'fetags' into 'develop'
add tags to data and to status component

See merge request 
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 
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 
2019-05-20 18:09:14 +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
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
taehoon 07d0143bda hide three dot menu button if has no items 2019-05-19 09:16:47 -04:00
William Pitcock 00ad97fcfa entity normalizer: add tooltip text to emojis 2019-05-17 20:10:50 +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
Shpuld Shpludson 81278651d9 Line up rich text format picker with the status form 2019-05-15 19:53:33 +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
taehoon f68653d0dd show pinned state only in the user timeline 2019-05-15 12:04:26 -04:00
taehoon 110c9d3b26 improve performance by caching pinned status ids into user object 2019-05-15 12:04:26 -04:00
taehoon 87de130ee5 apply status normalizer 2019-05-15 12:04:26 -04:00
taehoon 2af088969a improve error handling logic 2019-05-15 12:04:26 -04:00
taehoon 12f8269f01 make sure to have rights property of user object 2019-05-15 12:04:26 -04:00
taehoon 1747cd8771 use text color instead 2019-05-15 12:04:26 -04:00
taehoon 19e79895bb revert unnecessary changes 2019-05-15 12:04:26 -04:00
taehoon beaf512573 add translation 2019-05-15 12:04:26 -04:00
taehoon d76bd0044f fix typo 2019-05-15 12:04:26 -04:00
taehoon 32be0e15d1 use pinned property from status directly 2019-05-15 12:04:26 -04:00
taehoon f8186bfc74 show immediately pinned statuses 2019-05-15 12:04:26 -04:00
taehoon a601337a20 clean up 2019-05-15 12:04:26 -04:00
taehoon 93e9bc019e clean up fetchPinnedStatuses api service 2019-05-15 12:04:26 -04:00
taehoon 8308315038 revert removeStatus changes 2019-05-15 12:04:26 -04:00
taehoon 1229622fed refactor error handling of pinStatus 2019-05-15 12:04:25 -04:00
taehoon ce1d19136d refactor pin/unpin status logic 2019-05-15 12:04:25 -04:00
taehoon e8abe1273b filter pinned statuses based on pinned entity instead of a separate user entity 2019-05-15 12:04:25 -04:00
taehoon cd0a7afa06 remove pinned timeline, instead, use simple entity of user object 2019-05-15 12:04:25 -04:00
taehoon 9e22d6212a revert pinned timeline polling logic 2019-05-15 12:04:25 -04:00
dave 8095ce8f62 - hide status menu after action button is clicked 2019-05-15 12:04:25 -04:00
dave 075ddc34f1 - shwo pin button for valid statuses (public & unlisted) 2019-05-15 12:04:25 -04:00
dave 9fc997500e - add extra buttons for status actions 2019-05-15 12:04:25 -04:00
dave 006bf1ce63 - fix plus button size issue, use scss variable properly 2019-05-15 12:04:25 -04:00
dave e6268c492e - clean up 2019-05-15 12:04:25 -04:00
dave 5ab0e71500 - show pin status API error 2019-05-15 12:04:24 -04:00
dave df207593e9 - update pinned status after actions(remove, add) 2019-05-15 12:04:24 -04:00
dave f1ff48ffd6 - remove unpinned status from timeline 2019-05-15 12:04:24 -04:00
dave 2c89d49a3d - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00
dave e28b19645a - show pin for own statuses only 2019-05-15 12:04:24 -04:00
dave 1aa0e8d7e0 - pin/unpin status 2019-05-15 12:04:24 -04:00
dave affbe8700e - integrate endpoints 2019-05-15 12:04:24 -04:00
tarteka bacbfc1154 Update es.json 2019-05-15 09:16:49 +00:00
taehoon 5e0235fa63 make reply icon not hoverable if disabled 2019-05-14 22:45:57 -04:00
taehoon 731ad0a48b show reply button and count when logged out as well 2019-05-14 22:44:56 -04:00
Henry Jameson 543604fd2d removed unused masto api, added initial version of interactions timeline 2019-05-14 22:48:44 +03:00
Henry Jameson 04fa2aefb3 get rid of reply-left, we decided it should go long time ago 2019-05-14 19:49:03 +03:00
Henry Jameson addeb85220 fix prod build 2019-05-13 21:54:25 +03:00
Henry Jameson 750dca4a10 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (116 commits)
  Fix small mistake in Polish translation
  link interaction avatars to the user profile
  Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
  use backendInteractor
  refactor api service functions using new helper
  clean up
  update favorite number earlier
  update status interaction upon retweet action response
  sync up favoritedBy with favorite/unfavorite action
  do not regenerate status object
  reduce needless calculation
  Move scope visibility notice to the status form, make it dismissible
  Revert "eliminate expandable prop in favor of inConversation"
  status attention doesn’t have relationship entities
  make it short
  fix wrong inlineExpanded
  expanded is always false, eliminate it
  eliminate expandable prop in favor of inConversation
  fix conversationId comparision bug using integer format
  Display additional scope description above the status form for mobile users.
  ...
2019-05-13 20:38:54 +03:00
Marcin Mikołajczak caf9e627a7 Fix small mistake in Polish translation 2019-05-10 06:52:01 +00:00
HJ cd67b1f496 Merge branch '527' into 'develop'
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"

Closes 

See merge request 
2019-05-09 17:17:26 +00:00
HJ 177e53cf6a Merge branch 'mobile-scope' into 'develop'
Display additional scope description above the status form for mobile users.

Closes 

See merge request 
2019-05-09 17:13:50 +00:00
taehoon 31e14cd45d link interaction avatars to the user profile 2019-05-08 12:04:33 -04: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
taehoon 7d60ab322e use backendInteractor 2019-05-07 23:36:35 -04:00
taehoon 26131266a9 refactor api service functions using new helper 2019-05-07 23:27:22 -04:00
taehoon a54cf47ba5 clean up 2019-05-07 23:21:19 -04:00
taehoon 28c2a700e1 update favorite number earlier 2019-05-07 23:19:46 -04:00
taehoon ff3a7e8b5b update status interaction upon retweet action response 2019-05-07 23:17:52 -04:00
taehoon f75e40e462 sync up favoritedBy with favorite/unfavorite action 2019-05-07 16:43:54 -04:00
taehoon 78a4ab98af do not regenerate status object 2019-05-07 16:20:24 -04:00
taehoon 9a9d66dca1 reduce needless calculation 2019-05-07 15:54:49 -04:00
HJ 157d4e601e Merge branch 'fix/floating-button' into 'develop'
Mobile Post button fix

Closes 

See merge request 
2019-05-07 18:40:49 +00:00
Shpuld Shpludson 496ccd0bb3 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request 
2019-05-07 17:35:28 +00:00
eugenijm 4af343374a Move scope visibility notice to the status form, make it dismissible 2019-05-07 19:13:45 +03:00
taehoon 917e82e8ee Revert "eliminate expandable prop in favor of inConversation"
This reverts commit 1455e1f9d5.
2019-05-06 21:36:55 -04:00
taehoon 134b1894d6 status attention doesn’t have relationship entities 2019-05-06 16:41:12 -04:00
taehoon 44a18eb838 make it short 2019-05-06 16:17:29 -04:00
taehoon 1a3799bfac fix wrong inlineExpanded 2019-05-06 16:16:43 -04:00
taehoon 3adfbc0357 expanded is always false, eliminate it 2019-05-06 15:30:36 -04:00
taehoon 1455e1f9d5 eliminate expandable prop in favor of inConversation 2019-05-06 15:29:24 -04:00
taehoon a27a2f78ac fix conversationId comparision bug using integer format 2019-05-06 13:24:11 -04:00
eugenijm befaa477a3 Display additional scope description above the status form for mobile users. 2019-05-06 18:10:58 +03:00
tarteka bfd25a5c3f Update es.json 2019-05-06 08:38:24 +00:00
taehoon 489927bdc9 toggle showing new status form instead of toggle mouting 2019-05-05 23:00:45 -04:00
taehoon bc41a7b305 make sure media modal to be above reporting modal 2019-05-05 13:48:25 -04:00
taehoon 9787d99672 update api services 2019-05-03 11:40:06 -04:00
taehoon 220a7e89d5 use native scrollbar 2019-05-03 11:40:06 -04:00
taehoon abad528dd4 refactor using List component 2019-05-03 11:40:06 -04:00
taehoon 8561bf6612 remove transition css 2019-05-03 11:40:06 -04:00
taehoon 19a0476985 update api endpoint url 2019-05-03 11:40:06 -04:00
taehoon ddc7c870f4 rewrite checkbox component 2019-05-03 11:40:06 -04:00
taehoon 58a420f2b3 fix panel title overflow issue in mobile 2019-05-03 11:40:06 -04:00
taehoon 0bb8247822 fix double scrollbar display bug in mobile 2019-05-03 11:40:06 -04:00
taehoon e97f8a4728 prevent parent scroll 2019-05-03 11:40:06 -04:00
taehoon 6b1e305a18 use custom scrollbar 2019-05-03 11:40:06 -04:00
taehoon 01cc7e4480 modal style improvements 2019-05-03 11:40:06 -04:00
taehoon 2e6eab51b8 Update promisedRequest helper to support json payload 2019-05-03 11:40:06 -04:00
taehoon f364068e10 Improve mobile layout 2019-05-03 11:40:06 -04:00
taehoon 91502a25a4 Add a css class to the checkbox indicator 2019-05-03 11:40:06 -04:00
taehoon cf72ebb407 update copy 2019-05-03 11:40:05 -04:00
taehoon 5d0bae5569 update generic error message 2019-05-03 11:40:05 -04:00
taehoon d115d98a1b add translations 2019-05-03 11:40:05 -04:00
taehoon 471085f0f3 add error message 2019-05-03 11:40:05 -04:00
taehoon dfc56dfee2 reset modal state if api request is completed 2019-05-03 11:40:05 -04:00
taehoon 1b07c6ae4f add processing state and close modal after api request is completed 2019-05-03 11:40:05 -04:00
taehoon 1878e56c16 reset modal state when userId is changed 2019-05-03 11:40:05 -04:00
taehoon 02d169b92c add promisedRequest helper 2019-05-03 11:40:05 -04:00
taehoon cea6ea42f0 add api service function 2019-05-03 11:40:05 -04:00
taehoon 2cda9010df add user reporting modal 2019-05-03 11:40:05 -04:00
Shpuld Shpludson 0438031da4 Merge branch 'develop' into 'develop'
[i18n]Update oc.json

See merge request 
2019-05-03 14:57:04 +00:00
Shpuld Shpludson 513613a4b2 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request 
2019-05-03 14:56:45 +00:00
taehoon 6ae3c1cfcf autoload older notifications when scrolled to the bottom 2019-05-03 07:52:22 -04:00
tarteka 09253420a2 Update es.json 2019-05-03 00:22:14 +00:00
taehoon f8ae631d8c fix notifications div scrolling issue on mobile 2019-05-02 08:21:02 -04:00
Exilat b98bab52a9 Update oc.json 2019-05-01 16:40:40 +00:00
shpuld c44c048356 add title and alt for avatars, fix console errors in avatarlist 2019-05-01 17:33:56 +03:00
Shpuld Shpludson b1bd5bd08e Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
# Conflicts:
#   src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
HJ 0f7f685c5e Merge branch '437-user-profile-settings' into 'develop'
Transition to MastoAPI: user profile settings

Closes 

See merge request 
2019-04-30 06:05:52 +00:00
eugenijm b18fea8508 Debounce floating post button autohide 2019-04-29 22:53:30 +03:00
shpuld da08388d6a filter outside of component 2019-04-29 22:36:39 +03:00
eugenijm ae1496cfb4 Make floating post button configurable 2019-04-29 21:32:29 +03:00
HJ d94fdd0617 Merge branch '220-import-export-blocks-mutes' into 'develop'
Allow import/export of blocks

See merge request 
2019-04-29 18:15:58 +00:00
taehoon 5b16e36828 remove & 2019-04-29 13:57:44 -04:00
taehoon a793835566 add a comment 2019-04-29 13:53:21 -04:00
taehoon b1f8221a0a show ellipsis for long user name and screen name 2019-04-29 13:27:10 -04:00
taehoon 3665c86d70 use default_scope parameter 2019-04-27 21:51:17 -04:00
taehoon 904a64de89 use json content type 2019-04-27 14:20:32 -04:00
taehoon 2c4af6693a clean up 2019-04-27 14:04:30 -04:00
taehoon ab19669bf1 refactoring 2019-04-27 08:31:06 -04:00
taehoon 95bc2d727b add “export blocks” feature 2019-04-27 08:31:06 -04:00
taehoon 13abe64f87 fix wrong function binding 2019-04-27 08:31:06 -04:00
taehoon 08eaf9bd33 make reusable Exporter component 2019-04-27 08:31:06 -04:00
taehoon 0ab2f9dfa5 add “block import” feature 2019-04-27 08:31:06 -04:00
taehoon 6ea4154084 change api function name 2019-04-27 08:31:06 -04:00
taehoon 6d0e98a1c2 make Importer component reusable 2019-04-27 08:31:06 -04:00
taehoon 18bb209ace add uploading icon css 2019-04-27 08:31:06 -04:00
taehoon 903bce40c3 move formData generating logic to api.service 2019-04-27 08:31:06 -04:00
taehoon 562120ae48 split out follow’s importer as a separate component 2019-04-27 08:31:06 -04:00
taehoon ac0b45fa14 Update avatar uploading 2019-04-27 08:30:08 -04:00
taehoon e14720419f Switch to mastoapi for updating user profile 2019-04-27 08:30:08 -04:00
taehoon 909d11825d Switch to mastoapi for updating banner 2019-04-27 08:30:08 -04:00
taehoon 808e1ac11c Switch to mastoapi for updating avatar
# Conflicts:
#	src/services/api/api.service.js
2019-04-27 08:30:08 -04:00
Henry Jameson e0247e21f6 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (126 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
2019-04-27 12:26:17 +03:00
William Pitcock f4420cbf9f entity normalizer: hook up in_reply_to_account_acct 2019-04-27 04:52:11 +00:00
William Pitcock 55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
Henry Jameson 2b5cf61a8f firefox 2019-04-24 21:53:51 +03:00
shpuld 8af8f719e4 fix i18n 2019-04-22 21:37:27 +03:00
shpuld 3e23b34168 fix overflow behavior 2019-04-22 21:07:29 +03:00
taehoon 445b54c553 fix follow button not updating bug in follow-card 2019-04-22 11:17:01 -04:00
taehoon f2f3fa81d8 refer searched user objects from the global user rep 2019-04-22 11:17:01 -04:00
shpuld d417945427 Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users 2019-04-22 17:24:35 +03:00
Shpuld Shpludson c8f967d5c0 Merge branch '500' into 'develop'
Set max-width of textarea in settings page

Closes 

See merge request 
2019-04-22 14:00:09 +00:00
Shpuld Shpludson 4b173b5182 Merge branch '487' into 'develop'
Fix broken Follow Export

Closes 

See merge request 
2019-04-22 13:59:12 +00:00
Shpuld Shpludson ffecbc2e79 Merge branch 'develop' into 'develop'
[i18n] Update for Occitan language

See merge request 
2019-04-22 13:20:13 +00:00
Shpuld Shpludson 98742979c8 Merge branch '501' into 'develop'
Remove space in the timeline setting copy

Closes 

See merge request 
2019-04-22 13:15:07 +00:00
Shpuld Shpludson 9183c9e845 Merge branch 'change-pencil-to-wrentch' into 'develop'
Change pencil icon to wrentch

See merge request 
2019-04-22 13:11:14 +00:00
taehoon f7baa6e190 set max-width of textarea in settings page 2019-04-21 14:06:32 -04:00
taehoon aefd4551a3 Remove space in the timeline setting copy 2019-04-21 14:06:10 -04:00
Haelwenn (lanodan) Monnier 14d506154e
user_card.vue: Fix .emoji to apply to img 2019-04-20 21:12:56 +02:00
Exilat ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat 213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat 69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat 44f18caf4d Update oc.json 2019-04-20 14:29:04 +00:00
Brenden Bice 6aee2ed63f replace pencil with wrench icon
# Conflicts:
#	src/components/user_card/user_card.vue
2019-04-19 13:24:35 -04:00
taehoon 3565b18712 fetch all friends using pagination 2019-04-19 00:27:06 -04:00
taehoon 992c8e1f77 stop fetching user relationship when user is unauthorized 2019-04-17 22:47:56 -04:00
taehoon de945e5f88 Revert "recover border between basic-user-card using list component"
This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc.

# Conflicts:
#	src/components/follow_requests/follow_requests.vue
#	src/components/user_search/user_search.vue
#	src/components/who_to_follow/who_to_follow.vue
2019-04-17 11:32:49 -04:00
taehoon bd88a481c6 remove extra spacing 2019-04-17 11:32:49 -04:00
taehoon e67fecff0a code readability 2019-04-17 11:32:49 -04:00
taehoon bb38a43117 fix typos 2019-04-17 11:32:49 -04:00
taehoon a89236f67c clean up 2019-04-17 11:32:49 -04:00
taehoon 10ecc2c816 make sure to use filtered selected keys 2019-04-17 11:32:49 -04:00
taehoon ecff6acf2d support indeterminate checkbox state 2019-04-17 11:32:49 -04:00
taehoon 3f5e798de7 render span tag only if it has content 2019-04-17 11:32:49 -04:00
taehoon 988849116d update model and props properties 2019-04-17 11:32:49 -04:00
taehoon 8088043a0c import scss variables 2019-04-17 11:32:49 -04:00
taehoon 1144025f30 update checkbox importing path 2019-04-17 11:32:49 -04:00
taehoon 468aec0de1 rewrite checkbox component as non-functional 2019-04-17 11:32:49 -04:00
taehoon ac9ddfb1e2 support i18n 2019-04-17 11:32:49 -04:00
taehoon 7f6bd538f3 ui improvements 2019-04-17 11:32:49 -04:00
taehoon c81bde0c1d clean up 2019-04-17 11:32:49 -04:00
taehoon d3cad54aa3 add bulk mute/unmute buttons and wire up to vuex 2019-04-17 11:32:49 -04:00
taehoon 13c8f10f4b wire up bulk action buttons to vuex 2019-04-17 11:32:49 -04:00
taehoon 7e74a13fcf add a comment 2019-04-17 11:32:49 -04:00
taehoon 1afef1037e show list header only if there are items 2019-04-17 11:32:49 -04:00
taehoon ac62e47c70 pass down empty slot 2019-04-17 11:32:49 -04:00
taehoon 67919f95a6 make border of list header thicker 2019-04-17 11:32:49 -04:00
taehoon 8fa639f252 add bulk action buttons 2019-04-17 11:32:49 -04:00
taehoon 403c7bbe6c add reusable progress-button cmoponent 2019-04-17 11:32:49 -04:00
taehoon fe7766bc61 replace scope attributes by slot-scope 2019-04-17 11:32:49 -04:00
taehoon d4e43e0e26 add border-bottom to the header 2019-04-17 11:32:49 -04:00
taehoon 7a8ffcd79b support header slot 2019-04-17 11:32:49 -04:00
taehoon cf2c411db3 add header to selectable-list component 2019-04-17 11:32:49 -04:00
taehoon 83faa96f1b remove border-bottom of the last list item 2019-04-17 11:32:49 -04:00
taehoon ca26776b4e recover border between basic-user-card using list component 2019-04-17 11:32:49 -04:00
taehoon f066ccd28b show empty slot only if it has content 2019-04-17 11:32:49 -04:00
taehoon b8ec13c8fd let not selectable-list know about getKey prop 2019-04-17 11:32:49 -04:00
taehoon 32035217b8 clean up 2019-04-17 11:32:49 -04:00
taehoon 792ae1697e refactor selectable-list using list component 2019-04-17 11:32:49 -04:00
taehoon d806038ad3 add border-bottom style to the list component as well 2019-04-17 11:32:49 -04:00
taehoon 80d83b46d9 move border-bottom style to the list 2019-04-17 11:32:49 -04:00
taehoon 3a318dc373 add some styling to the selectable-list component 2019-04-17 11:32:48 -04:00
taehoon f6e9f28745 use key properly 2019-04-17 11:32:48 -04:00
taehoon e0b2463750 save selected items to the state 2019-04-17 11:32:48 -04:00
taehoon d9b3f5be47 use SelectableList for blocks/mutes list 2019-04-17 11:32:48 -04:00
taehoon 23b9d1eaa3 rename selectable_row to selectable_list 2019-04-17 11:32:48 -04:00
taehoon 0bf451bb36 remove withList hoc 2019-04-17 11:32:48 -04:00
taehoon 738a3dc02d refactor using List component 2019-04-17 11:32:48 -04:00
taehoon 1cec2b6969 use reusable List vue component instead of withList hoc
Using slot is the preferred way in vue
2019-04-17 11:32:48 -04:00
taehoon 4b292564d8 add SelectableRow component 2019-04-17 11:32:48 -04:00
taehoon a509990937 add checkbox component 2019-04-17 11:32:48 -04:00
shpuld 75a650aa6d update styles and remove unnecessary stuff 2019-04-17 18:28:44 +03:00
taehoon 2e86a4eb4f fix mess in UserProfile component 2019-04-15 16:49:33 -04:00
Shpuld Shpludson 55410c91fa Merge branch '489' into 'develop'
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab

Closes 

See merge request 
2019-04-15 19:58:15 +00:00
taehoon 329dc833b3 clean up 2019-04-14 23:44:50 -04:00
taehoon d874ca905c support i18n 2019-04-14 23:44:50 -04:00
taehoon 948baba9d3 add muted user to the mutes list in real time 2019-04-14 23:44:50 -04:00
taehoon d58e08cf52 add search to the mutes tab as well 2019-04-14 23:44:50 -04:00
taehoon 0bdb0e5a81 rename Autosuggest component 2019-04-14 23:44:49 -04:00
taehoon 1cf9780e05 make more generic 2019-04-14 23:44:49 -04:00
taehoon fc5f4fba8c make more generic 2019-04-14 23:44:49 -04:00
taehoon 8410add394 make UserAutoSuggest component more generic 2019-04-14 23:44:49 -04:00
taehoon 5c2c222252 add blocked user to the blocked list on real time 2019-04-14 23:44:49 -04:00
taehoon 9184435887 remove blocked one from the results on real time 2019-04-14 23:44:49 -04:00
taehoon 33467880ed improve ui 2019-04-14 23:44:49 -04:00
taehoon 60b07eeaa4 filter out blocked user or me from the results 2019-04-14 23:44:49 -04:00
taehoon 69f9ea987c make blocking functional in the search results 2019-04-14 23:44:49 -04:00
taehoon fd4289e45a improve ui 2019-04-14 23:44:49 -04:00
taehoon 787737c80d hide results on outside click 2019-04-14 23:44:49 -04:00
taehoon b2eb43e3c8 rename css classes 2019-04-14 23:44:49 -04:00
taehoon 94e67ff118 rewrite USerAutoSuggest without any dependency 2019-04-14 23:44:49 -04:00
taehoon da5844205c add user autosuggest component 2019-04-14 23:44:49 -04:00
taehoon e7010d73ac store friends/followers in the global user repository 2019-04-14 23:41:38 -04:00
Henry Jameson fd171da0dc attempt at making it work 2019-04-13 18:28:50 +03:00
Brenden Bice 41845389a9 display no message on empty data fetched from api 2019-04-12 23:12:22 -04:00
Brenden Bice 2ae0507575 remove error message on no more following 2019-04-12 23:09:05 -04:00
Henry Jameson 7d01b3d8ba Fix wrong usercard notification 2019-04-12 10:49:22 +03:00
Brenden Bice 8ed4eb8a7f refactor showing favs and repeats logic 2019-04-11 23:26:13 -04:00
Brenden Bice f74a6b4b57 display favs & reblogged users on expanded post in timeline view 2019-04-11 23:26:13 -04:00
Brenden Bice efd20967df display avatars only on highlighted post 2019-04-11 23:26:13 -04:00
Brenden Bice 8cac0dec6f add fadein effect to panel 2019-04-11 23:26:13 -04:00
Brenden Bice 246fab328f remove commented code 2019-04-11 23:26:13 -04:00
Brenden Bice fcea3d62cb display avatars list on highlighted post 2019-04-11 23:26:13 -04:00
Brenden Bice b75d899c7a use transition wrapper component 2019-04-11 23:26:13 -04:00
Brenden Bice 1f4fcf56cd remove custom fadein logic 2019-04-11 23:26:13 -04:00
Brenden Bice e734370e33 use a tag for favs/repeated title 2019-04-11 23:26:13 -04:00
Brenden Bice 2d826abb41 use normal font weight instead of lighter 2019-04-11 23:26:13 -04:00
Brenden Bice 84b6ff9f99 use filter array function 2019-04-11 23:26:13 -04:00
Brenden Bice 7885955344 remove important in the property value 2019-04-11 23:26:13 -04:00
Brenden Bice c1001da860 remove important in css property 2019-04-11 23:26:13 -04:00
Brenden Bice c361b41641 use global fallback variable 2019-04-11 23:26:13 -04:00
Brenden Bice 7dea2d470e remove duplicates from avatars list 2019-04-11 23:26:13 -04:00
Brenden Bice 80ba4f27c8 add hover effect to label 2019-04-11 23:26:13 -04:00
Brenden Bice 94730c9ff7 update design of stats section 2019-04-11 23:26:13 -04:00
Brenden Bice f6847c163c adjust avatar size of avatar list 2019-04-11 23:26:13 -04:00
Brenden Bice db2733b265 set fall back value of border color 2019-04-11 23:26:13 -04:00
Brenden Bice 5be03eb161 handle 0 length of avatars 2019-04-11 23:26:12 -04:00
Brenden Bice a8de515155 use i18n for title text 2019-04-11 23:26:12 -04:00
Brenden Bice 45b69dc312 add avatar list section title 2019-04-11 23:26:12 -04:00
Brenden Bice 87a4cd450c adjust space between avatars 2019-04-11 23:26:12 -04:00
Brenden Bice df622e6ed6 layout avatars side by side 2019-04-11 23:26:12 -04:00
Brenden Bice 0f5ea9c164 apply theming to avatars list 2019-04-11 23:26:12 -04:00
Brenden Bice 8a2f55644c improve code quality 2019-04-11 23:26:12 -04:00
Brenden Bice 8c9bcdc6c1 rename favourite to favorite 2019-04-11 23:26:12 -04:00
Brenden Bice 6511166631 display favs & favorited user in one line 2019-04-11 23:26:12 -04:00
Brenden Bice df68ce4d83 set maximum avatars count to 15 2019-04-11 23:26:12 -04:00
Brenden Bice 0c3a922341 use promisedRequest for api call 2019-04-11 23:26:12 -04:00
Brenden Bice 4ab2ddb03c improve code quality 2019-04-11 23:26:12 -04:00
Brenden Bice d19bee0b66 fetch parent post boost users information 2019-04-11 23:26:12 -04:00
Brenden Bice 44d07ceb25 support mobile size screen 2019-04-11 23:26:12 -04:00
Brenden Bice 0d8eb1d00b set default avatar background 2019-04-11 23:26:12 -04:00
Brenden Bice 2db607f49c limit avatars list to display 10 2019-04-11 23:26:12 -04:00
Brenden Bice ff25966702 display users in stacked avatarlist 2019-04-11 23:26:12 -04:00
Brenden Bice 85457fc917 fetch reblogged users 2019-04-11 23:26:12 -04:00
Brenden Bice 2d339cd3b8 fetch favorited users 2019-04-11 23:26:12 -04:00
taehoon ab7a418d80 maintain conversationsObject storage 2019-04-11 12:46:06 -04:00
taehoon fa16d66c52 remove unused importing 2019-04-11 07:56:26 -04:00
taehoon 724602bdc1 get statuses in a conversation from the global repository instead of local state 2019-04-11 07:56:26 -04:00
Henry Jameson 262760d258 revert unnecessary changes 2019-04-10 21:48:42 +03:00
dave 40e9eebf91 - merge develop 2019-04-10 12:54:33 -04:00
Henry Jameson 18cb97a2bd Fix wrong local 2019-04-10 15:02:14 +03:00
Shpuld Shpludson ed3aceff5c Merge branch 'mastoapi/update-extension-support' into 'develop'
Update entity normalizer to include more pleroma-specific fields

See merge request 
2019-04-10 03:14:58 +00:00
Henry Jameson a25aabfa10 support new custom emoji format 2019-04-09 22:54:14 +03:00
dave d498a26af5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-09 15:42:05 -04:00
Henry Jameson dfd89b0bbc revert, it's still missing 2019-04-09 22:28:36 +03:00
Henry Jameson d95fc02810 add support for pleroma-specific fields 2019-04-09 22:26:57 +03:00
Shpuld Shpludson d7cf841dfe Merge branch '486-expand-button' into 'develop'
 - remove expand button on conversation page

Closes 

See merge request 
2019-04-09 18:52:18 +00:00
jared 5df049ca31 - remove expand button on conversation page 2019-04-09 14:10:51 -04:00
Shpuld Shpludson b3ace226fb Merge branch 'fix/prevent-repeated-fetching' into 'develop'
 Prevent repeated fetching

Closes 

See merge request 
2019-04-09 18:05:46 +00:00
jasper 011f04c196 fix small bug 2019-04-09 09:19:48 -07:00
jasper b7d7c21617 Add await to login befor redirect to friends timeline 2019-04-09 08:57:41 -07:00
jasper 1570e779b1 Prevent repeated fetching 2019-04-09 08:38:13 -07:00
Shpuld Shpludson 1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop'
 Fix notification bugs

Closes 

See merge request 
2019-04-09 15:24:33 +00:00
dave d3218807b4 - merge develop 2019-04-08 21:04:59 -04:00
Shpuld Shpludson 546ced43d9 Merge branch 'moderation-menu' into 'develop'
Moderation menu 

See merge request 
2019-04-08 19:01:40 +00:00
dave b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-08 14:29:12 -04:00
jared 7f6f025792 - remove unused code 2019-04-08 13:32:39 -04:00
Maksim 7259e02a10 remove debug message 2019-04-08 16:49:51 +00:00
jared 885f4c9924 - bind outside click, add emoji to post status form 2019-04-08 12:02:50 -04:00
jared 2ab915b486 - click outside of emoji implementation 2019-04-08 11:50:12 -04:00
jared 820a6543c7 - update caret pos after emoji's inserted 2019-04-08 11:10:26 -04:00
Henry Jameson 5d2177a048 fix obvious bug 2019-04-07 20:36:55 +03:00