Commit Graph

95 Commits

Author SHA1 Message Date
shpuld c3a931610a remove log 2019-01-28 22:03:25 +02:00
shpuld 0460728a8c Fix tall status expanding needing extra clicks, make tall status expand automatically in conversation when focused 2019-01-28 21:59:17 +02:00
shpuld 20f113e811 Remove logs 2019-01-27 11:35:29 +02:00
shpuld ff5f5095df Fix replies to deleted posts/users pushing vue warnings 2019-01-27 11:31:23 +02:00
Henry Jameson 416424d048 review 2019-01-24 20:27:20 +03:00
Henry Jameson 61c9ecd855 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:10:26 +03:00
HJ c8caa477d7 Revert "fix reply-to tooltip being somewhat unreliable"
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
Henry Jameson 66dc72deb2 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:03:33 +03:00
HJ 3a3cf1d48a Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI

Closes #265 and #262

See merge request pleroma/pleroma-fe!462
2019-01-22 17:46:08 +00:00
Henry Jameson 6c70e9950c some more post fields 2019-01-17 23:57:24 +03:00
Henry Jameson 5251de317d Merge branch 'switch-to-string-ids' into favorites
with some changes/merge conflicts resolution

* switch-to-string-ids:
  fixx?????
  fix notifications?
  fix lint
  fix tests, removed one unused function, fix real problem that tests helped to surface
  added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
  Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
scarlett de8dfef252 Remove reply detection hack 2019-01-13 13:41:02 +00:00
Henry Jameson ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
shpuld 16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
shpuld 85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
Lambda f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01: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
Maxim Filippov 2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Maxim Filippov 828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
Maxim Filippov e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
ValD 1623dcb417 added activatePanel onclick for timeago button 2018-12-12 23:34:22 +05:30
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
ValD 88aa0f1245 resolved the lint 2018-12-05 00:19:00 +05:30
ValD da3adff5a8 used the deleted data param as condition in status template 2018-12-05 00:15:08 +05:30
Henry Jameson 406df4399b avatars shadows, also allows drop-shadow use 2018-11-30 16:39:53 +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
scarlett d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
Henry Jameson d5e82625d3 lint fix 2018-09-25 15:21:47 +03:00
Henry Jameson ef968d8e1e now it actually works 2018-09-25 15:16:26 +03:00
Ekaterina Vaartis 14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
scarlett 54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
scarlett 52ce86ed57 Don't use nsfw clickthrough if the post is collapsed by default. 2018-08-26 00:21:54 +01:00
scarlett da96294866 Don't hide replies when inConversation. 2018-08-24 21:46:45 +01:00
scarlett 60b115320f Fix indentation 2018-08-24 20:19:22 +01:00
scarlett 50b3bd22e6 Remove old implementation of isReply. 2018-08-24 20:08:49 +01:00
scarlett 296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +01:00
ensra 3ec8e43a97 Rename expandCW to collapseMessageWithSubject.
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
ensra 671db023da fix indent 2018-08-20 03:08:39 +01:00
ensra 1121f32c48 Add support for configurable CW clickthrough. 2018-08-20 02:59:06 +01:00
Henry 27adde9887 Merge branch 'develop' into 'feature/accountHighlight'
# Conflicts:
#   src/components/user_card_content/user_card_content.vue
2018-08-12 12:05:08 +00:00
eal 876f7633fe Use serverside html rendering in usernames and bios if available. 2018-08-09 12:52:34 +03:00
Henry Jameson 3d72c2b964 fixed lint 2018-08-05 05:44:02 +03:00
Henry Jameson b04a9d1229 cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling 2018-08-05 05:41:37 +03:00
Henry Jameson 6a81aa2745 added ability to pick the style of highlighting 2018-08-05 05:18:04 +03:00
lambda 17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'"
This reverts merge request !291
2018-07-12 07:20:39 +00:00
Henry Jameson 8ccebbe156 both bugs fixed. it's reactive and no more conflicting cards 2018-07-06 20:12:09 +03:00
Henry Jameson fa8c221f3a moved style generator into separate file. notifications are highlighted too now. 2018-07-06 20:12:09 +03:00
Henry Jameson f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Henry Jameson 148e691199 initial vers 2018-07-06 20:12:09 +03:00
Vivian Lim 158342fc39 Fix lint warnings 2018-06-29 00:10:17 -07:00