Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2505 commits 59 branches 16 tags 15 MiB
Commit graph

2107 commits

Author SHA1 Message Date
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
b4a5b5203f Minor css improvements of hocs 2019-02-20 13:30:31 -05:00
taehoon
8680046c4e Pass down slots into wrapped components 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
8f608e060c Just save blocks/mutes instead of adding 2019-02-20 13:30:30 -05:00
taehoon
1fd9a1c7c0 Set blockIds and muteIds to the currentUser state only 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
159e84532e Add withSubscription hoc 2019-02-20 13:30:30 -05:00
taehoon
8270274865 Update hocs to pass parent-scope bindings to the wrapped component 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
taehoon
12df967cb6 Add withLoadMore hoc 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
Shpuld Shpludson
40159324b4 Merge branch 'issue-364-register-freeze' into 'develop' 
#364: update ap_id error with username

Closes #364

See merge request pleroma/pleroma-fe!597
 2019-02-19 18:00:39 +00: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
dave
5251ccd708 #364: update ap_id error with username 2019-02-19 09:22:42 -05: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
lambda
a842cadd15 Parameter name changed. 2019-02-16 16:09:14 +00:00
Shpuld Shpludson
2fb768cfd8 Merge branch 'update-japanese-translation' into 'develop' 
update japanese translation

See merge request pleroma/pleroma-fe!586
 2019-02-16 15:45:04 +00: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
a001ffecf0 Add back the existing translation string 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
HJ
4f95371081 Merge branch 'issue-361-preview-background' into 'develop' 
#361 - fix theme preview background

Closes #361

See merge request pleroma/pleroma-fe!588
 2019-02-15 12:29:08 +00:00
dave
8f0e6b5045 #361 - fix theme preview background 2019-02-15 07:20:52 -05: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
Hakaba Hitoyo
0f06cd6af5 update japanese translation 2019-02-15 13:16:34 +09: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
Henry Jameson
f41341b79b fix notifications 2019-02-14 21:43:32 +02: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
6f4fbcffc0 Merge branch 'patch-2' into 'develop' 
Update spanish translate - es.json

See merge request pleroma/pleroma-fe!564
 2019-02-12 15:25:52 +00:00
Shpuld Shpludson
6d8862dc9a Merge branch '300-fixed-background-issue' into 'develop' 
Fix fixed background issue

Closes #300

See merge request pleroma/pleroma-fe!518
 2019-02-12 15:25:18 +00: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
tarteka
2226f80076 Update spanish translate - es.json 2019-02-11 18:29:56 +00: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
b6bac4d06d Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop' 
Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
 2019-02-11 13:34:03 +00: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
3fb531976a Change the async stuff to not render app before theme is loaded 2019-02-09 11:26:35 +02:00
Shpuld Shpludson
d2d06983c9 Merge branch 'patch-2' into 'develop' 
Update spanish translate

See merge request pleroma/pleroma-fe!549
 2019-02-09 07:06:40 +00: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
5b52e020e3 fixing conflicts 2019-02-08 13:20:47 -08:00
jasper
ced29a6482 fixing conflicts 2019-02-08 13:18:50 -08: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
tarteka
b129049fed Update spanish translate 2019-02-08 13:42:02 +00: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
Edijs
c0b833cb85 Added tag extractor method and spec 2019-02-07 14:46:10 -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
bd24c615d1 #315 - revert changes 2019-02-07 09:59:12 -05: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
19870c0b6d Fix issue while fetching timelines for tag page 2019-02-06 19:19:43 -07:00
Edijs
fafe258f2b Typo 2019-02-06 19:19:14 -07:00
Mark Felder
b3823b79b4 Grammar 2019-02-06 22:00:31 +00:00
shpuld
4dbc6a3c56 Fix repeater html not showing properly 2019-02-06 22:17:06 +02:00
Xiaofeng An
e107ed8ddc Merge branch 'develop' into feature/add-an-option-for-a-default-formatting 2019-02-06 14:28:50 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
jasper
fbdb7d3d95 Add german translation for option label 2019-02-06 10:50:21 -08:00
Edijs
a12397cf38 Hashtag opens in same tab 2019-02-06 11:34:21 -07:00
dave
a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05:00
jasper
a57f8bdd68 Add option to hide filtered statuses 2019-02-06 10:18:13 -08:00
Shpuld Shpludson
6cca15bade Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop' 
create a login hint on mobile

Closes #308

See merge request pleroma/pleroma-fe!530
 2019-02-06 18:13:56 +00:00
Xiaofeng An
a40d1eb3a0 remove unnecessary div 2019-02-06 11:53:51 -05: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
Xiaofeng An
f512ee2c3c move login hint into the main content 2019-02-06 05:01:32 -05:00
Xiaofeng An
e4c0bbddd9 Merge branch 'develop' into fix/create-a-login-hint-on-mobile 2019-02-06 04:37:00 -05:00
Shpuld Shpludson
2d333f99e8 Merge branch 'patch-1' into 'develop' 
Update es.json

See merge request pleroma/pleroma-fe!535
 2019-02-06 04:29:30 +00: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
tarteka
37c7d850f1 Update es.json 2019-02-05 22:20:45 +00:00
Edijs
52f5ffa862 Fix avatar link in search result 2019-02-05 15:11:17 -07:00
Xiaofeng An
d2436fb9e5 move hint inside Timeline component 2019-02-05 15:43:56 -05: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
Xiaofeng An
bf642ebab7 fix #308 - hide login hint on desktop 2019-02-05 13:48:12 -05:00
Xiaofeng An
c758d103bd fix #308 - show login hint above timeline when user is not logged in 2019-02-05 13:47:27 -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
dev92341
1ee762cf6e Add option to hide features panel 2019-02-05 04:32:00 -08:00
dev92341
f2c6dd6581 Add option to hide features panel 2019-02-05 03:57:11 -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
taehoon
0483f1d636 Revert a change which can break the theme preview 2019-02-03 20:12:22 -05:00
taehoon
ee694d62eb Fix fixed background issue 2019-02-03 15:32:24 -05: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
HJ
815b9d2391 Merge branch 'fix-max-id-for-notifications' into 'develop' 
Fix incorrect latest_id value in notifications_read request

See merge request pleroma/pleroma-fe!509
 2019-02-02 15:51:06 +00:00
eugenijm
b62d2c76e5 Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications) 2019-02-02 18:40:47 +03:00
eugenijm
0ab2f17991 Explicitly cast notification ids to integers when using them for setting maxId 
This fixes the bug where BE receives incorrect `since_id` when marking
notifications as read.
 2019-02-02 17:04:09 +03: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
b1facdf7ad Merge branch 'fix/timeline-too-eager-flush' into 'develop' 
Fix #290 Add a better check for fresh TL flushing

Closes #290

See merge request pleroma/pleroma-fe!494
 2019-01-30 17:51:12 +00: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
7666d50d8a Change panel-footing style to be more fitting 2019-01-29 21:11:00 +02: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
89bfc41174 Add a better check for fresh TL flushing 2019-01-29 18:40:49 +02:00