sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,395 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

2395 Commits

Author SHA1 Message Date
Shpuld Shpludson 7e9c8c3d21 Merge branch 'develop' into 'master' 
Update master

See merge request pleroma/pleroma-fe!646
 2019-03-07 15:11:11 +00:00
Shpuld Shpludson c44f0a9bde Merge branch 'fix/fetch-activities-by-last-id' into 'develop' 
#406 Fetch activities by last id

See merge request pleroma/pleroma-fe!621
 2019-03-07 05:06:43 +00:00
Shpuld Shpludson 423e1b3b12 Merge branch 'i18n-cs' into 'develop' 
I18n: Add Czech translation

See merge request pleroma/pleroma-fe!627
 2019-03-06 20:23:46 +00:00
Shpuld Shpludson de46ede8fd Merge branch 'issue-346-auto-post' into 'develop' 
#346: Hyperlink is not included

Closes #346

See merge request pleroma/pleroma-fe!626
 2019-03-06 20:22:12 +00:00
Shpuld Shpludson 830f3762ef Merge branch 'emoji-limit' into 'develop' 
compatibility with upcoming changes

See merge request pleroma/pleroma-fe!643
 2019-03-06 05:11:07 +00:00
Henry Jameson 68b2d9ef56 compatibility with upcoming changes 2019-03-05 20:15:18 +02:00
Shpuld Shpludson 216073eb58 Merge branch 'fix/gallery-and-attachment-spacing' into 'develop' 
Unify spacing between gallery/link preview/attachment components

See merge request pleroma/pleroma-fe!638
 2019-03-05 14:40:20 +00:00
Shpuld Shpludson 8cda230fba Merge branch '419-avatar-cropper-png' into 'develop' 
Generate cropped avatar image in the original file type

Closes #419

See merge request pleroma/pleroma-fe!640
 2019-03-05 14:40:08 +00:00
taehoon ff9e55ae42 Generate cropped avatar image in the original file type 2019-03-04 21:22:32 -05:00
Shpuld Shpludson 3e4d465eba Merge branch 'patch-2' into 'develop' 
Update of the Occitan file.

See merge request pleroma/pleroma-fe!635
 2019-03-04 19:27:38 +00:00
Exilat 5a273d528f Update oc.json 2019-03-04 18:53:16 +00:00
Shpuld Shpludson 4ab3e29877 Merge branch 'develop' into 'develop' 
Portuguese translation update

See merge request pleroma/pleroma-fe!637
 2019-03-04 18:21:14 +00:00
shpuld bd0485ad2f unify spacing between gallery/link preview/attachment components 2019-03-04 18:56:47 +02:00
Shpuld Shpludson d6e9ad3b61 Merge branch 'develop' into 'develop' 
Update and complete the Esperanto translation

See merge request pleroma/pleroma-fe!630
 2019-03-04 16:11:17 +00:00
Shpuld Shpludson 893767b780 Merge branch 'issue-417-profile-tab' into 'develop' 
Issue 417 profile tab

Closes #417

See merge request pleroma/pleroma-fe!634
 2019-03-04 16:09:23 +00:00
aaabulafiaaa a2a3bda1f6 more pt strings 2019-03-04 08:36:35 -03:00
aaabulafiaaa 116a51e949 more pt strings 2019-03-03 19:42:02 -03:00
aaabulafiaaa ae1a9a8626 More strings 2019-03-03 19:03:11 -03:00
rondnelly assis 793abed7ed Translating more strings 2019-03-03 21:55:16 +00:00
Shpuld Shpludson 42d36fc98b Merge branch 'issue-418-notification-timeago' into 'develop' 
Issue 418 notification timeago

Closes #418

See merge request pleroma/pleroma-fe!636
 2019-03-03 20:16:51 +00:00
dave 0ea9e4ca14 #418: update timeago margin to align with icons 2019-03-03 14:15:53 -05:00
dave f392668b73 #418: update notification timeago format 2019-03-03 14:11:38 -05:00
Exilat 3e16b5a2e0 Update of the Occitan file. 
Not at 100% but more complete then what it was.
 2019-03-03 19:06:32 +00:00
