aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Fix merge conflict in CHANGELOGeris2021-07-22
|\
| * Merge branch 'fix-themes-select' into 'develop'Shpuld Shpludson2021-07-19
| |\
| | * Apply 1 suggestion(s) to 1 file(s)HJ2021-07-19
| | * Fixed mergedConfig misbehaving on first bootHenry Jameson2021-06-14
| | * lintHenry Jameson2021-06-08
| | * fix theme selection not workingHenry Jameson2021-06-07
| * | Merge branch 'editProfile' into 'develop'Shpuld Shpludson2021-07-19
| |\ \
| | * | Don't show profile edit button in sidebarEris2021-06-17
| | * | Merge branch 'develop' into 'editProfile'eris2021-06-17
| | |\ \
| | * | | Add edit profile buttonEris2021-06-17
| | | |/ | | |/|
| * | | Merge branch 'fix-settings-anon' into 'develop'Shpuld Shpludson2021-07-19
| |\ \ \
| | * | | better approachHenry Jameson2021-05-31
| | * | | fix BooleanSetting and ChoiceSetting not working properly on initialHenry Jameson2021-05-31
| * | | | Fix follow request count position on mobileEris2021-06-20
| | |_|/ | |/| |
* | | | Merge branch 'develop' into 'themeApply'eris2021-06-15
|\| | |
| * | | Use proper setting nameEris2021-06-15
| * | | Use cleaner instance config check for shoutbox settingEris2021-06-15
| * | | Make locale language cleanerEris2021-06-15
| * | | Don't shorten shoutbox to SBEris2021-06-14
| * | | Fix lint errorEris2021-06-14
| * | | New option: Hide shoutboxEris2021-06-14
| | |/ | |/|
* | | Revert duplicate buttons and move existing buttons to bottom-right corner ind...Eris2021-06-14
* | | Add apply and reset themes to top of theme tabEris2021-06-14
|/ /
* | Remove unused shoutbox channel state from side drawerMark Felder2021-06-03
* | This setting didn't actually do anythingMark Felder2021-06-01
* | Use old value to discover if Shoutbox is available until we ship a new releas...Mark Felder2021-06-01
* | Keep channel name the same for backwards compatibilityMark Felder2021-06-01
* | Rename legacy PleromaFE Chat functionality to "Shout"Mark Felder2021-06-01
* | Merge branch 'vue3compat-emoji-input' into 'develop'HJ2021-05-31
|\ \
| * | oopsHenry Jameson2021-05-31
| * | backport vue3 changes related to emoji-inputHenry Jameson2021-04-18
* | | Merge branch 'v-slot-upgrade' into 'develop'HJ2021-05-31
|\ \ \ | |_|/ |/| |
| * | fix warningsHenry Jameson2021-05-31
| * | migrate to v-slotHenry Jameson2021-04-07
| |/
* | Merge branch 'better-selects' into 'develop'HJ2021-05-31
|\ \
| * | fix warningsHenry Jameson2021-05-31
| * | lost fileHenry Jameson2021-04-07
| * | remove extra chevron post-mergeHenry Jameson2021-04-07
| * | Merge remote-tracking branch 'origin/develop' into better-selectsHenry Jameson2021-04-07
| |\|
| * | Cleanup boolean/choice settingHenry Jameson2021-03-11
| * | fix for filtering tabHenry Jameson2021-03-11
| * | implement ChoiceSetting for settings modal similar to BooleanSettingHenry Jameson2021-03-11
| * | cleanup, fixesHenry Jameson2021-03-11
| * | ghost styles for poll formHenry Jameson2021-03-11
| * | Made Select component to make using styled selects easierHenry Jameson2021-03-11
* | | Merge branch 'flash-support' into 'develop'HJ2021-05-31
|\ \ \
| * | | remove "leak ur cookiz"Henry Jameson2021-05-31
| * | | better label, better error handlingHenry Jameson2021-04-13
| * | | do not load ruffle multiple times!Henry Jameson2021-04-12
| * | | translate a variable name to American English from Australian EnglishHenry Jameson2021-04-12