jasper
4e79300232
Remove posts by blocking or unfollowing
2019-02-25 14:35:47 -08:00
HJ
fef0981bc4
Merge branch 'issue-396-registration-bio-field' into 'develop'
...
#396 : update registration form
Closes #396
See merge request pleroma/pleroma-fe!612
2019-02-25 19:58:17 +00:00
Shpuld Shpludson
dbf46942d0
Merge branch 'fix/active-user-search-text-field' into 'develop'
...
#387 Activate user search text field after click button.
See merge request pleroma/pleroma-fe!608
2019-02-25 16:09:18 +00:00
jasper
bbd3e6b10f
Update search input name
2019-02-25 06:08:52 -08:00
dave
20c68d33eb
#396 : update en.json
2019-02-24 15:44:06 -05:00
dave
8275f2aa9a
#396 : update registration form
2019-02-24 14:30:29 -05:00
Edijs
66a105a519
Revert
2019-02-22 13:53:43 -07:00
dave
9bedf96b98
#389 : add loading icon in search panel
2019-02-22 13:37:02 -05:00
Shpuld Shpludson
99051f4a55
Merge branch 'fix/fetch-error-when-login' into 'develop'
...
#370 fix/fetch-error-when-login
See merge request pleroma/pleroma-fe!596
2019-02-22 15:17:17 +00:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
taehoon
22851a3a96
Remove needless code
2019-02-21 20:15:51 -05:00
jasper
34d723215b
Activate user search text field
2019-02-21 11:20:46 -08:00
Shpuld Shpludson
c3fa2c90e2
Merge branch 'issue-376-no-statuses' into 'develop'
...
#376 : update status timeline when it's empty
Closes #376
See merge request pleroma/pleroma-fe!601
2019-02-21 17:24:39 +00:00
dave
09822cc15b
#383 : content type error
2019-02-21 11:16:11 -05:00
taehoon
37eec09b9b
Comment out the mutes tab
2019-02-20 13:30:31 -05:00
taehoon
5bd36c6476
Remove needless css
2019-02-20 13:30:31 -05:00
taehoon
46e1f30347
Fix indent
2019-02-20 13:30:31 -05:00
taehoon
395d212904
Add new strings to i18n
2019-02-20 13:30:31 -05:00
taehoon
a5162bd636
Add note for empty state to the lists using slot
2019-02-20 13:30:31 -05:00
taehoon
6d4d705c51
Rename some options and add comments to HOCs
2019-02-20 13:30:31 -05:00
taehoon
339373b495
Improve chaining hocs using vue-compose
2019-02-20 13:30:30 -05:00
taehoon
f81b82b471
Use hoc definitions to be factor of factory
2019-02-20 13:30:30 -05:00
taehoon
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
taehoon
09315b2780
Add a prop to force-refresh data to withSubscription hoc
2019-02-20 13:30:30 -05:00
taehoon
8c8a6edc78
Remove pagination support from block-list
2019-02-20 13:30:30 -05:00
taehoon
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
taehoon
0220d3d304
Finally, added BlockCard
2019-02-20 13:30:30 -05:00
taehoon
5d6e1864a5
Update BasicUserCard template and add a slot for customization
2019-02-20 13:30:30 -05:00
taehoon
94e6de11b7
Add withList hoc and remove UserList component
2019-02-20 13:30:30 -05:00
taehoon
a817cc7cb4
Wire up ui to real blocks api data
2019-02-20 13:30:30 -05:00
taehoon
a56d2dfeb1
Add blocks tab with test data to user settings page
2019-02-20 13:30:30 -05:00
taehoon
4a737cbe45
Add reusable BasicUserCard and UserList components
2019-02-20 13:30:30 -05:00
dave
e20a7be3aa
#376 : update status timeline when it's empty
2019-02-20 10:13:28 -05:00
Shpuld Shpludson
cfdd885e04
Merge branch 'issue-371-user-setting-notification' into 'develop'
...
#371 : show notification when user setting's saved
Closes #371
See merge request pleroma/pleroma-fe!598
2019-02-20 14:42:27 +00:00
Shpuld Shpludson
a49f6dbf65
Merge branch 'fix/follow-list' into 'develop'
...
Watch user change in follow-list
Closes #360
See merge request pleroma/pleroma-fe!584
2019-02-20 14:32:45 +00:00
dave
0caf59a911
#377 : no exteral profile link for local users
2019-02-19 13:49:04 -05:00
jasper
1e43a47c3c
Update: Fix fetch error when login
2019-02-19 09:42:53 -08:00
dave
63cfe051c7
#371 : show notification when user setting's saved
2019-02-19 12:38:49 -05:00
Shpuld Shpludson
53484ae4bf
Merge branch 'issue-344-css-refactor' into 'develop'
...
#344 - replace float: with flexbox, clean up
See merge request pleroma/pleroma-fe!566
2019-02-19 16:49:44 +00:00
Shpuld Shpludson
0e1295edea
Merge branch 'follow-requests-for-locked-accounts' into 'develop'
...
Follow Request notification count for restricted accounts
See merge request pleroma/pleroma-fe!561
2019-02-19 16:38:05 +00:00
shpuld
32df77c16a
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
2019-02-19 18:34:09 +02:00
shpuld
4e0f934301
Clean up CSS a bit
2019-02-19 18:33:40 +02:00
Shpuld Shpludson
7b9a6f8d43
Merge branch '256-avatar-crop-popup' into 'develop'
...
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
2019-02-19 15:37:01 +00:00
Shpuld Shpludson
ed3c318be0
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'
...
Fix followers/follows UI, fix #343 fix #340
Closes #340 and #343
See merge request pleroma/pleroma-fe!590
2019-02-19 14:47:32 +00:00
Edijs
d032ce2758
Validate if there are any new status to show
2019-02-18 18:32:20 -07:00
jasper
b4709515f2
Fix error when login
2019-02-18 17:15:16 -08:00
jasper
d4a2376e12
fix/fetch-error-when-login
2019-02-18 12:32:08 -08:00
jasper
24d7f9917b
Remove posts by blocking or following
2019-02-18 11:39:35 -08:00
Edijs
0d2922afb3
Remove event listener when component destroy
2019-02-17 14:37:24 -07:00
Edijs
642b0be0b2
Bind a keyboard to show new status
2019-02-17 14:31:13 -07:00
Edijs
c30dabbdd4
Rename: instanceSpecificPanelPresent
2019-02-17 14:24:14 -07:00
Edijs
e871e3f2ac
Hide isp option if instance has panel disabled
2019-02-17 13:24:24 -07:00
shpuld
e801d78e9d
Take over branch and fix some issues
2019-02-17 18:54:22 +02:00
taehoon
3094c50ff9
Fix lint errors
2019-02-15 13:34:33 -05:00
taehoon
2de756aa0c
Better error handling
2019-02-15 13:34:33 -05:00
taehoon
2132d58075
Remove cropped image size restriction
2019-02-15 13:34:33 -05:00
taehoon
b6d197ce1d
Remove modal component
2019-02-15 13:34:33 -05:00
taehoon
b24db12e1c
Make embedded image cropper
2019-02-15 13:34:33 -05:00
taehoon
546ba9eba9
Revert eslintrc changes
2019-02-15 13:34:33 -05:00
taehoon
b458b2ae5f
Check if variable exists before using
2019-02-15 13:34:33 -05:00
taehoon
ddfdaf3284
Remove event listeners when destory ImageCropper
2019-02-15 13:34:33 -05:00
taehoon
228e6681e3
Localization of ImageCropper component
2019-02-15 13:34:33 -05:00
taehoon
205e38ffa9
Remove event listener when modal is destroyed
2019-02-15 13:34:33 -05:00
taehoon
09949fc7ee
Crop avatar image using minWidth/minHeight
2019-02-15 13:34:33 -05:00
taehoon
13725f040b
Add avatar crop popup
2019-02-15 13:34:33 -05:00
jasper
6c8ccf2733
Remove posts immediately by blocking
2019-02-15 07:52:34 -08:00
eugenijm
d831b81912
Added follow requests counter to nav bar to make it visible behorehand
2019-02-15 12:49:00 +03:00
jasper
daa10f3969
Fix console error - maximum call stack size exceeded
2019-02-15 00:01:13 -08:00
Edijs
3398817c25
watch only user
2019-02-14 13:25:22 -07:00
Edijs
0ca145ac95
Watch user change in follow-list
2019-02-14 13:19:00 -07:00
HJ
5d73a1dd06
Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
...
This reverts merge request !551
2019-02-14 19:15:59 +00:00
HJ
8d7ac0e14c
Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
...
This reverts merge request !573
2019-02-14 19:11:17 +00:00
HJ
ee4c6f362b
Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'"
...
This reverts merge request !574
2019-02-14 19:05:59 +00:00
Edijs
28660d6986
Issue #335 - place hide button on right hand
2019-02-14 10:21:10 -07:00
Edijs
50f0d21686
Use static height if gallery has single image
2019-02-14 09:52:23 -07:00
Shpuld Shpludson
295becd6c8
Merge branch 'hotfix/issues-in-autocomplete' into 'develop'
...
#355 hotfix/issues in autocomplete
Closes #355
See merge request pleroma/pleroma-fe!574
2019-02-14 14:50:58 +00:00
Henry Jameson
688906a61e
fix convos
2019-02-14 00:11:11 +02:00
Xiaofeng An
19dd36945a
resolve focus issue in the auto-complete for name field
2019-02-13 15:39:37 -05:00
Xiaofeng An
98c27fd812
resolve issue related to event handler
2019-02-13 07:38:53 -05:00
Xiaofeng An
2100cb247d
resolve issue in prop binding
2019-02-13 07:38:13 -05:00
Xiaofeng An
64fab9d7bc
this fixes #350 - v-model binding issue
2019-02-12 13:55:00 -05:00
Shpuld Shpludson
26954cb3dd
Merge branch 'issue-341-repeat-auto-scroll' into 'develop'
...
#341 - automatic scroll with repeats/reports
See merge request pleroma/pleroma-fe!568
2019-02-12 16:06:23 +00:00
Edijs
5d0e51cae3
Fix styling
2019-02-12 09:00:09 -07:00
dave
25bb80a982
#341 - fix naming
2019-02-12 10:35:54 -05:00
Shpuld Shpludson
25cfb04873
Merge branch 'fix/profile-banner-preview-width' into 'develop'
...
#333 Fix max-width of profile banner in setting
See merge request pleroma/pleroma-fe!560
2019-02-12 15:05:26 +00:00
Shpuld Shpludson
2bc1cc9ff9
Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'
...
#255 - implement autocomplete in non post forms
See merge request pleroma/pleroma-fe!551
2019-02-12 14:55:18 +00:00
dave
493d542d92
#341 - automatic scroll with repeats/reports
2019-02-12 05:10:27 -05:00
jared
4d930c7c26
345 - fix long username issue in repeat status
2019-02-11 23:03:51 -05:00
dave
f2ce2e9176
#344 - replace float: with flexbox, clean up
2019-02-11 22:35:24 -05:00
Edijs
dd1b256005
Fix typo
2019-02-11 11:08:25 -07:00
Edijs
9f3f1ee7cb
Fix UI of followers list
2019-02-11 11:03:01 -07:00
Edijs
f3d2e41a9b
Fix return
2019-02-11 07:45:22 -07:00
Edijs
9959c311a9
Fix clicking link - open new tab unless tag or mention
2019-02-11 07:38:12 -07:00
Shpuld Shpludson
0e6134b32e
Merge branch 'issue-332-update-follow-tabs' into 'develop'
...
#332 - add follow/not follow button to follow list
See merge request pleroma/pleroma-fe!558
2019-02-11 13:29:58 +00:00
taehoon
a20974faac
Use correct syntax for pseudoelement
2019-02-11 06:56:46 -05:00
jasper
db465ff839
Fix max-width of profile banner in setting
2019-02-11 00:06:37 -08:00
Edijs
fc26f1852e
Merge branch 'develop' into fix/hashtag-opening
2019-02-10 11:59:19 -07:00
taehoon
971e75aa64
Add translation strings
2019-02-10 13:26:08 -05:00
taehoon
750c308909
Support lightbox gallery navigation via arrow buttons and keyboard
2019-02-10 13:23:01 -05:00
dave
4b18989fef
#332 - add follow/not follow button to follow list
2019-02-09 23:05:23 -05:00
Shpuld Shpludson
4bea3c525f
Merge branch 'fix/subject-copying-composition-bug' into 'develop'
...
#326 Subject copying composition bug
See merge request pleroma/pleroma-fe!550
2019-02-09 20:47:29 +00:00
jo
7743e3b277
Add quick css fix for user profile bg img preview
2019-02-09 20:42:51 +00:00
jasper
0a43546564
Switch into Lodash
2019-02-09 04:18:52 -08:00
jasper
f75ec48a80
Switch into Lodash
2019-02-09 04:13:52 -08:00
Shpuld Shpludson
5296d41372
Merge branch 'fix/js-error-in-tag-page' into 'develop'
...
Fixed JS error in tag page
See merge request pleroma/pleroma-fe!543
2019-02-09 06:56:46 +00:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +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
Xiaofeng An
9f83aee1ed
fix auto-complete field not taking the whole parent width in flex
2019-02-08 11:54:12 -05:00
Xiaofeng An
59cde429b9
fix naming
2019-02-08 11:40:54 -05:00
Xiaofeng An
63680227c1
select either textarea or input
2019-02-08 11:26:17 -05:00
jasper
e90e7ce2db
Subject copying composition bug
2019-02-08 08:25:53 -08:00
Xiaofeng An
e8dc019afd
remove rows attribute from input
2019-02-08 11:13:35 -05:00
Xiaofeng An
dd8531f9c9
move styles for AutoCompleteInput
2019-02-08 11:13:35 -05:00
Xiaofeng An
17c70fc0ef
add id & placeholder props to AutoCompleteInput component
2019-02-08 11:13:35 -05:00
Xiaofeng An
128dcc637e
make name field auto-complete
2019-02-08 11:13:35 -05:00
Xiaofeng An
2d91c9d949
make bio field auto-complete
2019-02-08 11:13:35 -05:00
Xiaofeng An
fb0cf64549
#255 - make AutoCompleteInput component
2019-02-08 11:13:35 -05:00
dave
910b63624b
#291 - fixed typo
2019-02-08 10:40:03 -05:00
dave
d112d5b333
#291 - remove whitespace
2019-02-08 10:02:00 -05:00
dave
34169e692f
#291 - enable media/favorite tabs with prefetched data
2019-02-08 09:56:45 -05:00
jasper
7818d6786b
Add option to hide filtered statuses
2019-02-08 05:17:20 -08:00
jasper
10c7365451
Add option to hide filtered statuses
2019-02-08 04:31:44 -08:00
dave
b57b4c6e45
#291 - disable empty tabs in user profile panel
2019-02-08 05:31:06 -05:00
Edijs
0dc7c45f32
Code refactoring
2019-02-07 16:23:18 -07:00
HJ
62b3b9b8d4
Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
...
Add admin and moderator indicators to the user profile
See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
eugenijm
19dbdd24b4
Update user settings text: staff badges are only visible in user profile
...
Use capitalized text in badges
2019-02-08 01:33:24 +03:00
Edijs
d39e2643f5
Fix lint warning
2019-02-07 14:56:00 -07:00
Edijs
e44d8ad71e
Extract tag name from href and open in same tab
2019-02-07 14:54:49 -07:00
Shpuld Shpludson
9b49fa3c0c
Merge branch '287-following-followers-tabs' into 'develop'
...
Hide Following/Followers tabs if user has them disabled
Closes #287
See merge request pleroma/pleroma-fe!515
2019-02-07 15:59:37 +00: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
taehoon
55da7dbfde
Fix naming
2019-02-07 10:53:36 -05:00
taehoon
fae93217b8
Show back followees/followers counts
2019-02-07 10:48:47 -05:00
taehoon
ea1d7f46b5
Always show my own followees/followers
2019-02-07 10:48:47 -05:00
taehoon
55fc31ea4d
Hide followers and followees tabs when they are disabled
2019-02-07 10:48:47 -05:00
Shpuld Shpludson
05ef0432d3
Merge branch 'issue-315-csv-export' into 'develop'
...
#315 - export all follows as CSV
See merge request pleroma/pleroma-fe!538
2019-02-07 15:42:18 +00:00
dave
3128417176
#315 - separate export and fetch follows logic
2019-02-07 09:57:16 -05:00
Edijs
a215f6856d
Always open tag in same instance
2019-02-06 21:26:32 -07:00
Edijs
fafe258f2b
Typo
2019-02-06 19:19:14 -07:00
shpuld
4dbc6a3c56
Fix repeater html not showing properly
2019-02-06 22:17:06 +02:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
Edijs
a12397cf38
Hashtag opens in same tab
2019-02-06 11:34:21 -07:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
dave
2f12ac7ea4
#315 - export all follows as CSV
2019-02-06 11:17:23 -05:00
eugenijm
fd4cd2e10a
Make role badge visible only on user profile page
2019-02-06 18:07:37 +03:00
eugenijm
676e6da3a5
Add theming support for admin/moderator badges
2019-02-06 18:07:37 +03:00
eugenijm
d00b74b607
Refactor visibleRole for better readability
...
Improve translation
2019-02-06 18:07:37 +03:00
eugenijm
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
eugenijm
c714eb2600
Add admin and moderator indicators to the user card
2019-02-06 18:04:21 +03:00
Shpuld Shpludson
6a867f6ae3
Merge branch 'feature/split-hide-network-fixed' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma-fe!536
2019-02-06 14:38:50 +00:00
Maxim Filippov
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
Shpuld Shpludson
68e5360229
Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'
...
Add option to hide features panel
See merge request pleroma/pleroma-fe!529
2019-02-06 04:21:06 +00:00
Maxim Filippov
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00
Edijs
52f5ffa862
Fix avatar link in search result
2019-02-05 15:11:17 -07:00
Shpuld Shpludson
2db7774a3a
Merge branch 'issue-316-empty-username' into 'develop'
...
#316 - fix empty username issue
See merge request pleroma/pleroma-fe!531
2019-02-05 19:58:45 +00:00
dave
0b24454561
#316 - fix empty username issue
2019-02-05 14:33:16 -05:00
Shpuld Shpludson
8e51c78471
Merge branch 'issue-138-html-escaping' into 'develop'
...
#138 - escape html entities in BIO text
See merge request pleroma/pleroma-fe!522
2019-02-05 15:24:31 +00:00
shpuld
5974dfebfb
Fix mishandled @error in stillImage
2019-02-05 17:17:50 +02:00
dev92341
e3da156162
Add option to hide features panel (About page)
2019-02-05 06:12:14 -08:00
dave
94fdc2d583
#138 - fix lint error
2019-02-04 15:06:38 -05:00
dave
e1f9298ef2
#138 - unescape user bio
2019-02-04 15:03:01 -05:00
dave
c1883f5282
#138 - escape html entities in BIO text
2019-02-04 14:25:21 -05:00
Shpuld Shpludson
448317338e
Merge branch '309-add-logo-to-hamburger-menu' into 'develop'
...
Add logo and sitename to the side drawer area
Closes #309
See merge request pleroma/pleroma-fe!517
2019-02-04 19:00:38 +00:00
taehoon
13ee624341
Do not use BEM
2019-02-04 13:34:07 -05:00
taehoon
5675b9326c
Improve readability using v-if and v-else
2019-02-04 13:30:33 -05:00
taehoon
4528a4cbfa
Show logo/sitename in the side drawer only if logged out
2019-02-04 13:30:33 -05:00
taehoon
537631002b
Add logo and sitename to the side drawer area
2019-02-04 13:30:32 -05:00
shpuld
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
Shpuld Shpludson
3cd1deb133
Merge branch 'issue-154-shorten-cw-subject' into 'develop'
...
Issue #154 shorten subject
Closes #154
See merge request pleroma/pleroma-fe!520
2019-02-04 17:29:58 +00:00
dave
97fbc1d402
#312 - media uploader not working with same file in adjacent order
2019-02-04 10:45:26 -05:00
dave
9d72c7e1bd
#154 - update long subject determine logic, meaningful variable names
2019-02-04 09:28:14 -05:00
dave
887f1def2e
handle poster attachment with tall subjects
2019-02-04 03:16:55 -05:00
dave
06cf8628e5
shorten incredibly long content warning or subject
2019-02-03 23:47:26 -05:00
Shpuld Shpludson
bb335ea71b
Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop'
...
#307 - replace user links with router links in repeats
See merge request pleroma/pleroma-fe!516
2019-02-04 04:22:33 +00:00
Shpuld Shpludson
d6ee6e8394
Merge branch '275-avatar-placeholder' into 'develop'
...
Support avatar placeholder
Closes #275
See merge request pleroma/pleroma-fe!511
2019-02-04 04:17:11 +00:00
Xiaofeng An
abf53838e2
#307 - replace user links with router links in repeats
2019-02-03 14:08:04 -05:00
taehoon
e7f43d6bc3
Use an existing image served by backend instead
2019-02-03 13:30:54 -05:00
Shpuld Shpludson
7115584882
Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop'
...
#306 - fix conversation arrow smushed in notifications panel
See merge request pleroma/pleroma-fe!513
2019-02-03 15:10:19 +00:00
Xiaofeng An
6d3a7809be
#306 - fix conversation arrow smushed in notifications panel
2019-02-03 09:59:32 -05:00
Xiaofeng An
965a578561
Revert " #306 - fix conversation arrow smushed in notifications panel"
...
This reverts commit 1e40e70efc
.
2019-02-03 09:49:22 -05:00
Shpuld Shpludson
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
18ae7bd5f3
Combine friends/followers
2019-02-03 11:58:49 +02:00
shpuld
b614cb94e5
merge develop in
2019-02-03 10:13:09 +02:00
Shpuld Shpludson
c7ee2ed831
Merge branch '238-add-avatar-size-suggestion' into 'develop'
...
Add avatar size instruction notice
Closes #238
See merge request pleroma/pleroma-fe!512
2019-02-03 07:05:38 +00:00
Shpuld Shpludson
f0721ed83b
Merge branch 'fix/default-inlined-videos' into 'develop'
...
Change video playing default without bothering making it an instance configurable
See merge request pleroma/pleroma-fe!505
2019-02-03 06:45:04 +00:00
Xiaofeng An
1e40e70efc
#306 - fix conversation arrow smushed in notifications panel
2019-02-02 21:49:07 -05:00
taehoon
d8ad494081
Add avatar size instruction notice
2019-02-02 20:39:41 -05:00
taehoon
4833f79cc2
Fix class ordering issues related to avatar
2019-02-02 15:50:25 -05:00
taehoon
0b66a43a83
Improve reusability of UserAvatar component
2019-02-02 15:33:02 -05:00
shpuld
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02:00
taehoon
89b9aed134
Move avatar css into a correct place
2019-02-02 14:33:13 -05:00
taehoon
d607e4195a
Migrate StillImage to UserAvatar for avatars
2019-02-02 14:23:52 -05:00
taehoon
9c4092dbd5
Use a correct avatar placeholder image
2019-02-02 14:17:00 -05:00
taehoon
95b735ff72
Show placeholder image if avatar image url is broken
2019-02-02 14:11:36 -05:00
Shpuld Shpludson
0fba655cf0
Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into 'develop'
...
fix #157 show screen_name when name is empty in retweet
Closes #157
See merge request pleroma/pleroma-fe!508
2019-02-02 05:52:39 +00:00
Joshua Burch
7d93beb96d
fix #157 show screen_name when name is empty in retweet
2019-02-01 17:40:06 -05:00
Joshua Burch
9eddaf6c3e
fix #209 make name field length as wide as the bio field
2019-02-01 16:12:14 -05:00
Shpuld Shpludson
1a6207be1d
Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'
...
Fix #298 Add option to tab switcher to not render background tabs
Closes #298
See merge request pleroma/pleroma-fe!504
2019-01-31 19:21:49 +00:00
shpuld
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
shpuld
8ce513ed09
initial draft for follows/following pagination
2019-01-31 21:11:28 +02:00
Shpuld Shpludson
3e4c598af4
Merge branch 'fix/statistics' into 'develop'
...
Fix statistics label visibility via configuration
See merge request pleroma/pleroma-fe!503
2019-01-31 15:11:29 +00:00
shpuld
476bf0afe1
Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher
2019-01-31 17:00:31 +02:00
Edijs
6a8d10f0bb
Fix statistics label visibility via configuration
2019-01-30 18:53:34 -07:00
shadowfacts
3c4cf5ed11
Only generate mentions string if there are mentions
...
Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder.
2019-01-31 00:50:19 +00:00
shpuld
aaa5f1a638
Adjust margins for attachments/previews
2019-01-30 21:41:07 +02:00
shpuld
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
lambda
1717e70046
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
...
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
lambda
0bd77149a0
Merge branch 'fix/tall-statuses-v2' into 'develop'
...
More tall status related fixes that I didn't know was borkd
See merge request pleroma/pleroma-fe!498
2019-01-30 17:47:46 +00:00
lambda
d0df98f99b
Merge branch 'fix/reply-to-using-wrong-id' into 'develop'
...
Fix #295 reply-to link pointing to wrong id
Closes #295
See merge request pleroma/pleroma-fe!499
2019-01-30 17:46:52 +00:00
lambda
7b0e3dc471
Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'
...
Fix #289 Make more user links use internal routing
Closes #289
See merge request pleroma/pleroma-fe!500
2019-01-30 17:46:18 +00:00
shpuld
15603981f8
Capture clicks on statuses to hijack mention clicks, match mention href to user somehow
2019-01-30 19:24:47 +02:00
shpuld
16a5272726
Fix a simple typo
2019-01-30 16:57:19 +02:00
shpuld
0a39159fdf
Adjust scrolling logic and document it, make sure to never show 'show less' if it's not a tall status
2019-01-30 16:38:28 +02:00
Maxim Filippov
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
shpuld
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
shpuld
0a0dffa793
Fix favs timeline fetching when opening profile via direct url
2019-01-29 19:12:47 +02:00
shpuld
1f3cf6d1fc
add missing shadow to nav panel
2019-01-29 16:32:34 +02:00
lambda
4185452b52
Merge branch 'feature/link-preview' into 'develop'
...
link previews
See merge request pleroma/pleroma-fe!481
2019-01-29 14:12:18 +00:00
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
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
lambda
bb2ee04f04
Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop'
...
fix/don't fetch favs if the profile isnt current user
See merge request pleroma/pleroma-fe!484
2019-01-28 16:22:03 +00:00
shpuld
4d3907b86a
Formatting
2019-01-28 17:48:00 +02:00
shpuld
1b76a5a9ea
Add back that login error thing that someone removed
2019-01-28 17:43:51 +02:00
shpuld
82ef57cd59
dont fetch favs if profile isnt us
2019-01-28 16:59:01 +02:00
lambda
3b1cafc19f
Merge branch 'fix/fix-warnings' into 'develop'
...
Fix annoying console warnings
See merge request pleroma/pleroma-fe!480
2019-01-28 10:52:24 +00:00
shpuld
96c36af731
refactor the FE parts
2019-01-28 05:50:12 +00:00
William Pitcock
2b86f6e883
status: only show link preview in main post view
2019-01-28 05:50:12 +00:00
William Pitcock
0924907c64
add link-preview component
2019-01-28 05:50:12 +00: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
shpuld
2d94a49798
Fix registration path warning and translation warnings
2019-01-27 11:13:32 +02:00
shpuld
474fbf6bf4
use translate over margin animation (stupid me)
2019-01-27 08:27: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
shpuld
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
William Pitcock
7b296696a3
user profile: add media timeline
2019-01-26 13:49:24 +00:00
Henry Jameson
9f914824cb
i should take it easy
2019-01-25 17:55:56 +03:00
Henry Jameson
eb33951186
hotfix
2019-01-25 16:24:41 +03:00
Henry Jameson
f48e3d0db8
quickfix
2019-01-25 01:39:19 +03:00
Henry Jameson
9d0d6b86c8
this attempts converting id to number to sort them numerically, since "99" >
...
"100" while 99 < 100
2019-01-25 01:08:08 +03:00
HJ
03ffa7e84e
Merge branch 'fix-custom-nsfw-image' into 'develop'
...
fix custom nsfwCensorImage not working
See merge request pleroma/pleroma-fe!469
2019-01-24 18:13:07 +00:00
HJ
8b7faa8106
Merge branch 'favorites-fixes' into 'develop'
...
fix reply-to tooltip being somewhat unreliable
See merge request pleroma/pleroma-fe!473
2019-01-24 18:05:09 +00:00
Henry Jameson
416424d048
review
2019-01-24 20:27:20 +03:00
Hakaba Hitoyo
efa0c85ac0
Fix who to follow panel shuffling
2019-01-24 15:17:35 +00:00
Henry Jameson
ac64e90898
fix custom nsfwCensorImage not working
2019-01-23 00:15:24 +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
Henry Jameson
8946ff9838
fix errors in console
2019-01-22 23:57:27 +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
92dedcd53e
linting
2019-01-22 20:27:49 +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
lain
0ed1828352
Linting.
2019-01-19 14:56:18 +01:00
lain
741ccfdc4a
Don't use referrerpolicy with media proxy.
2019-01-19 14:45:56 +01:00
Henry Jameson
6c70e9950c
some more post fields
2019-01-17 23:57:24 +03:00
Henry Jameson
80a7035154
removing unnecessary conversions since it should already be converted in normalizer
2019-01-17 23:57:24 +03:00
Henry Jameson
8172eeb1e0
fix indents
2019-01-17 23:05:58 +03:00
Henry Jameson
6e219c2961
add support for tab-switcher to automatically switch to first tab if asked index
...
is invalid
2019-01-17 22:46:41 +03:00
Henry Jameson
93cbb58212
fix login and favorites tab...
2019-01-17 22:11:51 +03:00
Henry Jameson
cab87744c8
Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"
...
and some stuff to make favorites still work
This reverts commit 039a407400
.
2019-01-17 21:46:03 +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
shpuld
e1c3691a72
Add escape button support
2019-01-16 17:27:23 +02:00
Hakaba Hitoyo
05ead45fb7
Show who to follow in the mobile view
2019-01-16 02:33:08 +00:00
lambda
502a76be0a
Merge branch 'summary-html' into 'develop'
...
Sync with backend: Use summary_html.
See merge request pleroma/pleroma-fe!463
2019-01-15 20:16:11 +00:00
shpuld
17735943d5
Add media viewer module and media module component, modify attachment behavior
2019-01-14 19:23:13 +02:00
Henry Jameson
f9fb85ee42
Merge remote-tracking branch 'upstream/develop' into favorites
...
* upstream/develop:
Add Korean translation
Change emptlyTl to take userId
better fix
fixes #265 and also that thin line below gradient on chrome (UGH)
fix #262 part of user profiles not being able to load previous posts
Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson
519f49e29b
separated normalization into a another file, removed catchall and added more stuff
2019-01-13 22:14:55 +03:00
scarlett
de8dfef252
Remove reply detection hack
2019-01-13 13:41:02 +00:00
scarlett
0fd7e7eb68
Sync with backend: Use summary_html.
2019-01-13 13:38:00 +00:00
Henry Jameson
039a407400
some initial work to make it possible to use "unregistered" timelines, i.e. not
...
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03: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 Shpludson
a51167fa72
Merge branch 'fix-265-fix-user-profiles-again' into 'develop'
...
fixes #265 and also that thin line below gradient on chrome (UGH)
Closes #265
See merge request pleroma/pleroma-fe!456
2019-01-09 20:57:00 +00:00
Henry Jameson
f4b499b044
better fix
2019-01-09 16:31:53 +03:00
Henry Jameson
d13f36a2ad
fixes #265 and also that thin line below gradient on chrome (UGH)
2019-01-09 15:36:09 +03:00
Henry Jameson
0b8f616af1
fix #262 part of user profiles not being able to load previous posts
2019-01-09 14:18:36 +03:00
Hakaba Hitoyo
a60fc390a0
Add instance information page for mobile
2019-01-07 17:26:47 +00:00
Hakaba Hitoyo
702f013225
[Debug] Avoid duplicates in the who to follow panel
2019-01-04 08:43:00 +00:00
rinpatch
c25cf29533
Fix translation typo in registration.vue
2019-01-03 19:42:43 +01:00
Shpuld Shpludson
76cfb15b3c
Merge branch 'feature/replace-panel-switcher' into 'develop'
...
Mobile side drawer
See merge request pleroma/pleroma-fe!443
2018-12-31 17:35:31 +00:00
Shpuld Shpludson
fb8f774383
Fix profiles without statuses not loading
2018-12-31 01:57:22 +00:00
shpuld
354fd32e7b
Fix conflicting styles
2018-12-30 22:41:31 +02:00
shpuld
16c7bd0199
merge develop, fix conflicts, fix logged out bug
2018-12-29 16:25:45 +02: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
shpuld
747e4090ca
Cleanup and remove divider element in side drawer
2018-12-29 12:44:21 +02:00
shpuld
650655709d
fix conflict in user card content
2018-12-28 21:44:09 +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
HJ
fa8ecb1c39
User Card Content fixes and updates
2018-12-26 09:19:25 +00:00
Lambda
24eba26c5b
Restore old routes, enable user route as fallback.
2018-12-25 18:43:52 +01:00
HJ
a80c8fd24c
Merge branch 'refactor-recommendations' into 'develop'
...
remove unneeded numbered variables who_to_follow
See merge request pleroma/pleroma-fe!436
2018-12-25 02:35:30 +00:00
Hannah Ward
ed2393c970
fix inconsistencies within who_to_follow_panel
2018-12-25 01:32:20 +00:00
HJ
698328dfbe
Merge branch 'fix_textfields' into 'develop'
...
Fix textarea not resizing correctly and probably cursor position
Closes #230
See merge request pleroma/pleroma-fe!430
2018-12-25 01:29:18 +00:00
Henry Jameson
18d7684f32
fix for non-shrinking main post form
2018-12-25 04:25:19 +03:00
Hannah Ward
6fa993c122
remove unneeded numbered variables who_to_follow
2018-12-25 00:34:33 +00:00
shpuld
4752081818
Add closed-check for touchmove
2018-12-23 20:14:40 +02:00
shpuld
e46b560ead
move closing logic to drawer, add swipe to close
2018-12-23 19:50:19 +02:00
shpuld
f72b1d048e
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74
Add some more routes to side drawer
2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528
Add a translation to the captcha strings in the registration form
2018-12-21 15:12:46 +03:00
Ekaterina Vaartis
661efc51b7
Small UI improvements for the CAPTCHA field
2018-12-21 00:25:36 +03:00
Ekaterina Vaartis
8470856045
Add encrypted captcha_answer_data for stateless captcha
2018-12-21 00:25:09 +03:00
shpuld
67263cde05
works but hacky
2018-12-20 22:20:04 +02:00
Henry Jameson
b7962a224c
fixes many problems related to user profile
2018-12-20 07:54:55 +03:00
Henry Jameson
5970bf4e85
fixed incorrect height when empty text
2018-12-20 07:27:29 +03:00
Henry Jameson
afa2baec0c
I suppose SOME browsers don't do this by default...
2018-12-20 07:17:54 +03:00
Henry Jameson
ae7b96abbf
Fix resize not working properly for textareas
2018-12-20 07:17:54 +03:00
HJ
b65ac128c1
Merge branch 'remove_favorite_hacks' into 'develop'
...
no more "broken favorite"
Closes #218 and #145
See merge request pleroma/pleroma-fe!431
2018-12-19 14:57:25 +00:00
Shpuld Shpludson
c54b1fd0c5
Merge branch 'fix_defaults' into 'develop'
...
Fixed some settings not using defaults from instance config.
Closes #228
See merge request pleroma/pleroma-fe!429
2018-12-19 04:51:21 +00:00
Henry Jameson
5c2030e467
no more "broken favorite"
2018-12-19 01:55:53 +03:00
Henry Jameson
c7514be46f
Fixed some settings not using defaults from instance config. Made some parts of
...
code more readable
2018-12-18 23:31:10 +03:00
shpuld
640a287892
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-18 22:09:27 +02:00
Henry Jameson
81c83566cd
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
...
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
2018-12-18 22:43:26 +03:00
Shpuld Shpludson
67c2a607aa
Feature/bigger icons for mobile / #211
2018-12-18 18:26:14 +00:00
lambda
2f28bf95fd
Merge branch 'feature/new-user-routes' into 'develop'
...
Make domain.com/username routes work
Closes pleroma#395
See merge request pleroma/pleroma-fe!392
2018-12-18 15:26:00 +00:00
Henry Jameson
485a531d57
clean up the unused stuff
2018-12-17 21:02:16 +03:00
Henry Jameson
be27494ca1
Make user profile page cleaner
2018-12-17 20:42:14 +03:00
Henry Jameson
56fdbf18c5
missing string and unification with counters (order)
2018-12-17 19:21:05 +03:00
Henry Jameson
bf805361d0
collateral fix for tab display
2018-12-17 19:18:57 +03:00
Henry Jameson
292ac59d08
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
...
* upstream/develop:
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
Support disabling captcha
Base support for CAPTCHA (kocaptcha)
2018-12-17 19:18:35 +03:00
Henry Jameson
23d434c40c
collateral fixes for user-card: use still-image, styles for custom emoji
2018-12-17 19:17:03 +03:00
Henry Jameson
8f255fbad4
Refactor follower/friends out of statuses/timeline into user_profile where it
...
belongs. Changed display of profile to single panel with tabs.
2018-12-17 19:14:38 +03:00
Shpuld Shpludson
b124dbf44e
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma-fe!424
2018-12-17 13:36:56 +00:00
Maxim Filippov
ea6977cd4d
Move userProfile link to methods
2018-12-17 02:52:27 +03:00
Maxim Filippov
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
Ekaterina Vaartis
d2984b9bc5
Fix style
2018-12-16 22:55:11 +03:00
Ekaterina Vaartis
ab6f1904fa
Add a way to get new captcha on click
2018-12-16 22:47:52 +03:00
Ekaterina Vaartis
3c9c8052f7
Fix style
2018-12-16 20:55:09 +03:00
Ekaterina Vaartis
a525df32c9
Separate captcha into the backendInteractor
2018-12-16 20:53:41 +03:00
Henry Jameson
1b9a5a3efe
more visual fixes
2018-12-16 02:40:32 +03:00
Henry Jameson
a1d00b9398
changed bottom-shadow hiding method to be more compatible with overflow
2018-12-16 02:07:32 +03:00
Henry Jameson
fc7cd6eaf6
small fix for overflowing tab-switcher
2018-12-16 02:02:49 +03:00
shpuld
bd2ed617a7
Remove panel switcher, add rudimentary drawer
2018-12-15 19:13:01 +02:00
Maxim Filippov
828b1c78f9
Implement user_profile.spec.js
2018-12-15 06:16:44 +03:00
HJ
eaf065c751
Merge branch 'fix-name' into 'develop'
...
Fix impossible to change name
See merge request pleroma/pleroma-fe!425
2018-12-15 00:38:47 +00:00
Henry Jameson
7d3385f349
fix
2018-12-15 03:30:39 +03:00
Ekaterina Vaartis
92de235f4e
Support disabling captcha
2018-12-15 03:06:21 +03:00
Ekaterina Vaartis
9303bd5d36
Base support for CAPTCHA (kocaptcha)
2018-12-15 03:05:47 +03:00
Shpuld Shpludson
4b30ce64c9
Merge branch 'async_follow' into 'develop'
...
Better "follow" button behavior
Closes #133
See merge request pleroma/pleroma-fe!396
2018-12-14 17:33:11 +00:00
HJ
10a0296aac
Merge branch 'fix-hide-network' into 'develop'
...
oof
See merge request pleroma/pleroma-fe!422
2018-12-14 14:51:59 +00:00
Henry Jameson
7346c54df4
oof
2018-12-14 17:47:48 +03:00
Henry Jameson
13fbef4550
slightly changed the code to have less mutations, added comments
2018-12-14 17:33:48 +03:00
HJ
70ff9ce2b5
Merge branch 'fix-preload-nsfw' into 'develop'
...
Fix preload images option being always disabled
See merge request pleroma/pleroma-fe!421
2018-12-14 14:25:16 +00:00
Henry Jameson
d7973b0b80
Merge remote-tracking branch 'upstream/develop' into async_follow
...
* upstream/develop: (45 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
Refactor arrays to individual options
Reset enableFollowsExport to true after 2 sec when an export file is available to download
Write a unit test for fileSizeFormatService
add checkbox to disable web push
I am dumb
Handle errors from server
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
...
2018-12-14 17:17:58 +03:00
Henry Jameson
b4b819f4f4
more damage control
2018-12-14 17:14:55 +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
HJ
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
...
[pleroma#36] Add errors when file uploading fails
See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
ValD
e2f825266a
added condition to check for logined user
2018-12-13 23:20:59 +05:30
Henry Jameson
cc259411a7
fix gradients and minor artifacts
2018-12-13 20:41:23 +03:00
Maxim Filippov
e4a34cc4d4
Use 'userProfileLink' to generate user-profile link
2018-12-13 19:57:11 +03:00
Shpuld Shpludson
ac60550e07
Merge branch 'mobile-back' into 'develop'
...
Back button for mobile
Closes #197
See merge request pleroma/pleroma-fe!403
2018-12-13 15:12:27 +00:00
Shpuld Shpludson
915487072b
Merge branch 'fix/reset-follows-export' into 'develop'
...
Reset enableFollowsExport when an export file is available to download
See merge request pleroma/pleroma-fe!412
2018-12-13 15:06:50 +00:00
Shpuld Shpludson
aa7cff92aa
Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'
...
make nsfw censor image configurable
See merge request pleroma/pleroma-fe!243
2018-12-13 15:04:55 +00:00
Rinpatch
dd6a9ae645
oof
2018-12-13 17:51:29 +03:00
Shpuld Shpludson
25a88da17a
Merge branch 'fix_loading_flicker' into 'develop'
...
Throttle fetching old statuses to prevent spam, especially during scroll
Closes #176
See merge request pleroma/pleroma-fe!393
2018-12-13 14:51:27 +00:00
Henry Jameson
610724ffcd
Merge remote-tracking branch 'upstream/develop' into mobile-back
...
* upstream/develop: (142 commits)
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.
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
removed counters from left panel
added router-links to all relavent links
added activatePanel onclick for timeago button
added PR comments
add checkbox to disable web push
removed brackets from condition
resolved lint issue
renamed config to preload images and add ident to config
added config for preload and made attachment responsive to it
preload nsfw image
fix
...
2018-12-13 17:50:36 +03:00
rinpatch
457132fb37
get rid of slots
2018-12-13 15:44:37 +01:00
Shpuld Shpludson
c824d25378
Merge branch 'fix_empty_profiles' into 'develop'
...
Improved user profile display
Closes #82
See merge request pleroma/pleroma-fe!414
2018-12-13 14:41:57 +00:00
Shpuld Shpludson
ad905576fc
Merge branch 'hide_network' into 'develop'
...
FE part of pleroma!490
See merge request pleroma/pleroma-fe!415
2018-12-13 14:40:49 +00:00
Rinpatch
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
Henry Jameson
ff36d34186
fix timeago font
2018-12-13 17:20:31 +03:00
Henry Jameson
fa7c3c2097
Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles
...
* upstream/develop: (121 commits)
improve notification subscription
Fix typo that prevented scope copy from working.
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
removed counters from left panel
added router-links to all relavent links
added activatePanel onclick for timeago button
added PR comments
add checkbox to disable web push
removed brackets from condition
resolved lint issue
renamed config to preload images and add ident to config
added config for preload and made attachment responsive to it
preload nsfw image
fix
fixed wrong height for selects
better layouting for import-export, error display fixes
added keep-colors option
...
2018-12-13 17:11:22 +03:00
Henry Jameson
9dfff10717
Merge remote-tracking branch 'upstream/develop' into async_follow
...
* upstream/develop: (131 commits)
Fix typo that prevented scope copy from working.
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
removed counters from left panel
added router-links to all relavent links
added activatePanel onclick for timeago button
added PR comments
removed brackets from condition
resolved lint issue
renamed config to preload images and add ident to config
added config for preload and made attachment responsive to it
preload nsfw image
fix
fixed wrong height for selects
better layouting for import-export, error display fixes
added keep-colors option
separated preview and exported from style_switcher
revert that, it's actually used, i'm an idiot
...
2018-12-13 16:15:47 +03:00
Henry Jameson
c52b8019ae
added hide_network option, fixed properties naming
2018-12-13 16:04:22 +03:00
Henry Jameson
42bb348219
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.
2018-12-13 15:34:51 +03:00
Egor Kislitsyn
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
...
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
2018-12-13 18:22:15 +07:00
HJ
e443716bcd
Merge branch 'fix-scope-copy' into 'develop'
...
Fix typo that prevented scope copy from working.
Closes #214
See merge request pleroma/pleroma-fe!413
2018-12-13 10:39:50 +00:00
Henry Jameson
9f48055261
Fix typo that prevented scope copy from working.
2018-12-13 13:34:47 +03:00
Rinpatch
48edc0c8fc
Refactor arrays to individual options
2018-12-13 11:25:03 +03:00
Maxim Filippov
24caa2cfcd
Add generateProfileLink
2018-12-13 05:00:01 +03:00
link0ff
33c2d21bb7
Reset enableFollowsExport to true after 2 sec when an export file is available to download
2018-12-12 22:00:04 +02:00
HJ
2077927ff3
Merge branch 'dev_vald_fe/user_name_panel' into 'develop'
...
activate panel on user screen click
See merge request pleroma/pleroma-fe!408
2018-12-12 19:31:15 +00:00
ValD
ce6d75331b
added check for activatePanel is function or not
2018-12-13 00:56:04 +05:30
HJ
7325ff2e7a
Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'
...
preload nsfw image
Closes #193
See merge request pleroma/pleroma-fe!411
2018-12-12 19:01:53 +00:00
HJ
f0fb6e6015
Merge branch 'dev_vald_fe/timeago_panel' into 'develop'
...
added activatePanel onclick for timeago button
See merge request pleroma/pleroma-fe!407
2018-12-12 18:47:56 +00:00
ValD
481c5ecba8
addressed PR comments
2018-12-13 00:14:47 +05:30
ValD
e3848f6efb
activate panel on user screen click
2018-12-13 00:13:47 +05:30
ValD
b271957b4c
added not preload check so hidden toggles asap
2018-12-13 00:11:01 +05:30
ValD
33b962b13e
removed counters from left panel
2018-12-12 23:56:12 +05:30
ValD
7556efa04f
added router-links to all relavent links
2018-12-12 23:34:22 +05:30
ValD
1623dcb417
added activatePanel onclick for timeago button
2018-12-12 23:34:22 +05:30
ValD
7c6c2cfb22
added PR comments
2018-12-12 23:29:13 +05:30
Egor Kislitsyn
02c0e15781
add checkbox to disable web push
2018-12-13 00:03:50 +07:00
Rinpatch
9c24ac1d05
I am dumb
2018-12-12 20:01:37 +03:00
Rinpatch
5ca2e75df3
Handle errors from server
2018-12-12 19:31:16 +03:00
ValD
6d3bd95bfe
removed brackets from condition
2018-12-12 15:07:07 +00:00
Rinpatch
bf8bb9ce13
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
2018-12-12 16:38:01 +03:00
ValD
de5d846ebd
resolved lint issue
2018-12-12 03:44:45 +05:30
ValD
139659d42c
renamed config to preload images and add ident to config
2018-12-12 03:42:29 +05:30
ValD
7b4e08dd93
added config for preload and made attachment responsive to it
2018-12-12 03:33:53 +05:30
ValD
b195ce12e1
preload nsfw image
2018-12-12 02:28:36 +05:30
Henry Jameson
83b85cd412
better layouting for import-export, error display fixes
2018-12-11 16:36:27 +03:00
Henry Jameson
c189a08dff
added keep-colors option
2018-12-11 16:36:06 +03:00
Rinpatch
25a04f2294
Avatar, background, banner filesize errors
2018-12-11 16:02:35 +03:00
Henry Jameson
51dccb7887
separated preview and exported from style_switcher
2018-12-11 02:46:17 +03:00
Henry Jameson
73aa9153d9
cleanup
2018-12-11 01:40:19 +03:00
Henry Jameson
fe2fe09236
fixed v2 setting as default theme
2018-12-11 01:38:20 +03:00
Henry Jameson
3452864260
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix color fallback order
Use console.warn instead of console.log
Get rid of mutation_types file, use inline approach. Minor fixes
Add fallback color rule.
Change english validation error messages
Clean up the code
Validate name presence on client-side as well
Better styling for client-side validation. Add I18n for validation errors.
Fix broken ToS link. Fix linter errors
Add client validation for registration form
Use Array.reduce instead of lodash.reduce
Humanize validation errors returned on registration
Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector
fix
2018-12-11 01:01:16 +03:00
Henry Jameson
aeecd2b09b
separate font control js
2018-12-11 00:56:15 +03:00