aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-20
|\ | | | | | | | | | | | | * upstream/develop: Update Hebrew translation fixed autocomplete Debug
| * Merge branch 'fixAutocomplete' into 'develop'kaniini2018-09-13
| |\ | | | | | | | | | | | | Fixes broken autocomplete for users See merge request pleroma/pleroma-fe!344
| | * fixed autocompleteHenry Jameson2018-09-12
| | |
| * | Merge branch 'patch-1' into 'develop'Henry2018-09-12
| |\ \ | | | | | | | | | | | | | | | | Update Hebrew translation See merge request pleroma/pleroma-fe!345
| | * | Update Hebrew translationArtik Banana2018-09-12
| |/ /
| * | Merge branch 'debug-who-to-follow-panel' into 'develop'Henry2018-09-12
| |\ \ | | |/ | |/| | | | | | | Small debug for Who to follow panel See merge request pleroma/pleroma-fe!342
| | * DebugHakaba Hitoyo2018-09-09
| | |
* | | More languagesHenry Jameson2018-09-09
| | |
* | | Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: fix lint Revert "Revert "Update messages.js"" i18n/messages.js: changed Folgende back to Follower updated german translation updated german translation cleaning up some translations that broke the building fix trailing comma Update and fix messages.js (pt, eo)
| * | Merge branch 'feature/update-de-translation' into 'develop'Henry2018-09-09
| |\ \ | | |/ | |/| | | | | | | updated german translation See merge request pleroma/pleroma-fe!293
| | * i18n/messages.js: changed Folgende back to FollowerSebastian Huebner2018-08-15
| | |
| | * Merge branch 'feature/update-de-translation' of ↵Sebastian Huebner2018-08-15
| | |\ | | | | | | | | | | | | git.pleroma.social:pleroma/pleroma-fe into feature/update-de-translation
| | | * updated german translationSebastian Huebner2018-07-30
| | | |
| | * | updated german translationSebastian Huebner2018-08-15
| | | |
| * | | Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop'Henry2018-09-09
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update and fix messages.js (pt, eo) See merge request pleroma/pleroma-fe!341
| | * | | fix lintHenry Jameson2018-09-09
| | | | |
| | * | | Merge branch 'develop' into 'patch-1'lambda2018-06-08
| | |\ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # src/i18n/messages.js
| | * | | | cleaning up some translations that broke the buildingpizzaiolo2018-05-17
| | | | | |
| | * | | | fix trailing commapizzaiolo2018-05-16
| | | | | |
| | * | | | Update and fix messages.js (pt, eo)pizzaiolo2018-05-06
| | | | | |
| * | | | | Merge branch 'develop' into 'develop'Henry2018-09-09
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Occitan language - Fixed Linting See merge request pleroma/pleroma-fe!339
| | * | | | | Revert "Revert "Update messages.js""Artik Banana2018-09-07
| | | | | | | | | | | | | | | | | | | | | This reverts commit 385484566aa8a524ead77b3841be9af301bf0e5d
* | | | | | | Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (21 commits) use prime number step for Who to follow panel fix Revert "Update messages.js" Update messages.js Update the Occitan language - Fixed Linting remove formatting options Remove outdated settings features panel i18n features panes supports chat & gopher fix collapse link being too small small fix for non-square gif avatars Fixed collapseMessageWithSubjectLocal always using instance-provided config. Fix last place with usercard having wrong width Fixed non-masked image looking weird in chrome. Kinda went back to using align-items: stretch. Fixed error message floating. Simplified image sensitivity label show features panel only if not login update debug update debug ...
| * | | | | | Merge branch 'post-polish-fixes' into 'develop'kaniini2018-09-09
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post polish fixes See merge request pleroma/pleroma-fe!333
| | * | | | | | fixHenry Jameson2018-09-08
| | | | | | | |
| | * | | | | | fix collapse link being too smallHenry Jameson2018-09-03
| | | | | | | |
| | * | | | | | small fix for non-square gif avatarsHenry Jameson2018-09-03
| | | | | | | |
| | * | | | | | Fixed collapseMessageWithSubjectLocal always using instance-provided config.Henry Jameson2018-09-03
| | | | | | | |
| | * | | | | | Fix last place with usercard having wrong widthHenry Jameson2018-09-03
| | | | | | | |
| | * | | | | | Fixed non-masked image looking weird in chrome.Henry Jameson2018-09-03
| | | | | | | |
| | * | | | | | Kinda went back to using align-items: stretch. Fixed error message floating.Henry Jameson2018-09-03
| | | | | | | |
| * | | | | | | Merge branch 'remove-outdated-settings' into 'develop'kaniini2018-09-09
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated settings See merge request pleroma/pleroma-fe!335
| | * | | | | | | Remove outdated settingshakabahitoyo2018-09-04
| | | | | | | | |
| * | | | | | | | Merge branch 'simplify-sensitivity-label' into 'develop'kaniini2018-09-09
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified image sensitivity label See merge request pleroma/pleroma-fe!334
| | * | | | | | | | Simplified image sensitivity labelHenry Jameson2018-09-03
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'prime-number-step-for-who-to-follow-panel' into 'develop'kaniini2018-09-09
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Prime number step for Who to follow panel See merge request pleroma/pleroma-fe!340
| | * | | | | | | use prime number step for Who to follow panelHakaba Hitoyo2018-09-09
| |/ / / / / / /
| * | | | | | | Merge branch 'feature/features-panel' into 'develop'Henry2018-09-07
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features panel See merge request pleroma/pleroma-fe!331
| | * | | | | | | remove formatting optionshakabahitoyo2018-09-04
| | | | | | | | |
| | * | | | | | | features panel i18nHakaba Hitoyo2018-09-04
| | | | | | | | |
| | * | | | | | | features panes supports chat & gopherHakaba Hitoyo2018-09-04
| | | | | | | | |
| | * | | | | | | show features panel only if not loginhakabahitoyo2018-09-03
| | | | | | | | |
| | * | | | | | | updatehakabahitoyo2018-09-03
| | | | | | | | |
| | * | | | | | | debugHakaba Hitoyo2018-09-03
| | | | | | | | |
| | * | | | | | | updateHakaba Hitoyo2018-09-03
| | | | | | | | |
| | * | | | | | | debughakabahitoyo2018-09-03
| | | | | | | | |
| | * | | | | | | mock features panelHakaba Hitoyo2018-09-03
| | |/ / / / / /
| * | | | | | | Revert "Update messages.js"Henry2018-09-07
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e1f0d941621d32657cdc2727b62f5a36443d25b
| * | | | | | | Update messages.jsArtik Banana2018-09-07
| | |/ / / / / | |/| | | | | | | | | | | | Update the Occitan language - Fixed Linting
* | | | | | | added usageHenry Jameson2018-09-06
| | | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-10 22:45:47 +0000