Commit graph

136 commits

Author SHA1 Message Date
Henry Jameson
b4ee6b5210 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (51 commits)
  Add floating post-status button on mobile
  Update user settings icon to pencil
  I18n: Update Czech translation
  user_card.vue: Copy over .status-content img styling
  Make minId reset with minVisibleId to prevent gaps when showing new
  Only connect to chat when authenticating in the first place
  Check for websocket token before connecting to chat
  user_card.vue: Set img.emoji to 32×32px
  #432 - prevent post status form textarea keydown event propagation
  Merge content types translations
  Use a cross browser safe solution to get scroll top
  Revert modifier class notation
  Update classname
  Update tests
  Rename UserCardContent to UserCard
  Update block class name of BasicUserCard component
  Update modifier class notation
  compatibility with upcoming changes
  Re-do UserCardContent css
  Load post status content type from instance config
  ...
2019-03-12 22:16:50 +02:00
taehoon
d8e938bb5e Update user settings icon to pencil 2019-03-11 11:52:49 -04:00
Henry Jameson
b0654ebc32 Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:38:30 +02:00
Henry Jameson
a381c96130 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:37:45 +02:00
Henry Jameson
84d0ac2c1c config 2019-03-03 15:34:23 +02:00
Henry Jameson
5727873ebb Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:32:36 +02:00
Henry Jameson
860e73e8f4 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:32:10 +02:00
Aditoo17
93f5f94698 I18n: Add Czech translation 2019-03-02 18:25:49 +01:00
Henry Jameson
90a82b7dec Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (33 commits)
  #383: content type error
  #376: update status timeline when it's empty
  #377: no exteral profile link for local users
  #371: show notification when user setting's saved
  Clean up CSS a bit
  #364: update ap_id error with username
  Rename: instanceSpecificPanelPresent
  Hide isp option if instance has panel disabled
  Take over branch and fix some issues
  Fix lint errors
  Better error handling
  Remove cropped image size restriction
  Remove modal component
  Make embedded image cropper
  Revert eslintrc changes
  Check if variable exists before using
  Remove event listeners when destory ImageCropper
  Localization of ImageCropper component
  Remove event listener when modal is destroyed
  Crop avatar image using minWidth/minHeight
  ...
2019-02-21 19:32:49 +02:00
Henry Jameson
f4e8b781a9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (51 commits)
  fix convos
  resolve focus issue in the auto-complete for name field
  resolve issue related to event handler
  resolve issue in prop binding
  this fixes #350 - v-model binding issue
  #341 - fix naming
  #341 - automatic scroll with repeats/reports
  345 - fix long username issue in repeat status
  Update spanish translate - es.json
  Fix return
  Fix clicking link - open new tab unless tag or mention
  Fix max-width of profile banner in setting
  Fix unit test
  Typo
  #332 - add follow/not follow button to follow list
  Add quick css fix for user profile bg img preview
  Switch into Lodash
  Switch into Lodash
  Change the async stuff to not render app before theme is loaded
  fixing conflicts
  ...
2019-02-14 20:17:22 +02:00
Lidar
ce81a5f72e Deleted static/bg2.jpg, static/bgalt.jpg files 2019-02-09 16:26:54 +00:00
jasper
92874b6902 Fxing conflicts 2019-02-08 13:13:11 -08:00
jasper
70c05a0c08 Fix showFeaturesPanel option as instance 2019-02-08 12:17:14 -08:00
Henry Jameson
3f08301d6b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (108 commits)
  Update user settings text: staff badges are only visible in user profile
  Fix naming
  Show back followees/followers counts
  Always show my own followees/followers
  Hide followers and followees tabs when they are disabled
  #137 - clean up emoji list
  #315 - revert changes
  #315 - separate export and fetch follows logic
  #137 - add red heart emoji
  Grammar
  Fix repeater html not showing properly
  #301 - add an option for default formatting
  #315 - clean up the request
  remove unnecessary div
  #315 - export all follows as CSV
  Make role badge visible only on user profile page
  Add theming support for admin/moderator badges
  Refactor visibleRole for better readability
  Allow to configure visibility for admin and moderator badges
  Add admin and moderator indicators to the user card
  ...
2019-02-08 11:11:20 +02:00
Shpuld Shpludson
85e281d406 Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'
#301 - add an option for a default formatting

See merge request pleroma/pleroma-fe!541
2019-02-07 15:55:54 +00:00
dave
012ce7bad2 #137 - clean up emoji list 2019-02-07 10:29:23 -05:00
dave
997c99e45d #137 - add red heart emoji 2019-02-07 06:26:51 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
shpuld
a8c6b3f538 Change video playing default without bothering making it an instance configurable 2019-01-31 21:19:41 +02:00
shpuld
676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
Henry Jameson
6a044fd3e8 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  "spring" cleaning
  review
  Fix who to follow panel shuffling
  Always send "hide_network" when updating user profile
  fix custom nsfwCensorImage not working
  fix reply-to tooltip being somewhat unreliable
  Revert "fix reply-to tooltip being somewhat unreliable"
  fix reply-to tooltip being somewhat unreliable
  fix errors in console
