Thibaut Girka
694337d9bb
Fix auto-collapsed toots making the TL jump ( fixes #417 )
7 years ago
Thibaut Girka
931a4d1ebf
Clean up dead code
7 years ago
Thibaut Girka
8f8b71a278
Use React's new lifecycles for scrollable lists
7 years ago
Thibaut Girka
3068384dbc
Glitchsoc-specific changes to allow boosting own private toots
7 years ago
Thibaut Girka
779aa707ec
Only compute height dynamically for standalone media
...
This prevents changing the status' height and triggering jumps in the TL
7 years ago
Thibaut Girka
52229405ed
[Glitch] Make detailed status' media gallery standalone
7 years ago
Thibaut Girka
dcc1c10937
[Glitch] Center thumbnails on focus point
...
Port the display part of the following commits to glitch-soc:
* 90f12f2e5a
* b170627ceb
* 11697d6894
* 56eb5c3f34
7 years ago
Thibaut Girka
f1e25b672a
Use javascript to set MediaGallery height automatically
7 years ago
Thibaut Girka
a95f8271be
Revert some glitch-specific refactoring
...
In order to keep my sanity when porting changes between glitch-soc and upstream.
7 years ago
Thibaut Girka
1822ce89f9
[Glitch] retrieve custom emoji list via API instead of before page load
...
Port b08ab329f4
to glitch-soc
7 years ago
ThibG
21837b291e
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks
...
Fix the bookmark column pinning fix…
7 years ago
Thibaut Girka
1aac83ef47
Fix the bookmark column pinning fix…
7 years ago
ThibG
84d0aa7b26
Merge pull request #429 from ThibG/glitch-soc/features/bookmarks
...
Fix pinning the bookmarks column (fixes #428 )
7 years ago
Thibaut Girka
54f5170f59
Fix pinning the bookmarks column ( fixes #428 )
7 years ago
David Yip
f879672554
Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements
...
Backport a few MediaGallery/Video changes from upstream (fixes #423 )
7 years ago
Thibaut Girka
5cc7c4b920
Fix extended video player (gifv) modal size
...
It was currently full-size
7 years ago
Thibaut Girka
5d96c5ac41
[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI
...
Port the video-player part of 036dd98abb
to
glitch-soc. MediaGallery part ignored since it has diverged quite a bit.
This fixes #423
7 years ago
Thibaut Girka
c5dd4ed1d5
[Glitch] Fix media button type
...
Port ecdac9017e
to glitch-soc
7 years ago
Thibaut Girka
dfe8abb8cd
[Glitch] Handle preference to always display sensitive media
...
Port the UI part of 76f3d5d16b
to glitch-soc
7 years ago
imncls
dd4ad6300b
Add missing Japanese translation
7 years ago
David Yip
b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
...
Bookmarks
7 years ago
David Yip
eb72c3398c
Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns
...
Place composer dropdown menus top if they are closer to the bottom of the viewport
7 years ago
David Yip
0b326950bf
Merge pull request #416 from ThibG/glitch-soc/features/media-modal
...
Port various media modal improvements to glitch-soc
7 years ago
Thibaut Girka
acb434b0c9
Add glitch-soc front-end support for bookmarks
...
Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it.
7 years ago
Thibaut Girka
043a699990
Update glitch-soc style to match changes to reports UI
...
Port style changes from d9b62e34da
7 years ago
Thibaut Girka
e74e5c7eb9
Place composer dropdown menus top if they are closer to the bottom of the viewport
7 years ago
Thibaut Girka
9073687f66
[Glitch] Fix video player height
...
Port 31e7b73084
to glitch-soc
7 years ago
Thibaut Girka
101e6564fd
[Glitch] Refactor scss
...
Port f691afaae9
to glitch-soc
7 years ago
Thibaut Girka
0fb5ea5d15
Fix video modal
7 years ago
Thibaut Girka
a4fa8c9064
[Glitch] Avoid using JS to set height in MediaModal
...
Port fa5c867e0e
to glitch-soc
7 years ago
Thibaut Girka
87071d9e81
[Glitch] Improved media modal
...
Port 4e929b2d17
to glitch-soc
7 years ago
Thibaut Girka
0b86ec4e7f
[Glitch] Allow to open a modal for embedded photo
...
Port bf7757cbbc
to glitch-soc
7 years ago
Thibaut Girka
a896f601fa
Fix video playback in glitch-soc detailed statuses
7 years ago
beatrix
77b650b69c
Merge pull request #412 from ThibG/glitch-soc/cleanup
...
Remove duplicate message entries (minor code cleanup)
7 years ago
Thibaut Girka
d0e792e231
Update accounts SCSS for public pages
7 years ago
Thibaut Girka
75f2e9fd97
Remove duplicate message entries
7 years ago
Thibaut Girka
ca9f022a80
[Glitch] Fix: Prevent submission using same logic as submit button disabling.
...
Port 6a895e1ab3
to glitch-soc
7 years ago
beatrix
3304cb681d
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
...
Port #6628 to glitch-soc flavour
7 years ago
Thibaut Girka
48bcf4d6e8
[Glitch] Remove pointer events on the entire UI when a dropdown menu is open
...
Port 913a38111f
to glitch-soc
7 years ago
Thibaut Girka
2871a82fcc
[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport
...
Port f6a8d835d3
to glitch-soc
7 years ago
Thibaut Girka
218cc261d1
Add the domain blocks UI to Getting Started Misc
7 years ago
Thibaut Girka
afa813d71f
Add basic domain block UI
7 years ago
Thibaut Girka
482ad7d7c4
Keep list of blocked domains
...
Might be overkill, but I'm trying to follow the same logic as for blocked users
7 years ago
Thibaut Girka
79da0ad7a2
Update all known users' domain_blocking relationship instead of just one's
7 years ago
Thibaut Girka
937ace10d9
Fix undefined URL in `fetchDomainBlocks`
7 years ago
Thibaut Girka
b5948044b3
[Glitch] Display unfollow button even if account moved
...
Backport 3987bd18a4
to glitch-soc
7 years ago
Thibaut Girka
a59c146bf8
[Glitch] Profile redirect notes
...
Port WebUI changes from 58cede4808
7 years ago
David Yip
4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
...
Render toots with empty contents
7 years ago
Thibaut Girka
7db431eac6
Fix attachment lists
7 years ago
Thibaut Girka
53eab4470d
Render toots with empty contents
...
This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon.
7 years ago
Thibaut Girka
88790b91de
[Glitch] Display AttachmentList in notifications
...
Port 77406d3a09
to glitch-soc
7 years ago
Thibaut Girka
3bc5452449
[Glitch] Display AttachmentList in timelines in compact style when media missing
...
Port 86a9de6753
to glitch-soc
7 years ago
Ash Levy
58eeb92755
expanded notifications show like default
7 years ago
Thibaut Girka
12b0ea0667
[Glitch] Cancel outdated pending compose suggestions
...
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
7 years ago
David Yip
c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
...
fix compressed notifications again (#393 )
7 years ago
Ash Lea
5b00b8f0da
fix .status__info__icons layout
7 years ago
David Yip
a387f99659
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots
...
Port WebUI toots/with reply/media tabs and pinned toots to glitch
7 years ago
Ash Levy
c68c1466ac
fix compressed notifications again ( #393 )
7 years ago
David Yip
fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
7 years ago
Ash Levy
33d5fe889a
fix non-notification boosts
7 years ago
Thibaut Girka
6f0e50f9a0
[Glitch] Federate pinned statuses over ActivityPub
...
Port 9110db41c5
to glitch
7 years ago
Thibaut Girka
cd73af3bd0
[Glitch] Improve style of web UI account tabs
...
Port of 38b9af76a2
to glitch
7 years ago
Thibaut Girka
f00af46d70
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port 5131012505
to glitch
7 years ago
David Yip
50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
7 years ago
David Yip
a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
7 years ago
Thibaut Girka
9c40a5f3c8
Fix toot text color in the report modal
7 years ago
Thibaut Girka
19f7bd1582
Show media on report UI
...
Ports 219aac7800
to glitch-soc
7 years ago
Thibaut Girka
22870985da
Add close modal icon to report dialog ( #6591 )
...
Port 379cdfaac5
to glitch-soc flavour
7 years ago
Thibaut Girka
9cf574d0d2
Port federated reports UI to glitchsoc
...
Port 41a01bec23
to glitch-soc
7 years ago
Ash Levy
9317f6853e
compress boost/fave notifications more
7 years ago
Gô Shoemake
22f2750578
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url
...
Remove text requirement when media attached from statuses (fixes #381 )
7 years ago
Gô Shoemake
2395a4c313
Merge pull request #344 from chriswmartin/getting-started-badge-merge
...
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
7 years ago
Thibaut Girka
841ef606a9
Remove text requirement when media attached from statuses ( fixes #381 )
...
Ports cfa9b6e13a
to glitchsoc
7 years ago
Thibaut Girka
25c5223617
Port #6627 and #6636 to glitch-soc
7 years ago
David Yip
65e2a4645e
Use glitchsoc TimelineComponent's margin/padding on about page.
7 years ago
David Yip
6176e278f4
Copy in new CSS for about page.
7 years ago
yuzulabo
43cc79aaa0
Fix border-radius of owner avatar in /about/more
7 years ago
imncls
f2f19e1f8a
Update SCSS
7 years ago
imncls
7bff3243ae
Update columns.scss
7 years ago
imncls
ef1d46948a
Update containers.scss
7 years ago
imncls
82408904a1
Update index.scss
7 years ago
imncls
fa3641df7f
Update about.scss
7 years ago
Thibaut Girka
fb6f131fa1
Revert 245816ab27
( fixes #348 )
...
Since 245816ab27
, IntersectionObserverArticle
assumes that its children do not change unless the number of children changes.
This is not the case with the notification overlay, which resulted in the
checkmark of notification cleaning mode not updating unless scrolling to make
notifications appear/disappear.
This change may negatively impact performances.
7 years ago
ncls7615
15a5b3372a
Fix detailed-status
7 years ago
Thibaut Girka
2107891edb
Remove some leftover code, I guess
7 years ago
cwm
0ddeed9377
add 'this.props' to fetchLists
7 years ago
cwm
939075899e
remove unused openOnboardingModal from getting_started
7 years ago
cwm
00be9eb3fe
merge tootsuite pr #6313 into glitch
7 years ago
David Yip
e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
...
Display a warning when composing unlisted toots with something looking like a hashtag
7 years ago
David Yip
24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
7 years ago
David Yip
3cae362214
Merge new onboarding styles; delete refs to PNGs.
7 years ago
Thibaut Girka
1619efd735
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
7 years ago
Thibaut Girka
1287b2782b
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b6af88192f
to the glitch flavour.
7 years ago
David Yip
bcd86404da
Port 7badad7797
to glitch frontend
7 years ago
David Yip
708ec07e27
Style fixes to make eslint happier, hopefully
7 years ago
kibi!
cda845ae0e
Fix mailer to use webpack core
7 years ago
kibi!
8ee6ed358f
Increase priority of favstar gold
7 years ago
kibi!
1ee0e91fb6
Fixes to notification styling
7 years ago
kibi!
b9f4896830
Fixes to drawer and CWs
7 years ago
beatrix
cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
7 years ago
beatrix
39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
7 years ago
kibi!
0fb3bd09e9
Oops this should have been a part of last commit
7 years ago
kibi!
1fa03e026a
Fixes onboarding modal ( #318 )
7 years ago
kibi!
a5931e1f48
Fixed autocollapse detection
7 years ago
David Yip
c2669f93d0
Fix eslint errors. #294 .
7 years ago
David Yip
756a9cd139
Run slightly less afoul of accessibility checks. #294 .
...
This makes the clickable element an interactive element, but doesn't add
alt text and makes it not-obvious that you can click the elefriend. On
one hand, this goes against good practice; on the other hand, it's not
*supposed* to be obvious that you can click the elefriend.
7 years ago
David Yip
e64cc311dd
Introduce a bit of luck into the elefriend selection. #294 .
7 years ago
David Yip
53cbc9933e
Add wave background; blend elefriend in a bit more. #294 .
7 years ago
David Yip
cd1377de7f
Bind click event to elefriend cycling. #294 .
7 years ago
David Yip
1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294 .
...
Also lay some groundwork needed to interactively change the
glitchfriend.
The codebase uses "elefriend" because it's shorter and didn't require me
to realign the actions in actions/compose.js. Same idea, though.
7 years ago
David Yip
1e0b707018
Add the shrinking glitchy elefriend. #294 .
7 years ago
David Yip
835eec8a4c
Prototype out glitchy elephant friend. #294 .
...
Glitched elephant friends kindly provided by @ncls7615.
7 years ago
ncls7615
f9b08e2142
Fix collapsed toot style
7 years ago
ncls7615
1ebe66b78c
Fix un-fullwidth media style
7 years ago
ncls7615
be2bac05aa
Fix media detailed style
7 years ago
ncls7615
b5476f6c75
Fix confirmation modal bug
7 years ago
ncls7615
bc0524834e
Fix letterbox bug
7 years ago
ncls7615
6ecf81cacf
Improve scss refactor 5
7 years ago
ncls7615
64425dbb77
Improve scss refactor 4
7 years ago
ncls7615
a16d885ac9
Improve scss refactor 3
7 years ago
ncls7615
5f35b39f6f
Improve scss refactor 2
7 years ago
ncls7615
bb2ca23839
Improve scss refactor 1
7 years ago
ncls7615
a9be680807
Fix padded-blocks error
7 years ago
ncls7615
6a73c8c8a2
Initial scss refactor
7 years ago
Gô Shoemake
9b9b7fa005
Load packs/public.js for glitch#admin
7 years ago
Marcin Mikołajczak
ee7217bc94
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
ncls7615
cf5789146b
Fix dropdown text
7 years ago
David Yip
095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
7 years ago
kibigo!
35be02f21d
Renamed glitch async chunks
7 years ago
cwm
aef4b1af66
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
7 years ago
cwm
f43c2f12f3
Fix overflowing audit logs (tootsuite pr #6184 )
7 years ago
cwm
9bdbe66316
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
7 years ago
cwm
b535f24fe5
Use const instead of let for constant (tootsuite pr #6106 )
7 years ago
cwm
0d4dcb5fb2
change key to path in timeline settings containers
7 years ago
cwm
6d1c325167
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
7 years ago
cwm
7f4374d97d
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
7 years ago
cwm
8a0e4bb9a4
Hide moved account's follow button in search result (tootsuite pr #5913 )
7 years ago
cwm
5963630c63
Prevent duplicate load of favourites (tootsuite pr #5931 )
7 years ago
David Yip
ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
...
Show SENSITIVE tag on sensitive images (#267 )
7 years ago
kibigo!
60433d03f5
Add missing comma
7 years ago
kibigo!
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
7 years ago
kibigo!
824a790e63
Threads now inherit privacy directly ( #309 )
7 years ago
ncls7615
ef0b7d1e76
fix list editor scss
7 years ago
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 #306 .
7 years ago
kibigo!
b5874c1428
Fixes to search dropdown
7 years ago
Ondřej Hruška
9f29fd31ba
fixed ctrl enter
7 years ago
Ondřej Hruška
53caab0c0b
Fix the always-threaded bug
7 years ago
ncls7615
f5a4201ad8
Update ja.js
7 years ago
beatrix
a251c42192
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
7 years ago
beatrix
2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
7 years ago
beatrix
fa92e88fb2
appease eslint
7 years ago
ncls7615
da98c33161
Fix search popout
7 years ago
David Yip
2eed4ace11
Read max_toot_chars from root object. Fixes #297 .
...
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.)
7 years ago
kibigo!
c71d848855
my global .gitignore excluded this file ;_;
7 years ago
kibigo!
e4bc013d6f
Threaded mode~
7 years ago
kibigo!
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
7 years ago
kibigo!
ad10a80a99
Styling and autosuggest fixes for #293
7 years ago
kibigo!
8bf9d9362a
Fixes composer mounting issue with #293
7 years ago
beatrix
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
7 years ago
beatrix
b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
7 years ago
beatrix
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
7 years ago
cwm
9fc08e4861
add key to lists div
7 years ago
cwm
6236577734
change how list ColumnLink keys are determined
7 years ago
kibigo!
d7ce339c2e
WIP <Compose> Refactor; Fin~
7 years ago
kibigo!
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
7 years ago
kibigo!
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
7 years ago
kibigo!
083170bec7
WIP <Compose> Refactor; SCSS ed.
7 years ago
kibigo!
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
7 years ago
kibigo!
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
7 years ago
kibigo!
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
7 years ago
Marcin Mikołajczak
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
cwm
72b99f6ee4
bug fix (tootsuite pr #6120 )
7 years ago
cwm
4ce44ba470
remove unused 'saveSettings' from column_settings_container
7 years ago
cwm
0dce26b82b
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
7 years ago
cwm
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
7 years ago
beatrix
7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
7 years ago
cwm
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
7 years ago
cwm
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
7 years ago
cwm
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
7 years ago
cwm
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
7 years ago
cwm
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
7 years ago
cwm
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
7 years ago
cwm
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
7 years ago
cwm
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
7 years ago
cwm
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
7 years ago
beatrix
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
7 years ago
ncls7615
191b625a27
Fix account header avatar
7 years ago
David Yip
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273 .
7 years ago
cwm
d736739e8f
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
7 years ago
David Yip
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
7 years ago
cwm
9042f9a813
add keyboard shortcuts to getting started ( fixes #275 )
7 years ago
ncls7615
d3b2677775
Add en and ja
7 years ago
cwm
14aae9c05c
missed a semicolon
7 years ago
cwm
be50e45a74
use makeMapStateToProps
7 years ago
cwm
e4ebbf4f07
use list-ul icon in list header and web/lists
7 years ago
ncls7615
9e8fa3caee
fix admin/action_logs page
7 years ago
kibigo!
e677dda07c
Fixes #244 to make search results scrollable
7 years ago
NCLS
e9a5bde9a0
Update ja.js
7 years ago
NCLS
61ed5b972c
Update ja.js
7 years ago
cwm
17e53b931c
code style fixes
7 years ago
cwm
9719983f2d
move list items into an array, don't unnecessarily concat misc nav item
7 years ago
cwm
b6ded7119e
travis fixes
7 years ago
cwm
9b7208f4b4
readded connect for onboarding modal
7 years ago
cwm
b358483ef2
remove unneeded imports from getting_started_misc
7 years ago
cwm
37ced4c903
add components to getting started column
7 years ago
ncls7615
b93ad3d0e8
add ja
7 years ago
beatrix
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
7 years ago
ncls7615
9d5ecdbf41
remove picture
7 years ago
kibigo!
ed7231947c
Added styling
7 years ago
kibigo!
bdca1614d5
Screenshot support for themes
7 years ago
kibigo!
dabf66e676
Moved flavour UI into own prefs tab
7 years ago
beatrix
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
7 years ago
ncls7615
d420e2f047
add comma
7 years ago
ncls7615
279231c5dd
" => '
7 years ago
ncls7615
a98b0a47ef
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
7 years ago
cwm
0466aa8d08
use single quotes in locale entry
7 years ago
cwm
072ab191cc
pulled master, moved locale entry to new location
7 years ago
cwm
eec5d350fd
removed unneeded actions_modal div
7 years ago
kibigo!
cd107e92cb
Move ja localization to new locaiton
7 years ago
kibigo!
6b7085a33e
Linting fixes
7 years ago
kibigo!
b28cd6769c
Javascript intl8n flavour support
7 years ago
kibigo!
d08d0f9f33
Ruby intl8n for themes
7 years ago
cwm
066458a659
removed one last app settings addition
7 years ago
cwm
7a8711ccac
removed app settings additions
7 years ago
cwm
8606e53384
moved locales to glitch, created add settings entry
7 years ago
cwm
c5a688d70e
remove trailing spaces
7 years ago
cwm
22cdbca82c
fixes, functioning now
7 years ago
cwm
a489e5d5cd
added a few more things
7 years ago
cwm
baf9ea8018
remove keyboard shortcuts from getting started because thats a different thing
7 years ago
cwm
abe95b614b
add initial components based off of tootsuite pr #1507
7 years ago
cwm
02d71c6a11
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
7 years ago
cwm
4a5401a58e
merge tootsuite prs #5895 and #5889 into glitch flavour
7 years ago
cwm
28423dd046
merge tootsuite pr #5904 into glitch flavour
7 years ago
cwm
b165950ca7
add keyboard shortcut to getting started, add missing list style
7 years ago
cwm
47157e07b2
merged tootsuite pr #5811 into glitch flavour
7 years ago
cwm
f44c8fd130
merged tootsuite pr #5750 into glitch flavour
7 years ago
kibigo!
9cdd81e9dd
Glitch doesn't have a home stylesheet anymore
7 years ago
kibigo!
96126a5b01
Packaged local_settings styles in common
7 years ago
David Yip
67d625c42d
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 432761f375
to the glitch copy
of the Mastodon frontend.
7 years ago
David Yip
935c1944e2
Merge pull request #241 from glitch-soc/no-dm-option
...
Add option to remove DMs from home (#126 )
7 years ago
kibigo!
2f2467ce8e
Add option to remove DMs from home ( #126 )
7 years ago
David Yip
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
7 years ago
David Yip
d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo!
bc4fa6b198
Rename themes -> flavours ? ?
7 years ago