aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'master'Shpuld Shpludson2019-03-07
|\ | | | | | | | | Update master See merge request pleroma/pleroma-fe!646
| * Merge branch 'fix/fetch-activities-by-last-id' into 'develop'Shpuld Shpludson2019-03-07
| |\ | | | | | | | | | | | | #406 Fetch activities by last id See merge request pleroma/pleroma-fe!621
| | * Fetch activites by last idjasper2019-03-01
| | |
| | * Fetch activites by last idjasper2019-02-27
| | |
| * | Merge branch 'i18n-cs' into 'develop'Shpuld Shpludson2019-03-06
| |\ \ | | | | | | | | | | | | | | | | I18n: Add Czech translation See merge request pleroma/pleroma-fe!627
| | * | I18n: Add Czech translationAditoo172019-03-02
| | | |
| * | | Merge branch 'issue-346-auto-post' into 'develop'Shpuld Shpludson2019-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #346: Hyperlink is not included Closes #346 See merge request pleroma/pleroma-fe!626
| | * | | #346: Hyperlink is not includeddave2019-02-28
| | | | |
| * | | | Merge branch 'emoji-limit' into 'develop'Shpuld Shpludson2019-03-06
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | compatibility with upcoming changes See merge request pleroma/pleroma-fe!643
| | * | | | compatibility with upcoming changesHenry Jameson2019-03-05
| |/ / / /
| * | | | Merge branch 'fix/gallery-and-attachment-spacing' into 'develop'Shpuld Shpludson2019-03-05
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unify spacing between gallery/link preview/attachment components See merge request pleroma/pleroma-fe!638
| | * | | | unify spacing between gallery/link preview/attachment componentsshpuld2019-03-04
| | | | | |
| * | | | | Merge branch '419-avatar-cropper-png' into 'develop'Shpuld Shpludson2019-03-05
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate cropped avatar image in the original file type Closes #419 See merge request pleroma/pleroma-fe!640
| | * | | | | Generate cropped avatar image in the original file typetaehoon2019-03-04
| |/ / / / /
| * | | | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-03-04
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update of the Occitan file. See merge request pleroma/pleroma-fe!635
| | * | | | | Update oc.jsonExilat2019-03-04
| | | | | | |
| | * | | | | Update of the Occitan file.Exilat2019-03-03
| | |/ / / / | | | | | | | | | | | | Not at 100% but more complete then what it was.
| * | | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-03-04
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portuguese translation update See merge request pleroma/pleroma-fe!637
| | * | | | | more pt stringsaaabulafiaaa2019-03-04
| | | | | | |
| | * | | | | more pt stringsaaabulafiaaa2019-03-03
| | | | | | |
| | * | | | | More stringsaaabulafiaaa2019-03-03
| | | | | | |
| | * | | | | Translating more stringsrondnelly assis2019-03-03
| | | | | | |
| * | | | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-03-04
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update and complete the Esperanto translation See merge request pleroma/pleroma-fe!630
| | * | | | | | Update and complete the Esperanto translationTirifto2019-03-02
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'issue-417-profile-tab' into 'develop'Shpuld Shpludson2019-03-04
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 417 profile tab Closes #417 See merge request pleroma/pleroma-fe!634
| | * | | | | #417: reset tab from the outsidedave2019-03-03
| | | | | | |
| | * | | | | #417: refresh tab on user profile onlydave2019-03-03
| | | | | | |
| | * | | | | #417: reset tab status when active user changesdave2019-03-03
| | | | | | |
| * | | | | | Merge branch 'issue-418-notification-timeago' into 'develop'Shpuld Shpludson2019-03-03
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 418 notification timeago Closes #418 See merge request pleroma/pleroma-fe!636
| | * | | | | #418: update timeago margin to align with iconsdave2019-03-03
| | | | | | |
| | * | | | | #418: update notification timeago formatdave2019-03-03
| |/ / / / /
| * | | | | Merge branch 'hotfix-replies' into 'develop'Shpuld Shpludson2019-03-03
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix broken statuses See merge request pleroma/pleroma-fe!632
| | * | | | | fix broken statusesHenry Jameson2019-03-02
| | | | | | |
| * | | | | | Fix bug in repliesshpuld2019-03-03
| |/ / / / /
| * | | | | Merge branch '416-name-font-size' into 'develop'Shpuld Shpludson2019-03-02
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update font-size of username in UserCardContent component Closes #416 See merge request pleroma/pleroma-fe!631
| | * | | | | Update font-size of username in UserCardContent componenttaehoon2019-03-02
| |/ / / / /
| * | | | | Merge branch 'feature/improve-status-header-and-spacing' into 'develop'Shpuld Shpludson2019-03-02
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-do status header a bit, add more consistent spacing to status Closes #264 See merge request pleroma/pleroma-fe!617
| | * | | | | Re-do status header a bit, add more consistent spacing to statusShpuld Shpludson2019-03-02
| |/ / / / /
| * | | | | Merge branch 'fix/fetching-error-by-tag' into 'develop'Shpuld Shpludson2019-03-02
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | #402 Fix fetching error by tag See merge request pleroma/pleroma-fe!622
| | * | | | Fix fetching error by tagjasper2019-03-01
| | | | | |
| | * | | | Fix fetching error by tagjasper2019-02-27
| | | |_|/ | | |/| |
| * | | | Fix JS error when no statuses returnedshpuld2019-03-02
| | |/ / | |/| |
| * | | Merge branch 'issue-388-request-count-broken' into 'develop'Shpuld Shpludson2019-03-01
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #388: get follow request on a real-time basis Closes #388 See merge request pleroma/pleroma-fe!619
| | * | | #388: update naming properlydave2019-02-28
| | | | |
| | * | | #388: remove empty linedave2019-02-27
| | | | |
| | * | | #388: get follow request on a real-time basisdave2019-02-27
| | | | |
| * | | | Merge branch 'issue-410-greyout-checkbox' into 'develop'Shpuld Shpludson2019-02-28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #410: disable checkbox when parent is disabled Closes #410 See merge request pleroma/pleroma-fe!624
| | * | | | #410: disable checkbox when parent is disableddave2019-02-28
| | | |_|/ | | |/| |
| * | | | Merge branch '398-rewrite-follow-list' into 'develop'Shpuld Shpludson2019-02-28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split UserCard into FollowCard/FollowRequestCard and Rewrite FollowList using HOCs Closes #398 See merge request pleroma/pleroma-fe!616
| | * | | | Fix layout overflow issuetaehoon2019-02-28
| | | | | |