sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5176 commits 3 branches 15 tags 109 MiB
Commit graph

77 commits

Author SHA1 Message Date
Absturztaube 381c4e7f82 resolve merge conflicts 2020-12-29 13:00:48 +01:00
HJ 8d9bf3efc8 Merge branch 'plain-bg' into 'develop' 
Solid color wallpaper support

See merge request pleroma/pleroma-fe!1314
 2020-12-18 08:37:01 +00:00
Shpuld Shpludson 466fc84e82 Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop' 
fix #1020 fix error handling in profile tab

Closes #1020

See merge request pleroma/pleroma-fe!1299
 2020-12-16 16:51:03 +00:00
Henry Jameson 0cf06cb9ec Merge remote-tracking branch 'origin/develop' into plain-bg 
* origin/develop:
  fix remote follow button style
  Disable horizontal textarea resize
  Add uk.json in messages.js
  Display upload limit on the Features panel
  use title html for poll options before vote
  fix recent mistakes in react button
 2020-12-16 18:43:38 +02:00
Henry Jameson 5cb41c7175 theme ui 2020-12-16 18:28:10 +02:00
Henry Jameson c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02:00
Absturztaube 026dc263e5 Merge branch 'develop' into fedi-absturztau-be 2020-12-16 12:00:58 +01:00
eugenijm 6d9c79fb6d Disable horizontal textarea resize 2020-12-15 21:18:59 +03:00
Absturztaube ad728d9046 resolve conflichts 2020-12-04 20:45:10 +01:00
Shpuld Shpuldson b537032e6d Merge branch 'develop' into fix/fix-error-handling-in-profile-tab 2020-12-02 12:48:21 +02:00
Shpuld Shpuldson 4dde9c4d52 refactor error handling in profile tab 2020-12-02 12:46:31 +02:00
Shpuld Shpludson 655d985a82 Merge branch 'develop' into 'fix/use-semantically-correct-buttons' 
# Conflicts:
#   CHANGELOG.md
 2020-12-01 10:47:10 +00:00
Shpuld Shpuldson 7b99d98c55 Replace all use of <a> + href='#' with proper buttons 2020-11-24 12:32:42 +02:00
Shpuld Shpuldson 0f386ccbc7 use users state + fetching with delay 2020-11-18 18:43:24 +02:00
Absturztaube 8065afc4d7 resolve merge conflicts 2020-11-08 14:04:17 +01:00
Henry Jameson 64da9a8e69 fix build warnings 2020-11-01 16:47:17 +02:00
Absturztaube a43623c5a5 Merge branch 'develop' into fedi-absturztau-be 2020-10-29 09:24:25 +01:00
Henry Jameson b6cf2bcefd improved the semantics for our icon scale, fixed preview, fixed navbar desktop 2020-10-28 21:31:16 +02:00
Henry Jameson f561e75553 lint 2020-10-21 00:31:16 +03:00
Henry Jameson a50cd7e37d remaining changes... 2020-10-21 00:01:28 +03:00
Henry Jameson 3cbaa00449 more replacements + small renames 2020-10-20 22:54:43 +03:00
Henry Jameson b19c2eb0fb More stuff. Buttons in user card's corner now have MUCH bigger hitboxes 2020-10-20 22:13:19 +03:00
Henry Jameson 046c60cb61 cancel -> times 2020-10-20 21:18:23 +03:00
Henry Jameson e8650d3409 chevrons-downs, settings 2020-10-20 21:03:46 +03:00
Absturztaube 7a9bd70a09 Merge branch 'develop' into fedi-absturztau-be 2020-10-07 18:51:14 +02:00
Shpuld Shpludson 91778a0276 Merge branch 'feat/custom-virtual-scrolling' into 'develop' 
Timeline virtual scrolling

See merge request pleroma/pleroma-fe!1043
 2020-09-29 10:18:37 +00:00
Shpuld Shpludson f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Maksim Pechnikov 3dbc1bedbf Merge branch 'develop' into feature/import_export_mutes 2020-09-18 22:04:01 +03:00
Absturztaube 575ce2c65e Merge branch 'develop' into fedi-absturztau-be 2020-09-11 20:47:04 +02:00
Shpuld Shpuldson 8975589bca fix vue warnings and errors 2020-09-08 10:44:08 +03:00
Maksim Pechnikov 947d7cd6f2 added import/export mutes 2020-09-08 09:41:42 +03:00
Shpuld Shpuldson f281663b49 Add hacky functionality to open specific settings tabs 2020-09-03 15:45:13 +03:00
Absturztaube 07853ed322 Merge branch 'develop' into fedi-absturztau-be 2020-08-27 21:41:14 +02:00
Absturztaube aabd393e15 add settings for third column 2020-07-26 20:36:03 +02:00
eugenijm 77d65d6cec Ensures the minimized modal is always 50px above the mobile browser bottom bar regardless of whether or not it is visible. 2020-07-23 16:36:21 +03:00
eugenijm 2298ad0011 Use bock-scroll-lock directive for the settings modal 2020-07-23 12:15:44 +03:00
eugenijm 61dd1a3b49 Add body 100% width for the preview, refactor the modalActivated watcher, use body scroll lock for the setting tab content 2020-07-23 09:53:51 +03:00
eugenijm dac075c61a Fix mobile setting modal behavior: ensure the mobile browser address bar doesn't overlap the modal top panel. 2020-07-23 09:53:51 +03:00
Mark Felder 149941828f Improve layout of the Notifications Filters section 2020-07-15 09:56:46 -05:00
Mark Felder 49aaf9dc57 Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:01:40 -05:00
Shpuld Shpuldson b8c1b25397 remove most of reply preview and autoload related stuff 2020-07-14 15:08:04 +03:00
Mark Felder da94935aaa Merge branch 'develop' into refactor/notification_settings 2020-07-13 13:25:23 -05:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Shpuld Shpludson eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
kPherox 9b40cf43d8
fix height for emoji panel of settings modal 2020-07-04 18:42:15 +09:00
Shpuld Shpuldson ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
Shpuld Shpludson ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting' 
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
 2020-06-27 07:19:49 +00:00
Mark Felder 2eda3d687e Sync up key names properly 2020-06-26 17:02:17 -05:00
Mark Felder 5321415641 Update notification filters to reflect new settings 2020-06-26 16:56:31 -05:00
Mark Felder 199fc9351d Merge branch 'develop' into refactor/notification_settings 2020-06-25 15:28:17 -05:00