aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |
| * | 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
* | Merge branch 'patch-1' into 'develop'Henry2018-09-03
|\ \ | |/ |/| | | | | Fix friends query See merge request pleroma/pleroma-fe!332
| * Update users.jsDingdreher2018-09-03
|/
* Merge branch 'imvomitingasicodethisshit' into 'develop'Shpuld Shpludson2018-09-01
|\ | | | | | | | | Made showing format selection optional and default to false See merge request pleroma/pleroma-fe!329
| * small fixHenry Jameson2018-08-31
| |
| * Made showing format selection optional and default to falseHenry Jameson2018-08-31
| |
* | Merge branch 'fix/put-sense-into-rich-text-styles' into 'develop'Shpuld Shpludson2018-09-01
|\ \ | |/ |/| | | | | Add styles for h1/2/3/4/5 tags in status html for rich text See merge request pleroma/pleroma-fe!328
| * Fix mistakesshpuld2018-08-31
| |
| * Change styles a bit, make pre-formatted blocks not overflow but scrollshpuld2018-08-31
| |
| * Add styles for h1/2/3/4/5 tags in status htmlshpuld2018-08-31
|/
* Merge branch 'fixup/post-status-styling' into 'develop'kaniini2018-08-31
|\ | | | | | | | | post status form: styling fixes for content-type selector, align icons with selector See merge request pleroma/pleroma-fe!327
| * post status form: styling fixes for content-type selector, align icons with ↵William Pitcock2018-08-31
|/ | | | selector
* Merge branch 'polish' into 'develop'kaniini2018-08-31
|\ | | | | | | | | | | | | Another one of those MR that fixes many many small-to-medium things Closes #92, #75, #122, #52, #72, and #87 See merge request pleroma/pleroma-fe!324
| * fixHenry Jameson2018-08-31
| |
| * Merge remote-tracking branch 'upstream/develop' into polishHenry Jameson2018-08-31
| |\ | | | | | | | | | | | | | | | * upstream/develop: i18n: make "plain text" translatable add the ability to select a post's content type
| | * i18n: make "plain text" translatableWilliam Pitcock2018-08-31
| | |
| | * add the ability to select a post's content typeWilliam Pitcock2018-08-31
| | |
| * | added option for logo in navbar to follow color scheme of the rest of the siteHenry Jameson2018-08-31
| | | | | | | | | | | | also fixed potential mess-up between api/static configs
| * | fixHenry Jameson2018-08-30
| | |
| * | vodka translationsHenry Jameson2018-08-30
| | |
| * | fixHenry Jameson2018-08-30
| | |
| * | fixHenry Jameson2018-08-30
| | |
| * | fixed #87Henry Jameson2018-08-30
| | |