Commit Graph

2430 Commits

Author SHA1 Message Date
shpuld 5d55fc53ac Merge branch 'develop' into feature/mobile-improvements-2 2019-03-07 21:02:12 +02:00
Shpuld Shpludson 09736691ea Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS

Closes #420

See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00
Shpuld Shpludson 82cd1252b5 Merge branch '415-timeline' into 'develop'
Fix timeline updating bug when scrolled down

Closes #415

See merge request pleroma/pleroma-fe!644
2019-03-07 16:34:43 +00:00
Shpuld Shpludson 09b0f6dd87 Merge branch 'issue-392-other-user-stale-data' into 'develop'
#392: stale data served to new user account

Closes #392

See merge request pleroma/pleroma-fe!625
2019-03-07 16:33:22 +00:00
Shpuld Shpludson e3b3ef156b Merge branch 'fix/remove-posts-immediately-by-blocking-someone' into 'develop'
#330 Remove posts immediately by blocking someone

See merge request pleroma/pleroma-fe!589
2019-03-07 16:07:01 +00:00
Shpuld Shpludson 2baff88e3f Merge branch 'fix/gallery-css' into 'develop'
Fix gallery style - move hide button to top right

Closes #335

See merge request pleroma/pleroma-fe!579
2019-03-07 16:03:32 +00:00
Shpuld Shpludson bf1fa52e5e Merge branch 'fix/post-content-type' into 'develop'
#327: Load post status content type from instance config

Closes #327

See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
shpuld b0d1179df0 Merge branch 'develop' into feature/mobile-improvements-2 2019-03-07 07:07:39 +02: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
Edijs 292cdfb24b Merge content types translations 2019-03-06 20:13:04 -08:00
shpuld 05177a2a03 Merge branch 'develop' into feature/mobile-improvements-2 2019-03-06 22:46:19 +02:00
shpuld 1183ce565f Add hacky osk detection 2019-03-06 22:45:26 +02: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
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
shpuld 0e86cb67bd Merge branch 'develop' into feature/mobile-improvements-2 2019-03-05 16:37:25 +02: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 e0e4e118d0 Merge branch 'feature/mobile-improvements-2' of git.pleroma.social:pleroma/pleroma-fe into feature/mobile-improvements-2 2019-03-04 19:33:11 +02:00
shpuld 716dbb186c review fixes, clarify code 2019-03-04 19:32:12 +02: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