aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* update french translationWilliam Pitcock2018-09-22
|
* Merge branch 'feature/rich-text-optout' into 'develop'kaniini2018-09-22
|\ | | | | | | | | add support for disabling rich text formatting See merge request pleroma/pleroma-fe!347
| * add support for disabling rich text formattingWilliam Pitcock2018-09-22
|/
* Merge branch 'betterStorage' into 'develop'Henry2018-09-21
|\ | | | | | | | | Better storage See merge request pleroma/pleroma-fe!343
| * Merge remote-tracking branch 'upstream/develop' into betterStorageHenry Jameson2018-09-21
| |\ | |/ |/| | | | | | | | | | | | | * upstream/develop: More languages added usage a tool to check what's missing from a language all other languages which do not have MRs related to them separated seems to be working
* | Merge branch 'translations-separation' into 'develop'Henry2018-09-21
|\ \ | | | | | | | | | | | | | | | | | | Separation of translation file into several smaller ones. Closes #142 See merge request pleroma/pleroma-fe!337
| * \ Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-20
| |\ \ | |/ / |/| | | | | | | | | | | | | | * upstream/develop: Update Hebrew translation fixed autocomplete Debug
| * | 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 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 ...
| * | | | added usageHenry Jameson2018-09-06
| | | | |
| * | | | a tool to check what's missing from a languageHenry Jameson2018-09-06
| | | | |
| * | | | all other languages which do not have MRs related to them separatedHenry Jameson2018-09-06
| | | | |
| * | | | seems to be workingHenry Jameson2018-09-06
| | | | |
| | | | * small thing to display instance-provided defaultHenry Jameson2018-09-20
| | | | |
| | | | * console.log cleanupHenry Jameson2018-09-17
| | | | |
| | | | * Fixed "user.id is undefined" or something error more sane by properly handlingHenry Jameson2018-09-17
| | | | | | | | | | | | | | | | | | | | HTTP errors
| | | | * undo rename because it makes less sense now.Henry Jameson2018-09-17
| | | | |
| | | | * proxying nodeinfoHenry Jameson2018-09-17
| | | | |
| | | | * made FE work even without either api or static configHenry Jameson2018-09-17
| | | | |
| | | | * Removed warning. Added support for working without static/config.jsonHenry Jameson2018-09-17
| | | | |
| | | | * more missing stuffHenry Jameson2018-09-17
| | | | |
| | | | * fix some missing stuffHenry Jameson2018-09-17
| | | | |
| | | | * translationsHenry Jameson2018-09-17
| | | | |
| | | | * Added more stuff that's actually being added to instanceConfig, simplified ↵Henry Jameson2018-09-17
| | | | | | | | | | | | | | | | | | | | the whitelist.
| | | | * more refactoringHenry Jameson2018-09-17
| | | | |
| | | | * some recategorization of options...Henry Jameson2018-09-17
| | | | |
| | | | * Initial versionHenry Jameson2018-09-17
| |_|_|/ |/| | |
* | | | 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
| | | |
* | | | 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 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
| | | | | | | |