aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into feature/theming2Henry Jameson2018-11-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (60 commits) whoops whoops 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 remove deploy stage remove deploy stage updated and completed German translation On logout switch to public timeline. minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Put oauth text into description. Display OAuth login on login form button. ...
| * Merge branch 'feature/scope_preferences' into 'develop'Henry2018-11-26
| |\ | | | | | | | | | | | | | | | | | | Make visibility copying and subject copying configurable Closes #135 See merge request pleroma/pleroma-fe!353
| | * whoopsHenry Jameson2018-11-26
| | |
| | * whoopsHenry Jameson2018-11-26
| | |
| | * Merge remote-tracking branch 'upstream/develop' into feature/scope_preferencesHenry Jameson2018-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'Henry2018-11-25
| |\ \ | | | | | | | | | | | | | | | | Update Japanese translation See merge request pleroma/pleroma-fe!378
| | * | update-japanese-translationHakaba Hitoyo2018-11-15
| | | |
| * | | Merge branch 'fix/dm-timeline-streaming' into 'develop'lambda2018-11-25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DM timeline: stream new statuses Closes #170 See merge request pleroma/pleroma-fe!379
| | * | | DM timeline: stream new statuseseal2018-11-25
| |/ / /
| * | | Merge branch 'feature/user-search' into 'develop'lambda2018-11-16
| |\ \ \ | | |/ / | |/| | | | | | | | | | Add actual user search. See merge request pleroma/pleroma-fe!376
| | * | Add actual user search.Roger Braun2018-11-14
| |/ /
| * | Merge branch 'french-translation' into 'develop'kaniini2018-11-14
| |\ \ | | | | | | | | | | | | | | | | French translation update See merge request pleroma/pleroma-fe!375
| | * | incorporate most translation changes from MR 368William Pitcock2018-11-14
| | | |
| | * | update french translationWilliam Pitcock2018-11-14
| |/ /
| * | Merge branch 'dm-tab' into 'develop'lambda2018-11-14
| |\ \ | | | | | | | | | | | | | | | | Direct Message tab See merge request pleroma/pleroma-fe!374
| | * | Always show dm panel.Roger Braun2018-11-13
| | | |
| | * | Add direct message tab.Roger Braun2018-11-13
| | | |
| | * | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tabRoger Braun2018-11-13
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'oauth' into 'develop'lambda2018-11-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Move login to oauth. See merge request pleroma/pleroma-fe!367
| | * \ \ Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauthRoger Braun2018-11-10
| | |\ \ \
| | * | | | On logout switch to public timeline.Roger Braun2018-11-10
| | | | | |
| | * | | | Put oauth text into description.Roger Braun2018-11-08
| | | | | |
| | * | | | Display OAuth login on login form button.Roger Braun2018-11-08
| | | | | |
| | * | | | Add login form back in.Roger Braun2018-11-07
| | | | | |
| | * | | | Linting.Roger Braun2018-11-06
| | | | | |
| | * | | | Re-activate registration, use oauth password flow to fetch token.Roger Braun2018-11-06
| | | | | |
| | * | | | Fix typo.Roger Braun2018-11-06
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/develop' into oauthRoger Braun2018-10-26
| | |\ \ \ \
| | * | | | | Remove gonsole.logg :DDRoger Braun2018-10-26
| | | | | | |
| | * | | | | Fix linting.Roger Braun2018-10-26
| | | | | | |
| | * | | | | Move login to oauth.Roger Braun2018-10-26
| | | | | | |
| | | | | * | api service urlRoger Braun2018-11-13
| | |_|_|/ / | |/| | | |
| | | | | * Merge remote-tracking branch 'upstream/develop' into feature/scope_preferencesHenry Jameson2018-11-26
| | | | | |\ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (36 commits) remove deploy stage remove deploy stage updated and completed German translation minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Count spoiler text in the character count. Fixes #135. Added Irish (Gaeilge) Language Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan. simplify code adapt to destructive change of api Adds Occitan locale Updated italian translation Update oc.json Update oc.json Update of the oc.json file Actualizacion del fichièr oc.json Sort messages object by language code so that it's easier from the UI to browse them. explicitly set collapseMessageWithSubject to undefined Fall back to instance settings consistently ...
| * | | | | remove deploy stageRoger Braun2018-11-13
| | | | | |
| * | | | | remove deploy stageRoger Braun2018-11-13
| | | | | |
| * | | | | Merge branch 'patch-1' into 'develop'lambda2018-11-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [i18] Correction Occitan file See merge request pleroma/pleroma-fe!369
| | * | | | | Copy-Paste too fast from the Catalan file apparently.Exilat2018-10-28
| | | |/ / / | | |/| | | | | | | | | Now it's in good Occitan.
| * | | | | Merge branch 'i18n/irish' into 'develop'lambda2018-11-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Irish (Gaeilge) Language See merge request pleroma/pleroma-fe!370
| | * | | | | Added Irish (Gaeilge) Languagedgold2018-11-02
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | All translations checked with tearma.ie & acmhainn.ie for language use and technical accuracy.
| * | | | | Merge branch 'develop' into 'develop'lambda2018-11-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated and completed German translation See merge request pleroma/pleroma-fe!373
| | * | | | | updated and completed German translationVinzenz Vietzke2018-11-12
| |/ / / / /
| * | | | | Merge branch 'develop' into 'develop'lambda2018-11-10
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Added Chinese Language See merge request pleroma/pleroma-fe!372
| | * | | | minor modification of Chinese translationStarmancer2018-11-09
| | | | | |
| | * | | | update Chinese translationStarmancer2018-11-09
| | | | | |
| | * | | | Add Chinese languageNebula2018-11-09
| |/ / / /
| * | | | Fix posting.Roger Braun2018-11-08
| | | | |
| * | | | Merge branch '153-count-cw' into 'develop'lambda2018-11-07
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "PleromaFE does not count the Content Warning into Post length" Closes #153 and #135 See merge request pleroma/pleroma-fe!371
| | * | | Count spoiler text in the character count. Fixes #135.Roger Braun2018-11-07
| |/ / /
| * | | Merge branch 'fix-features-panel' into 'develop'Henry2018-10-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix Features panel See merge request pleroma/pleroma-fe!366
| | * | | simplify codehakabahitoyo2018-10-26
| | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-30 02:37:25 +0000