2019-01-25 01:30:24 +03:00
Henry Jameson
ac64e90898 fix custom nsfwCensorImage not working 2019-01-23 00:15:24 +03:00
Henry Jameson
657bcf72fb Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (49 commits)
  linting
  update test names
  confusion
  better handling of attachments
  Linting.
  Don't use referrerpolicy with media proxy.
  update logo
  support for extended fields (for future, doesn't work yet), fix reply bug
  more fields for users
  some more post fields
  support for CW/Subject. fix replies.
  removing unnecessary conversions since it should already be converted in normalizer
  fix indents
  some consistency
  localization strings
  add support for tab-switcher to automatically switch to first tab if asked index is invalid
  fix login and favorites tab...
  Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not" and some stuff to make favorites still work
  forgot the file
  tests for the tests god! bugfixes for bugfixes throne!
  ...
2019-01-22 21:00:52 +03:00
shpuld
8761e039d0 Merge dev fix conflicts 2019-01-20 15:52:35 +02:00
shpuld
485a061287 Polish for videos, smaller sizes, remove gif-looping options 2019-01-20 12:46:11 +02:00
nik
aed7c7096e update logo 2019-01-18 22:17:38 -06:00
Henry Jameson
1eea45cf6d Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (32 commits)
  [Debug] Avoid duplicates in the who to follow panel
  updated German translation  * added theme settings  * added various missing single strings
  Fix translation typo in registration.vue
  Update README
  Fix profiles without statuses not loading
  Fix conflicting styles
  Remove commented out back button
  Cleanup and remove divider element in side drawer
  New routes, notifications, other impovements in side drwaer
  Add "noAttachmentLinks" to src/modules/instance.js
  Make "noAttachmentLinks" configurable
  No attachment links
  Treat reserved users like external users in the frontend.
  User Card Content fixes and updates
  scopeCopy → true by default
  Restore old routes, enable user route as fallback.
  improve web push notifications
  fix
  Update japanese translation
  fix inconsistencies within who_to_follow_panel
  ...
2019-01-07 13:23:03 +03:00
HJ
a974d2ab85 Merge branch 'scope-copy-default' into 'develop'
scopeCopy → true by default

See merge request pleroma/pleroma-fe!439
2018-12-30 15:12:03 +00:00
lambda
1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
Maxim Filippov
85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
scarlett
f2f7e2e766 scopeCopy → true by default 2018-12-25 17:44:05 +00:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Henry Jameson
d0b47488fb default webPush to false, because having it at true leads to some problems with
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
2018-12-20 09:17:51 +03:00
Henry Jameson
43857d7b13 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (38 commits)
  Feature/bigger icons for mobile / #211
  Fix oauth url
  clean up the unused stuff
  Make user profile page cleaner
  missing string and unification with counters (order)
  collateral fix for tab display
  collateral fixes for user-card: use still-image, styles for custom emoji
  Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs.
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Fix style
  Add a way to get new captcha on click
  Fix style
  Separate captcha into the backendInteractor
  more visual fixes
  changed bottom-shadow hiding method to be more compatible with overflow
  small fix for overflowing tab-switcher
  ...
2018-12-19 01:26:20 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Henry Jameson
398fad40c9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  oof
  slightly changed the code to have less mutations, added comments
  more damage control
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  Added support for async following including delayed confirmation if we followed user or not
  search button for user finder
  hide logo when opening search bar on small screens
2018-12-15 03:39:47 +03:00
Henry Jameson
bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop: (176 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Fix typo that prevented scope copy from working.
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  ...
2018-12-14 17:10:26 +03:00
Henry Jameson
c1f1588393 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fix
2018-12-11 19:09:33 +03:00
Henry Jameson
8fcc4c6766 fix 2018-12-11 19:09:00 +03:00
Maxim Filippov
ae8f0f36d8 Use "~" as a route namespace symbol 2018-12-10 01:21:52 +03:00
Maxim Filippov
7d5794b9fa Fix redirect paths 2018-12-06 22:10:46 +03:00
Henry Jameson
6a411faf3f Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  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:36 +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
7a13c530c7 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop:
  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
2018-12-04 09:56:45 +03:00
Henry Jameson
6b3489a4d3 search button for user finder 2018-12-03 08:03:11 +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
151d9767b2 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fallback for some weird case on my phone
  todo
  missing string
  some more themes, fixes
  localization strings, fixes
  making inset shadows work on avatars again
  fix retweeter avatar not getting proper shadow
  avatars shadows, also allows drop-shadow use
2018-12-02 15:07:33 +03:00
Henry Jameson
80c0745558 some more themes, fixes 2018-12-02 10:22:25 +03:00
Henry Jameson
a3b20fbd1a Merge branch 'feature/theming2' into shigusegubu
* feature/theming2: (124 commits)
  whoops
  whoops
  redmond update
  better preview, collateral fixes
  theme separation
  more styles
  cosmetic fixes
  font control args to allow passing an option list of fonts, for future use
  more fonts
  initial font support
  clean up
  validity checks, no longer exploding when something is invalid
  DM timeline: stream new statuses
  collateral fixes
  fixed indentation
  some help strings
  reset buttons, better disabled for shadows
  added "keep opacity" option, fixed opacity loading, fixed missing shadows not affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
  fix v1->v2 transition for localstorage
  radii v1 fixes
  ...
2018-11-26 18:20:19 +03:00