6153d6a6dc
[Glitch] Fix media button type
...
Port 6cb5d71e5f
2018-04-14 12:30:55 +02:00
4b1909612a
[Glitch] Handle preference to always display sensitive media
...
Port the UI part of 219b28e172
2018-04-14 12:27:14 +02:00
fe3a9f5ea4
Add missing Japanese translation
2018-04-14 07:53:56 +09:00
605016368d
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
...
Bookmarks
2018-04-13 16:38:15 -05:00
f42e335e19
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
2018-04-12 03:28:22 -05:00
ef678ae350
Merge pull request #416 from ThibG/glitch-soc/features/media-modal
...
Port various media modal improvements to glitch-soc
2018-04-12 00:20:19 -05:00
8b3d03067b
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.
2018-04-11 21:05:34 +02:00
9b6e579c76
Update glitch-soc style to match changes to reports UI
...
Port style changes from 5a166a19a7
2018-04-11 19:15:42 +02:00
d1bfe4cdad
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-10 20:52:31 +02:00
d8dea31e0c
[Glitch] Fix video player height
...
Port 5eea3f9877
2018-04-09 01:08:51 +02:00
c2b7080a6e
[Glitch] Refactor scss
...
Port 480131a376
2018-04-09 01:08:50 +02:00
27ad9247a3
Fix video modal
2018-04-09 00:11:10 +02:00
9a5a49f17c
[Glitch] Avoid using JS to set height in MediaModal
...
Port 010c71f19c
2018-04-08 23:18:24 +02:00
89f5ae00a5
[Glitch] Improved media modal
...
Port d6e88e29e2
2018-04-08 23:15:25 +02:00
a5a305feb5
[Glitch] Allow to open a modal for embedded photo
...
Port 16a49799cf
2018-04-08 23:06:33 +02:00
2a4785a250
Fix video playback in glitch-soc detailed statuses
2018-04-08 12:22:12 +02:00
f5dfd3fae5
Merge pull request #412 from ThibG/glitch-soc/cleanup
...
Remove duplicate message entries (minor code cleanup)
2018-04-04 11:36:54 -04:00
e57ed1cb27
Update accounts SCSS for public pages
2018-04-04 15:40:59 +02:00
7518a4b9d7
Remove duplicate message entries
2018-04-04 12:19:00 +02:00
e1e4a53496
[Glitch] Fix: Prevent submission using same logic as submit button disabling.
...
Port 7d791f494b
2018-04-02 20:04:18 +02:00
766a008931
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
...
Port #6628 to glitch-soc flavour
2018-03-30 14:50:02 -04:00
769c536db4
[Glitch] Remove pointer events on the entire UI when a dropdown menu is open
...
Port 95fce1bca0
2018-03-30 12:45:23 +02:00
caa6611877
[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport
...
Port 27b532cc98
2018-03-30 12:31:29 +02:00
957d5c36c7
Add the domain blocks UI to Getting Started Misc
2018-03-30 10:07:33 +02:00
d2b9747a50
Add basic domain block UI
2018-03-30 10:07:33 +02:00
38feef43ad
Keep list of blocked domains
...
Might be overkill, but I'm trying to follow the same logic as for blocked users
2018-03-30 10:07:33 +02:00
e47593cac8
Update all known users' domain_blocking relationship instead of just one's
2018-03-30 10:07:33 +02:00
876cc5c02b
Fix undefined URL in `fetchDomainBlocks`
2018-03-30 10:07:33 +02:00
32ede640af
[Glitch] Display unfollow button even if account moved
...
Backport 1a90ef9c25
2018-03-29 14:59:20 +02:00
f63450c7ec
[Glitch] Profile redirect notes
...
Port WebUI changes from b89f614bd7
2018-03-29 14:59:20 +02:00
299cfa4bc7
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
...
Render toots with empty contents
2018-03-28 16:39:12 -05:00
166fe6e6dd
Fix attachment lists
2018-03-28 22:19:36 +02:00
4975cee02f
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.
2018-03-28 21:13:45 +02:00
8fc7f85356
[Glitch] Display AttachmentList in notifications
...
Port 2cb19bf443
2018-03-27 16:09:33 +02:00
9454cfc0ad
[Glitch] Display AttachmentList in timelines in compact style when media missing
...
Port 5079c1e322
2018-03-27 16:09:27 +02:00
21e374356a
expanded notifications show like default
2018-03-22 10:20:36 -04:00
5857c632ef
[Glitch] Cancel outdated pending compose suggestions
...
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
2018-03-20 14:20:17 +01:00
bdeaef116e
Merge pull request #394 from ashkitten/compressed-notifs
...
fix compressed notifications again (#393 )
2018-03-19 15:41:09 -05:00
4b0f6c677e
fix .status__info__icons layout
2018-03-19 07:13:18 -04:00
8d5abcb749
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots
...
Port WebUI toots/with reply/media tabs and pinned toots to glitch
2018-03-18 20:17:15 -05:00
59c1accd4b
fix compressed notifications again ( #393 )
2018-03-18 13:42:28 -04:00
1500cac87d
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
9972506493
fix non-notification boosts
2018-03-16 18:36:35 -04:00
b05bebce6d
[Glitch] Federate pinned statuses over ActivityPub
...
Port b1f8dfd3cf
2018-03-16 23:16:20 +01:00
b1691c9811
[Glitch] Improve style of web UI account tabs
...
Port of 5ce4b21455
2018-03-16 23:16:20 +01:00
ce24c3186b
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port ca9d8402c3
2018-03-16 23:16:20 +01:00
16fa0e15a9
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
2018-03-16 17:13:09 -05:00
3c05ed5ce6
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
f31d4ef2d3
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
5ac00cbf1f
Show media on report UI
...
Ports deba74063f
2018-03-16 15:27:13 +01:00
8e7394c876
Add close modal icon to report dialog ( #6591 )
...
Port 9769285278
2018-03-16 15:27:13 +01:00
15563f8421
Port federated reports UI to glitchsoc
...
Port 0ebd2a1718
2018-03-16 15:27:13 +01:00
1d27649098
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00
76f948f206
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url
...
Remove text requirement when media attached from statuses (fixes #381 )
2018-03-12 13:09:42 -07:00
61f7b7bc3e
Merge pull request #344 from chriswmartin/getting-started-badge-merge
...
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
2018-03-12 13:07:59 -07:00
cb3a0bf3ed
Remove text requirement when media attached from statuses ( fixes #381 )
...
Ports 0c2a08adeb
2018-03-12 18:39:07 +01:00
552b68452a
Port #6627 and #6636 to glitch-soc
2018-03-09 12:10:22 +01:00
7f53d83b42
Use glitchsoc TimelineComponent's margin/padding on about page.
2018-03-03 11:16:10 -06:00
69c4127ece
Copy in new CSS for about page.
2018-03-03 11:01:24 -06:00
af8aa1a5b9
Fix border-radius of owner avatar in /about/more
2018-02-25 23:27:32 +09:00
9d28dc6c34
Update SCSS
2018-02-24 03:22:58 +09:00
90765d1e99
Update columns.scss
2018-02-24 01:45:15 +09:00
a6138cc1e9
Update containers.scss
2018-02-24 01:26:48 +09:00
51ff35b344
Update index.scss
2018-02-24 01:25:49 +09:00
3419c8e2ac
Update about.scss
2018-02-24 00:22:05 +09:00
da0a577768
Revert 4a48d03b31 ( fixes #348 )
...
Since 4a48d03b31
2018-02-10 20:59:50 +01:00
0318146f16
Fix detailed-status
2018-02-04 10:35:09 +09:00
810312213a
Remove some leftover code, I guess
2018-01-23 09:20:18 +01:00
5a3792dfd8
add 'this.props' to fetchLists
2018-01-23 01:23:56 -06:00
0bf2f1d6d5
remove unused openOnboardingModal from getting_started
2018-01-22 19:38:34 -06:00
02b8b6efdf
merge tootsuite pr #6313 into glitch
2018-01-22 19:05:13 -06:00
8354cca2fa
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
...
Display a warning when composing unlisted toots with something looking like a hashtag
2018-01-20 16:37:52 -06:00
6b4f90e5fb
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
75dac5d056
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
12edfead8e
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
41c1e5533e
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b42cdedfc3
2018-01-19 12:59:33 +01:00
2a201c2ec6
Port 9cfbbbce1f to glitch frontend
2018-01-18 10:25:37 -06:00
dfcee78446
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
be525dd4db
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
7a692fe499
Increase priority of favstar gold
2018-01-14 16:05:44 -08:00
28be50d95e
Fixes to notification styling
2018-01-14 15:48:54 -08:00
919caa6e1c
Fixes to drawer and CWs
2018-01-14 15:31:00 -08:00
5ded1fc5b8
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
2018-01-14 17:48:02 -05:00
093cc02c84
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
2018-01-14 17:40:27 -05:00
e106f0be6d
Oops this should have been a part of last commit
2018-01-14 14:21:41 -08:00
df2f1344fa
Fixes onboarding modal ( #318 )
2018-01-14 14:13:24 -08:00
8399fba7f2
Fixed autocollapse detection
2018-01-14 13:29:51 -08:00
7333a28191
Fix eslint errors. #294 .
2018-01-14 05:56:43 -06:00
20a82bf6a3
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.
2018-01-14 05:07:08 -06:00
7ccde6b46b
Introduce a bit of luck into the elefriend selection. #294 .
2018-01-14 04:46:21 -06:00
bbfeb688e5
Add wave background; blend elefriend in a bit more. #294 .
2018-01-14 04:00:21 -06:00
1da6d12ea7
Bind click event to elefriend cycling. #294 .
2018-01-14 03:35:25 -06:00
e018b6c44c
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.
2018-01-14 03:06:11 -06:00
5b4f9858e6
Add the shrinking glitchy elefriend. #294 .
2018-01-13 21:27:39 -06:00
a6eeda658c
Prototype out glitchy elephant friend. #294 .
...
Glitched elephant friends kindly provided by @ncls7615.
2018-01-13 21:27:14 -06:00
808ace389f
Fix collapsed toot style
2018-01-14 11:13:55 +09:00
3a5ecab183
Fix un-fullwidth media style
2018-01-14 11:07:32 +09:00
75ab24dcea
Fix media detailed style
2018-01-14 10:38:51 +09:00
8709608e10
Fix confirmation modal bug
2018-01-14 09:51:01 +09:00
3ccbe066f0
Fix letterbox bug
2018-01-14 09:25:35 +09:00
80c899153f
Improve scss refactor 5
2018-01-14 09:17:38 +09:00
a263178cf3
Improve scss refactor 4
2018-01-14 09:12:10 +09:00
25f7568a7e
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
090d7c1807
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
4d9133003f
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
75af54925a
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
9e7150c6fa
Initial scss refactor
2018-01-14 03:41:20 +09:00
64f483cc0f
load public.js on vanilla#admin
2018-01-12 18:52:53 -08:00
056f52edac
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
6be6f6f5bd
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
327c9e96e0
Fix dropdown text
2018-01-12 23:18:25 +09:00
dbf88612e3
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
c4d63ba442
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
12469bed1b
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
6b20cd7c10
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
d1ddba043a
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
3ba78c7bda
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
90c35fe17a
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
cf027c74db
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
d12ce24054
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
0d399a4edc
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
783f65dd72
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
52d99f96bd
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
...
Show SENSITIVE tag on sensitive images (#267 )
2018-01-08 23:19:14 -06:00
ff6ecdda4e
Add missing comma
2018-01-08 18:38:28 -08:00
95459fc5bd
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
62a33d5ae0
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
2210eb0926
fix list editor scss
2018-01-09 02:50:24 +09:00
75cbeb775f
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 .
2018-01-08 09:45:59 -06:00
a38bd57f8a
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
cd8d0d7b85
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
07ea1aa6fe
fixed ctrl enter
2018-01-06 19:58:04 +01:00
568c9272ff
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
aa02511e1c
Update ja.js
2018-01-07 01:51:49 +09:00
ed5d06c7e7
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
45487e8862
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
34b7208e3f
appease eslint
2018-01-06 10:30:49 -05:00
896830cc57
Fix search popout
2018-01-06 21:50:11 +09:00
2e3bb24ed6
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.)
2018-01-06 03:01:11 -06:00
25da6ed5c1
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
e5a10a1fd3
Threaded mode~
2018-01-05 21:16:43 -08:00
85ffb07656
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
77cb2d04f9
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
0e418264fb
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
5500346b79
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
3671d07f37
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
2018-01-05 18:29:40 -05:00
f6ed878ee9
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
17034d36cf
add key to lists div
2018-01-05 09:00:48 -06:00
56429e7ca9
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
55ead6a4b2
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
7a9aaf28c4
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
0cb97608c7
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
c560373d5e
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
c20717bd9f
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
49d8d72192
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
f87cce9e28
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
1ba0732b82
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
d5770ef7ac
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
a4ae9c4109
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
093c27fe46
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
dde1db7efb
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
15796d0b5f
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
9ba54d457a
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
4c682228ce
Fix account header avatar
2017-12-22 07:12:49 +09:00
d93f6b4720
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
f923aeec08
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
c94a497ef6
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
ca77c18c24
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
58e3bd4d71
Add en and ja
2017-12-19 20:16:48 +09:00
5b185a0a0f
missed a semicolon
2017-12-17 22:21:15 -06:00
1dd4e3791f
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
d6ca0e29a7
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
82bff179f4
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
e59d124be5
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
cbc2f1ea5d
Update ja.js
2017-12-15 19:43:10 +09:00
b9d1543f7e
Update ja.js
2017-12-15 19:38:13 +09:00
f464eefc45
code style fixes
2017-12-12 23:07:12 -06:00
430733477c
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
2fa762ef0a
travis fixes
2017-12-12 08:50:31 -06:00
6cbf55ce7b
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
c746388452
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
975d888f5c
add components to getting started column
2017-12-12 00:01:17 -06:00
6bfbeb1fe1
add ja
2017-12-12 13:13:54 +09:00
af0031fe1b
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
58a133978b
remove picture
2017-12-11 13:52:17 +09:00
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
252de634bb
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
b07111ceba
add comma
2017-12-11 09:50:52 +09:00
3e6949b554
" => '
2017-12-11 09:46:17 +09:00
5cd4e577c2
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
2017-12-11 09:43:21 +09:00
2f56e7e00d
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
06c490be96
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
bb65adc0c0
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
b27126f1d6
Linting fixes
2017-12-10 11:08:04 -08:00
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
4b9fa497c6
removed one last app settings addition
2017-12-10 09:25:44 -06:00
0d6a515145
removed app settings additions
2017-12-10 09:10:47 -06:00
7a066e814b
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
c47e5232bd
remove trailing spaces
2017-12-09 12:41:24 -06:00
ac42b2b95d
fixes, functioning now
2017-12-09 12:06:00 -06:00
7ff586054c
added a few more things
2017-12-09 11:21:41 -06:00
09c82d4343
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
f42a622bf9
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
591a3769f4
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
a762aa7933
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
2668d56334
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
0fbf7f2838
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
f6634f4fdc
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
f9387aabaa
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
31674d5083
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
82cd4a0a3c
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 6bb4fb008a
2017-12-06 22:35:45 -06:00
04b03999c2
Merge pull request #241 from glitch-soc/no-dm-option
...
Add option to remove DMs from home (#126 )
2017-12-06 22:20:55 -06:00
8dc8ea2c0a
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
08290b0b02
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
1221e3075d
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
Thibaut Girka