aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,363 Commits
145 Branches
284 Tags
1.0 GiB
Commit Graph

502 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author SHA1 Message Date
David Yip 2dc4fbbd1a
When pulling out max_toot_chars, handle nulls 
flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences.  This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access.  All values exported from that module must
therefore expect that case; previously, the max chars value didn't.

Addresses .
kibigo! b5874c1428 Fixes to search dropdown
beatrix 61ef8d643e
fix typo in vanilla names.yml
Ondřej Hruška 9f29fd31ba
fixed ctrl enter
Ondřej Hruška 53caab0c0b
Fix the always-threaded bug
ncls7615 f5a4201ad8
Update ja.js
beatrix a251c42192
Merge pull request from glitch-soc/thread-mode 
Threaded mode~
beatrix 2ec9a75a1d
Merge pull request from KnzkDev/fix/search-popout 
Fix search popout
beatrix fa92e88fb2
appease eslint
ncls7615 da98c33161
Fix search popout
David Yip 2eed4ace11
Read max_toot_chars from root object. Fixes . 
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
kibigo! c71d848855 my global .gitignore excluded this file ;_;
kibigo! e4bc013d6f Threaded mode~
kibigo! 6932b464e6 Fixed improper dropdown func binding for + toot button spacing
kibigo! ad10a80a99 Styling and autosuggest fixes for
kibigo! 8bf9d9362a Fixes composer mounting issue with
beatrix f441770e50
Merge pull request from chriswmartin/web-push-updates 
Web push updates
beatrix b4e667f86b
Merge pull request from chriswmartin/getting-started-key-fix 
unique ColumnLink keys in getting_started
beatrix faf20eeaa4
Merge pull request from glitch-soc/compose-refactor 
Compose refactor
cwm 9fc08e4861 add key to lists div
cwm 6236577734 change how list ColumnLink keys are determined
kibigo! d7ce339c2e WIP <Compose> Refactor; Fin~
kibigo! 42f50049ff WIP <Compose> Refactor; 1000 tiny edits
kibigo! b4a3792201 WIP <Compose> Refactor; <ActionsModal>; dropdowns
kibigo! 083170bec7 WIP <Compose> Refactor; SCSS ed.
kibigo! 8713659dff WIP <Compose> Refactor; <OnboardingModal> ed.
kibigo! 3c29f57404 WIP <Compose> Refactor; <Drawer> ed.
kibigo! 924ffe81d4 WIPgit status <Compose> Refactor; <Composer> ed.
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
cwm 72b99f6ee4 bug fix (tootsuite pr )
cwm 4ce44ba470 remove unused 'saveSettings' from column_settings_container
cwm 0dce26b82b web push updates (tootsuite PRs , , )
cwm 832a93e67c Fix GIF avatars not autoplaying (fixes , tootsuite pr )
beatrix 7347bc7334
Merge pull request from chriswmartin/merge-vanilla-updates-into-glitch 
Merge various small vanilla updates into glitch
cwm 20ad071931 Set direction style to reply indicator (tootsuite pr )
cwm 14243bf80a Reduce motion for boost animation (tootsuite pr )
cwm 337c2e77ee Fix layout for RTL (tootsuite pr , )
cwm 46565ed746 Fix focused background color of favourited direct toot (tootsuite pr )
cwm 815524412b Move dropdown transform origin (tootsuite pr )
cwm 083571915f onMuteNotifications validation (tootsuite pr )
cwm 2bbd22e91c Rename settingKey to settingPath (tootsuite pr & )
cwm cc6a2ffd0a use 'flavours/glitch/' prefix in new imports
cwm 22818d2a16 Add mute, block, conversation mute actions to detailed status dropdown menu
beatrix 60d415bc5e
Merge pull request from chriswmartin/getting-started-improvements 
Getting started column improvements
ncls7615 191b625a27
Fix account header avatar
David Yip 7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes .
cwm d736739e8f <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr )
David Yip dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes .
cwm 9042f9a813 add keyboard shortcuts to getting started (fixes )
ncls7615 d3b2677775
Add en and ja
cwm 14aae9c05c missed a semicolon
cwm be50e45a74 use makeMapStateToProps
cwm e4ebbf4f07 use list-ul icon in list header and web/lists
ncls7615 9e8fa3caee fix admin/action_logs page
kibigo! e677dda07c Fixes to make search results scrollable
NCLS e9a5bde9a0
Update ja.js
NCLS 61ed5b972c
Update ja.js
cwm 17e53b931c code style fixes
cwm 9719983f2d move list items into an array, don't unnecessarily concat misc nav item
cwm b6ded7119e travis fixes
cwm 9b7208f4b4 readded connect for onboarding modal
cwm b358483ef2 remove unneeded imports from getting_started_misc
cwm 37ced4c903 add components to getting started column
ncls7615 b93ad3d0e8 add ja
beatrix 771b950feb
Merge pull request from glitch-soc/new-theme-ux 
New flavour/skin UX
ncls7615 9d5ecdbf41 remove picture
kibigo! ed7231947c Added styling
kibigo! bdca1614d5 Screenshot support for themes
kibigo! dabf66e676 Moved flavour UI into own prefs tab
beatrix 08b0861b96
Merge pull request from chriswmartin/fav-confirm-modal 
add favourite confirmation modal
ncls7615 d420e2f047 add comma
ncls7615 279231c5dd " => '
ncls7615 a98b0a47ef Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles 
# Conflicts:
#	app/javascript/glitch/locales/ja.json
cwm 0466aa8d08 use single quotes in locale entry
cwm 072ab191cc pulled master, moved locale entry to new location
cwm eec5d350fd removed unneeded actions_modal div
kibigo! cd107e92cb Move ja localization to new locaiton
kibigo! 6b7085a33e Linting fixes
kibigo! b28cd6769c Javascript intl8n flavour support
kibigo! d08d0f9f33 Ruby intl8n for themes
cwm 066458a659 removed one last app settings addition
cwm 7a8711ccac removed app settings additions
cwm 8606e53384 moved locales to glitch, created add settings entry
cwm c5a688d70e remove trailing spaces
cwm 22cdbca82c fixes, functioning now
cwm a489e5d5cd added a few more things
cwm baf9ea8018 remove keyboard shortcuts from getting started because thats a different thing
cwm abe95b614b add initial components based off of tootsuite pr
cwm 02d71c6a11 fix a missing semicolon and mixed tabs/spaces that travis was complaining about
cwm 4a5401a58e merge tootsuite prs and into glitch flavour
cwm 28423dd046 merge tootsuite pr into glitch flavour
cwm b165950ca7 add keyboard shortcut to getting started, add missing list style
cwm 47157e07b2 merged tootsuite pr into glitch flavour
cwm f44c8fd130 merged tootsuite pr into glitch flavour
kibigo! 9cdd81e9dd Glitch doesn't have a home stylesheet anymore
kibigo! 96126a5b01 Packaged local_settings styles in common
David Yip 67d625c42d
Fix hide reblogs in glitch frontend () 
This applies 432761f375 to the glitch copy
of the Mastodon frontend.
David Yip 935c1944e2
Merge pull request from glitch-soc/no-dm-option 
Add option to remove DMs from home ()
kibigo! 2f2467ce8e Add option to remove DMs from home ()
David Yip 133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ()
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
kibigo! bc4fa6b198 Rename themes -> flavours ? ?