| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'dev_vald_fe/be' into 'develop' | Henry | 2018-12-03 |
| |\ | | | | | | | | | added tooltip See merge request pleroma/pleroma-fe!391 | ||
| | * | addressed PR comments | ValD | 2018-12-04 |
| | | | |||
| | * | added tooltip | ValD | 2018-12-04 |
| |/ | |||
| * | Merge branch 'fix-vimium' into 'develop' | lambda | 2018-12-03 |
| |\ | | | | | | | | | | | | | fixes vimium not giving retweet button a hint Closes #166 See merge request pleroma/pleroma-fe!385 | ||
| | * | fixes vimium not giving retweet button a hint | Henry Jameson | 2018-12-02 |
| | | | |||
| * | | Merge branch 'subject-line-entry-auto' into 'develop' | lambda | 2018-12-03 |
| |\ \ | | | | | | | | | | | | | | | | | | | Added option to auto-hide subject field when it's empty. Closes #174 See merge request pleroma/pleroma-fe!388 | ||
| | * | | Added option to auto-hide subject field when it's empty. | Henry Jameson | 2018-12-03 |
| | |/ | |||
| * | | Merge branch 'ss-read' into 'develop' | lambda | 2018-12-03 |
| |\ \ | | | | | | | | | | | | | Server-side read marking See merge request pleroma/pleroma-fe!386 | ||
| | * | | removes hacks from notifications storage, adds api call to let server update | Henry Jameson | 2018-12-02 |
| | |/ | | | | | | | is_seen attribute | ||
| * | | Merge branch 'fix-user-profile-glitches' into 'develop' | lambda | 2018-12-03 |
| |\ \ | |/ |/| | | | | | | | | | User timeline improvements Closes #186 and #120 See merge request pleroma/pleroma-fe!390 | ||
| | * | Add userId property to timelines so that we don't overwrite user timeline meant | Henry Jameson | 2018-12-03 |
| |/ | | | | for another user | ||
| * | Merge branch 'file-type-service-fix' into 'develop' | lambda | 2018-12-01 |
| |\ | | | | | | | | | Modify filetype service to accept more generic mimetypes See merge request pleroma/pleroma-fe!381 | ||
| | * | Fix filetype detection | rinpatch | 2018-11-27 |
| | | | |||
| * | | Merge branch 'fix/user-search-profile-link' into 'develop' | lambda | 2018-11-30 |
| |\ \ | | | | | | | | | | | | | Fix user search profile link See merge request pleroma/pleroma-fe!382 | ||
| | * | | Route user to the correct profile URL | Maxim Filippov | 2018-11-28 |
| | | | | |||
| | * | | Typo | Maxim Filippov | 2018-11-28 |
| | |/ | |||
| * | | Merge branch 'logout_on_password_change' into 'develop' | lambda | 2018-11-30 |
| |\ \ | | | | | | | | | | | | | | | | | | | Logout user on password change Closes #185 See merge request pleroma/pleroma-fe!384 | ||
| | * | | Do not use underscore at the beginning of the method | raeno | 2018-11-30 |
| | | | | |||
| | * | | Logout user on password change | raeno | 2018-11-30 |
| | |/ | |||
| * | | Merge branch 'fix/switch-to-timeline-on-mobile' into 'develop' | lambda | 2018-11-30 |
| |\ \ | |/ |/| | | | | | Switch to timeline view on mobile when clicking relevant actions See merge request pleroma/pleroma-fe!383 | ||
| | * | Switch to settings when touching settings | eal | 2018-11-25 |
| | | | |||
| | * | Switch to timeline on nav panel actions | eal | 2018-11-25 |
| | | | |||
| * | | Merge branch 'feature/scope_preferences' into 'develop' | Henry | 2018-11-26 |
| |\ \ | | | | | | | | | | | | | | | | | | | Make visibility copying and subject copying configurable Closes #135 See merge request pleroma/pleroma-fe!353 | ||
| | * | | whoops | Henry Jameson | 2018-11-26 |
| | | | | |||
| | * | | whoops | Henry Jameson | 2018-11-26 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences | Henry Jameson | 2018-11-26 |
| | |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: DM timeline: stream new statuses update-japanese-translation Add actual user search. incorporate most translation changes from MR 368 update french translation Always show dm panel. Add direct message tab. api service url On logout switch to public timeline. Put oauth text into description. Display OAuth login on login form button. Add login form back in. Linting. Re-activate registration, use oauth password flow to fetch token. Fix typo. Remove gonsole.logg :DD Fix linting. Move login to oauth. | ||
| * | | | Merge branch 'update-japanese-translation' into 'develop' | Henry | 2018-11-25 |
| |\ \ \ | | | | | | | | | | | | | | | | | Update Japanese translation See merge request pleroma/pleroma-fe!378 | ||
| | * | | | update-japanese-translation | Hakaba Hitoyo | 2018-11-15 |
| | | | | | |||
| * | | | | Merge branch 'fix/dm-timeline-streaming' into 'develop' | lambda | 2018-11-25 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | DM timeline: stream new statuses Closes #170 See merge request pleroma/pleroma-fe!379 | ||
| | * | | | DM timeline: stream new statuses | eal | 2018-11-25 |
| |/ / / | |||
| * | | | Merge branch 'feature/user-search' into 'develop' | lambda | 2018-11-16 |
| |\ \ \ | |/ / |/| | | | | | | | | Add actual user search. See merge request pleroma/pleroma-fe!376 | ||
| | * | | Add actual user search. | Roger Braun | 2018-11-14 |
| |/ / | |||
| * | | Merge branch 'french-translation' into 'develop' | kaniini | 2018-11-14 |
| |\ \ | | | | | | | | | | | | | French translation update See merge request pleroma/pleroma-fe!375 | ||
| | * | | incorporate most translation changes from MR 368 | William Pitcock | 2018-11-14 |
| | | | | |||
| | * | | update french translation | William Pitcock | 2018-11-14 |
| |/ / | |||
| * | | Merge branch 'dm-tab' into 'develop' | lambda | 2018-11-14 |
| |\ \ | | | | | | | | | | | | | Direct Message tab See merge request pleroma/pleroma-fe!374 | ||
| | * | | Always show dm panel. | Roger Braun | 2018-11-13 |
| | | | | |||
| | * | | Add direct message tab. | Roger Braun | 2018-11-13 |
| | | | | |||
| | * | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab | Roger Braun | 2018-11-13 |
| | |\ \ | |/ / |/| | | |||
| * | | | Merge branch 'oauth' into 'develop' | lambda | 2018-11-13 |
| |\ \ \ | | | | | | | | | | | | | | | | | Move login to oauth. See merge request pleroma/pleroma-fe!367 | ||
| | * \ \ | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth | Roger Braun | 2018-11-10 |
| | |\ \ \ | |||
| | * | | | | On logout switch to public timeline. | Roger Braun | 2018-11-10 |
| | | | | | | |||
| | * | | | | Put oauth text into description. | Roger Braun | 2018-11-08 |
| | | | | | | |||
| | * | | | | Display OAuth login on login form button. | Roger Braun | 2018-11-08 |
| | | | | | | |||
| | * | | | | Add login form back in. | Roger Braun | 2018-11-07 |
| | | | | | | |||
| | * | | | | Linting. | Roger Braun | 2018-11-06 |
| | | | | | | |||
| | * | | | | Re-activate registration, use oauth password flow to fetch token. | Roger Braun | 2018-11-06 |
| | | | | | | |||
| | * | | | | Fix typo. | Roger Braun | 2018-11-06 |
| | | | | | | |||
| | * | | | | Merge remote-tracking branch 'origin/develop' into oauth | Roger Braun | 2018-10-26 |
| | |\ \ \ \ | |||
| | * | | | | | Remove gonsole.logg :DD | Roger Braun | 2018-10-26 |
| | | | | | | | |||