dave 5a0bb29f02 #417: reset tab from the outside 2019-03-03 13:38:48 -05:00
dave 3d30ad1dda #417: refresh tab on user profile only 2019-03-03 12:53:01 -05:00
dave 10711f9045 #417: reset tab status when active user changes 2019-03-03 12:15:55 -05:00
Shpuld Shpludson 3ed1eb5723 Merge branch 'hotfix-replies' into 'develop' 
fix broken statuses

See merge request pleroma/pleroma-fe!632
 2019-03-03 14:58:05 +00:00
shpuld c1ee7c028b Fix bug in replies 2019-03-03 16:43:41 +02:00
Henry Jameson 6841f516fc fix broken statuses 2019-03-02 20:39:04 +02:00
Shpuld Shpludson cef0306428 Merge branch '416-name-font-size' into 'develop' 
Update font-size of username in UserCardContent component

Closes #416

See merge request pleroma/pleroma-fe!631
 2019-03-02 18:05:29 +00:00
taehoon 94b0321c71 Update font-size of username in UserCardContent component 2019-03-02 12:58:17 -05:00
Aditoo17 93f5f94698 I18n: Add Czech translation 2019-03-02 18:25:49 +01:00
Tirifto a884bbb6a6
Update and complete the Esperanto translation 2019-03-02 17:50:59 +01:00
Shpuld Shpludson 11113dd7c4 Merge branch 'feature/improve-status-header-and-spacing' into 'develop' 
Re-do status header a bit, add more consistent spacing to status

Closes #264

See merge request pleroma/pleroma-fe!617
 2019-03-02 16:35:38 +00:00
Shpuld Shpludson c4f8426349 Re-do status header a bit, add more consistent spacing to status 2019-03-02 16:35:38 +00:00
Shpuld Shpludson 6f903016a4 Merge branch 'fix/fetching-error-by-tag' into 'develop' 
#402 Fix fetching error by tag

See merge request pleroma/pleroma-fe!622
 2019-03-02 15:48:54 +00:00
shpuld 068da3cf9f Fix JS error when no statuses returned 2019-03-02 14:57:41 +02:00
jasper 81e89fed3d Fetch activites by last id 2019-03-01 12:53:24 -08:00
jasper c26f32ed92 Fix fetching error by tag 2019-03-01 10:20:25 -08:00
Shpuld Shpludson 53e104dc32 Merge branch 'issue-388-request-count-broken' into 'develop' 
#388: get follow request on a real-time basis

Closes #388

See merge request pleroma/pleroma-fe!619
 2019-03-01 18:03:30 +00:00
dave bbab1b1dc6 #346: Hyperlink is not included 2019-02-28 21:03:35 -05:00
Shpuld Shpludson bbe4f3e3af Merge branch 'issue-410-greyout-checkbox' into 'develop' 
#410: disable checkbox when parent is disabled

Closes #410

See merge request pleroma/pleroma-fe!624
 2019-02-28 18:02:15 +00:00
Shpuld Shpludson 88c7c8b114 Merge branch '398-rewrite-follow-list' into 'develop' 
Split UserCard into FollowCard/FollowRequestCard and Rewrite FollowList using HOCs

Closes #398

See merge request pleroma/pleroma-fe!616
 2019-02-28 17:53:40 +00:00
dave cccf33d6dd #388: update naming properly 2019-02-28 12:53:37 -05:00
taehoon 36460fd384 Fix layout overflow issue 2019-02-28 12:48:14 -05:00
taehoon a8d11b22e7 Add a class to screen name 2019-02-28 12:41:20 -05:00
taehoon 24e1adf6df Add back accidently removed logic 2019-02-28 12:41:20 -05:00
taehoon 0e86681aba Merge all slots of BasicUserCard into one 2019-02-28 12:41:20 -05:00
taehoon 6e41b4b546 Revert "Minor mobile layout improvement for BasicUserCard" 
This reverts commit 1cd964bffff3ae4d324d0ab99e5c218eae7cd0ca.
 2019-02-28 12:41:20 -05:00
taehoon d5f8e2b1ee Minor mobile layout improvement for BasicUserCard 2019-02-28 12:41:20 -05:00