Commit graph

2542 commits

Author SHA1 Message Date
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
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
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
f3f9fbe302 #392: clean up notification stopping section 2019-03-01 11:59:50 -05:00
dave
bbab1b1dc6 #346: Hyperlink is not included 2019-02-28 21:03:35 -05:00
dave
bbe1821be7 #392: update object.entries 2019-02-28 14:44:43 -05:00
dave
f5adb62e2e #392: update defaultState into a function 2019-02-28 14:27:47 -05:00
dave
ba2e05bc63 #392: stale data served to new user account 2019-02-28 14:03:44 -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
taehoon
651c97153b Use native filter function 2019-02-28 12:41:20 -05:00