hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7,321 commits 5 branches 0 tags 57 MiB
Commit graph

7,321 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
taehoon
aca3b37134 Use a cross browser safe solution to get scroll top 2019-03-06 12:10:29 -05: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
taehoon
5f51fe897d Revert modifier class notation 2019-03-05 21:52:04 -05:00
taehoon
37acb51df4 Update classname 2019-03-05 21:48:07 -05:00
taehoon
7cb13df8ad Update tests 2019-03-05 14:13:22 -05:00
taehoon
7bceabb5bd Rename UserCardContent to UserCard 2019-03-05 14:01:49 -05:00
taehoon
baf603a506 Update block class name of BasicUserCard component 2019-03-05 13:56:40 -05:00
taehoon
43c52cb950 Update modifier class notation 2019-03-05 13:25:31 -05:00
Henry Jameson
68b2d9ef56 compatibility with upcoming changes 2019-03-05 20:15:18 +02:00
taehoon
e0a66b989d Re-do UserCardContent css 2019-03-05 10:46:03 -05: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
Edijs
f91e4a5801 Load post status content type from instance config 2019-03-04 21:29:56 -08: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
shpuld
c7e180080a more work with notifications drawer 2019-03-03 16:33:40 +02:00
Henry Jameson
749c44c6ff Merge branch 'minimal-scopes-mode' into shigusegubu 
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
 2019-03-03 15:45:45 +02:00
Henry Jameson
6184c88ac7 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:45:17 +02: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
Henry Jameson
0db97e7947 Merge branch 'minimal-scopes-mode' into shigusegubu 
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
 2019-03-03 15:28:50 +02:00
Henry Jameson
e1f55b60d3 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:28:27 +02:00
Henry Jameson
3e231de61b Merge branch 'minimal-scopes-mode' into shigusegubu 
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
 2019-03-03 15:25:31 +02:00
Henry Jameson
98fed1a9c1 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:22:44 +02:00
Henry Jameson
8710b630b8 Merge branch 'hotfix-replies' into shigusegubu 
* hotfix-replies:
  fix broken statuses
 2019-03-02 20:43:14 +02:00
Henry Jameson
6841f516fc fix broken statuses 2019-03-02 20:39:04 +02:00
Henry Jameson
a129ef2e07 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop: (88 commits)
  Update font-size of username in UserCardContent component
  Re-do status header a bit, add more consistent spacing to status
  Fix JS error when no statuses returned
  Fix fetching error by tag
  #388: update naming properly
  Fix layout overflow issue
  Add a class to screen name
  Add back accidently removed logic
  Merge all slots of BasicUserCard into one
  Revert "Minor mobile layout improvement for BasicUserCard"
  Minor mobile layout improvement for BasicUserCard
  Use native filter function
  Shorten a classname
  Improve mobile layout of user card
  Update naming
  Add back some css
  Remove legacy class names in BasicUserCard
  Remove UserCard
  Migrate UserCard to FollowCard and FollowRequestCard
  Add FollowRequestCard component
  ...
 2019-03-02 20:28:10 +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