ncls7615
25f7568a7e
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
ncls7615
a16d885ac9
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
ncls7615
090d7c1807
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
ncls7615
5f35b39f6f
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
ncls7615
4d9133003f
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
ncls7615
bb2ca23839
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
ncls7615
75af54925a
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
ncls7615
a9be680807
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
ncls7615
9e7150c6fa
Initial scss refactor
2018-01-14 03:41:20 +09:00
ncls7615
6a73c8c8a2
Initial scss refactor
2018-01-14 03:41:20 +09:00
Gô Shoemake
056f52edac
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
Gô Shoemake
9b9b7fa005
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
Marcin Mikołajczak
6be6f6f5bd
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
Marcin Mikołajczak
ee7217bc94
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
ncls7615
327c9e96e0
Fix dropdown text
2018-01-12 23:18:25 +09:00
ncls7615
cf5789146b
Fix dropdown text
2018-01-12 23:18:25 +09:00
David Yip
dbf88612e3
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
David Yip
095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
kibigo!
c4d63ba442
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
kibigo!
35be02f21d
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
cwm
12469bed1b
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
cwm
aef4b1af66
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
cwm
6b20cd7c10
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
cwm
f43c2f12f3
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
cwm
d1ddba043a
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
cwm
9bdbe66316
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
cwm
3ba78c7bda
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
cwm
b535f24fe5
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
cwm
90c35fe17a
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
cwm
0d4dcb5fb2
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
cwm
cf027c74db
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
cwm
6d1c325167
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
cwm
d12ce24054
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
cwm
7f4374d97d
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
cwm
0d399a4edc
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
cwm
8a0e4bb9a4
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
cwm
783f65dd72
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
cwm
5963630c63
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
David Yip
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
David Yip
ec0bdd6c1a
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
kibigo!
ff6ecdda4e
Add missing comma
2018-01-08 18:38:28 -08:00
kibigo!
60433d03f5
Add missing comma
2018-01-08 18:38:28 -08:00
kibigo!
95459fc5bd
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
kibigo!
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
kibigo!
62a33d5ae0
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
kibigo!
824a790e63
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
ncls7615
2210eb0926
fix list editor scss
2018-01-09 02:50:24 +09:00
ncls7615
ef0b7d1e76
fix list editor scss
2018-01-09 02:50:24 +09:00
David Yip
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
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 .
2018-01-08 09:45:59 -06:00
kibigo!
a38bd57f8a
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
kibigo!
b5874c1428
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
Ondřej Hruška
07ea1aa6fe
fixed ctrl enter
2018-01-06 19:58:04 +01:00
Ondřej Hruška
9f29fd31ba
fixed ctrl enter
2018-01-06 19:58:04 +01:00
Ondřej Hruška
568c9272ff
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
Ondřej Hruška
53caab0c0b
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
ncls7615
aa02511e1c
Update ja.js
2018-01-07 01:51:49 +09:00
ncls7615
f5a4201ad8
Update ja.js
2018-01-07 01:51:49 +09:00
beatrix
ed5d06c7e7
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
beatrix
a251c42192
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
beatrix
45487e8862
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
beatrix
2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
beatrix
34b7208e3f
appease eslint
2018-01-06 10:30:49 -05:00
beatrix
fa92e88fb2
appease eslint
2018-01-06 10:30:49 -05:00
ncls7615
896830cc57
Fix search popout
2018-01-06 21:50:11 +09:00
ncls7615
da98c33161
Fix search popout
2018-01-06 21:50:11 +09:00
David Yip
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
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.)
2018-01-06 03:01:11 -06:00
kibigo!
25da6ed5c1
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
kibigo!
c71d848855
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
kibigo!
e5a10a1fd3
Threaded mode~
2018-01-05 21:16:43 -08:00
kibigo!
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
kibigo!
85ffb07656
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
kibigo!
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
kibigo!
77cb2d04f9
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
kibigo!
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
kibigo!
0e418264fb
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
kibigo!
8bf9d9362a
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
beatrix
5500346b79
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
beatrix
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
beatrix
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
beatrix
b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
2018-01-05 18:29:40 -05:00
beatrix
f6ed878ee9
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
beatrix
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
cwm
17034d36cf
add key to lists div
2018-01-05 09:00:48 -06:00
cwm
9fc08e4861
add key to lists div
2018-01-05 09:00:48 -06:00
cwm
56429e7ca9
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
cwm
6236577734
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
kibigo!
55ead6a4b2
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
kibigo!
d7ce339c2e
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
kibigo!
7a9aaf28c4
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
kibigo!
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
kibigo!
0cb97608c7
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
kibigo!
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
kibigo!
c560373d5e
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
kibigo!
083170bec7
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
kibigo!
c20717bd9f
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
kibigo!
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
kibigo!
49d8d72192
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
kibigo!
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
kibigo!
f87cce9e28
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
kibigo!
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
Marcin Mikołajczak
1ba0732b82
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
Marcin Mikołajczak
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
cwm
d5770ef7ac
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
cwm
72b99f6ee4
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
cwm
a4ae9c4109
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
cwm
4ce44ba470
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
cwm
093c27fe46
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
cwm
0dce26b82b
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
cwm
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
cwm
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
beatrix
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
beatrix
7347bc7334
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
cwm
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
cwm
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
cwm
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
cwm
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
cwm
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
cwm
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
cwm
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
cwm
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
cwm
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
cwm
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
cwm
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
cwm
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
cwm
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cwm
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cwm
15796d0b5f
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
cwm
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
cwm
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
cwm
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
beatrix
9ba54d457a
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
beatrix
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
ncls7615
4c682228ce
Fix account header avatar
2017-12-22 07:12:49 +09:00
ncls7615
191b625a27
Fix account header avatar
2017-12-22 07:12:49 +09:00
David Yip
d93f6b4720
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
David Yip
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
cwm
f923aeec08
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
cwm
d736739e8f
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
David Yip
c94a497ef6
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
David Yip
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
cwm
ca77c18c24
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
cwm
9042f9a813
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
ncls7615
58e3bd4d71
Add en and ja
2017-12-19 20:16:48 +09:00
ncls7615
d3b2677775
Add en and ja
2017-12-19 20:16:48 +09:00
cwm
5b185a0a0f
missed a semicolon
2017-12-17 22:21:15 -06:00
cwm
14aae9c05c
missed a semicolon
2017-12-17 22:21:15 -06:00
cwm
1dd4e3791f
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
cwm
be50e45a74
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
cwm
d6ca0e29a7
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
cwm
e4ebbf4f07
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
ncls7615
82bff179f4
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
ncls7615
9e8fa3caee
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
kibigo!
e59d124be5
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
kibigo!
e677dda07c
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
NCLS
cbc2f1ea5d
Update ja.js
2017-12-15 19:43:10 +09:00
NCLS
e9a5bde9a0
Update ja.js
2017-12-15 19:43:10 +09:00
NCLS
b9d1543f7e
Update ja.js
2017-12-15 19:38:13 +09:00
NCLS
61ed5b972c
Update ja.js
2017-12-15 19:38:13 +09:00
cwm
f464eefc45
code style fixes
2017-12-12 23:07:12 -06:00
cwm
17e53b931c
code style fixes
2017-12-12 23:07:12 -06:00
cwm
430733477c
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
cwm
9719983f2d
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
cwm
2fa762ef0a
travis fixes
2017-12-12 08:50:31 -06:00
cwm
b6ded7119e
travis fixes
2017-12-12 08:50:31 -06:00
cwm
6cbf55ce7b
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
c746388452
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
975d888f5c
add components to getting started column
2017-12-12 00:01:17 -06:00
cwm
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
ncls7615
6bfbeb1fe1
add ja
2017-12-12 13:13:54 +09:00
ncls7615
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
beatrix
af0031fe1b
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
beatrix
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
ncls7615
58a133978b
remove picture
2017-12-11 13:52:17 +09:00
ncls7615
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
kibigo!
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
kibigo!
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
beatrix
252de634bb
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
beatrix
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
ncls7615
b07111ceba
add comma
2017-12-11 09:50:52 +09:00
ncls7615
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
ncls7615
3e6949b554
" => '
2017-12-11 09:46:17 +09:00
ncls7615
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
ncls7615
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
ncls7615
a98b0a47ef
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
cwm
2f56e7e00d
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
cwm
0466aa8d08
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
cwm
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
cwm
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
cwm
06c490be96
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
cwm
eec5d350fd
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
kibigo!
bb65adc0c0
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
kibigo!
cd107e92cb
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
kibigo!
b27126f1d6
Linting fixes
2017-12-10 11:08:04 -08:00
kibigo!
6b7085a33e
Linting fixes
2017-12-10 11:08:04 -08:00
kibigo!
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
kibigo!
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
kibigo!
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
kibigo!
d08d0f9f33
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
cwm
4b9fa497c6
removed one last app settings addition
2017-12-10 09:25:44 -06:00
cwm
066458a659
removed one last app settings addition
2017-12-10 09:25:44 -06:00
cwm
0d6a515145
removed app settings additions
2017-12-10 09:10:47 -06:00
cwm
7a8711ccac
removed app settings additions
2017-12-10 09:10:47 -06:00
cwm
7a066e814b
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
cwm
8606e53384
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
cwm
c47e5232bd
remove trailing spaces
2017-12-09 12:41:24 -06:00
cwm
c5a688d70e
remove trailing spaces
2017-12-09 12:41:24 -06:00
cwm
ac42b2b95d
fixes, functioning now
2017-12-09 12:06:00 -06:00
cwm
22cdbca82c
fixes, functioning now
2017-12-09 12:06:00 -06:00
cwm
7ff586054c
added a few more things
2017-12-09 11:21:41 -06:00
cwm
a489e5d5cd
added a few more things
2017-12-09 11:21:41 -06:00
cwm
09c82d4343
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
cwm
baf9ea8018
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
cwm
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
cwm
abe95b614b
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
cwm
f42a622bf9
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
cwm
02d71c6a11
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
cwm
591a3769f4
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
cwm
4a5401a58e
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
cwm
a762aa7933
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
cwm
28423dd046
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
cwm
2668d56334
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
cwm
b165950ca7
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
cwm
0fbf7f2838
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
cwm
47157e07b2
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
cwm
f6634f4fdc
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
cwm
f44c8fd130
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
kibigo!
f9387aabaa
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
kibigo!
9cdd81e9dd
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
kibigo!
31674d5083
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
kibigo!
96126a5b01
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
David Yip
82cd4a0a3c
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 6bb4fb008a
2017-12-06 22:35:45 -06:00
David Yip
67d625c42d
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 432761f375
2017-12-06 22:35:45 -06:00
David Yip
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
David Yip
935c1944e2
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
kibigo!
8dc8ea2c0a
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
kibigo!
2f2467ce8e
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
David Yip
08290b0b02
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
David Yip
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
David Yip
1221e3075d
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
David Yip
d9800a5647
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
kibigo!
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
kibigo!
bc4fa6b198
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
