58eeb92755
expanded notifications show like default
2018-03-22 10:20:36 -04:00
12b0ea0667
[Glitch] Cancel outdated pending compose suggestions
...
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
2018-03-20 14:20:17 +01:00
c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
...
fix compressed notifications again (#393 )
2018-03-19 15:41:09 -05:00
5b00b8f0da
fix .status__info__icons layout
2018-03-19 07:13:18 -04:00
a387f99659
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
c68c1466ac
fix compressed notifications again ( #393 )
2018-03-18 13:42:28 -04:00
fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
33d5fe889a
fix non-notification boosts
2018-03-16 18:36:35 -04:00
6f0e50f9a0
[Glitch] Federate pinned statuses over ActivityPub
...
Port 9110db41c5
2018-03-16 23:16:20 +01:00
cd73af3bd0
[Glitch] Improve style of web UI account tabs
...
Port of 38b9af76a2
2018-03-16 23:16:20 +01:00
f00af46d70
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port 5131012505
2018-03-16 23:16:20 +01:00
50f56ba375
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
a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
9c40a5f3c8
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
19f7bd1582
Show media on report UI
...
Ports 219aac7800
2018-03-16 15:27:13 +01:00
22870985da
Add close modal icon to report dialog ( #6591 )
...
Port 379cdfaac5
2018-03-16 15:27:13 +01:00
9cf574d0d2
Port federated reports UI to glitchsoc
...
Port 41a01bec23
2018-03-16 15:27:13 +01:00
9317f6853e
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00
22f2750578
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
2395a4c313
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
841ef606a9
Remove text requirement when media attached from statuses ( fixes #381 )
...
Ports cfa9b6e13a
2018-03-12 18:39:07 +01:00
25c5223617
Port #6627 and #6636 to glitch-soc
2018-03-09 12:10:22 +01:00
65e2a4645e
Use glitchsoc TimelineComponent's margin/padding on about page.
2018-03-03 11:16:10 -06:00
6176e278f4
Copy in new CSS for about page.
2018-03-03 11:01:24 -06:00
43cc79aaa0
Fix border-radius of owner avatar in /about/more
2018-02-25 23:27:32 +09:00
f2f19e1f8a
Update SCSS
2018-02-24 03:22:58 +09:00
7bff3243ae
Update columns.scss
2018-02-24 01:45:15 +09:00
ef1d46948a
Update containers.scss
2018-02-24 01:26:48 +09:00
82408904a1
Update index.scss
2018-02-24 01:25:49 +09:00
fa3641df7f
Update about.scss
2018-02-24 00:22:05 +09:00
fb6f131fa1
Revert 245816ab27 ( fixes #348 )
...
Since 245816ab27
2018-02-10 20:59:50 +01:00
15a5b3372a
Fix detailed-status
2018-02-04 10:35:09 +09:00
2107891edb
Remove some leftover code, I guess
2018-01-23 09:20:18 +01:00
0ddeed9377
add 'this.props' to fetchLists
2018-01-23 01:23:56 -06:00
939075899e
remove unused openOnboardingModal from getting_started
2018-01-22 19:38:34 -06:00
00be9eb3fe
merge tootsuite pr #6313 into glitch
2018-01-22 19:05:13 -06:00
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
2018-01-20 16:37:52 -06:00
24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
...
Merge upstream
2018-01-20 16:37:35 -06:00
3cae362214
Merge new onboarding styles; delete refs to PNGs.
2018-01-20 11:23:06 -06:00
1619efd735
Do not discard statuses obtained via websocket when API request finishes
...
This backports 0b888acfd4
2018-01-19 21:59:12 +01:00
1287b2782b
Display a warning when composing unlisted toots with something looking like a hashtag
...
This is a backport of b6af88192f
2018-01-19 12:59:33 +01:00
bcd86404da
Port 7badad7797 to glitch frontend
2018-01-18 10:25:37 -06:00
708ec07e27
Style fixes to make eslint happier, hopefully
2018-01-18 09:13:07 -06:00
cda845ae0e
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
8ee6ed358f
Increase priority of favstar gold
2018-01-14 16:05:44 -08:00
1ee0e91fb6
Fixes to notification styling
2018-01-14 15:48:54 -08:00
b9f4896830
Fixes to drawer and CWs
2018-01-14 15:31:00 -08:00
cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
...
SCSS Refactor
2018-01-14 17:48:02 -05:00
39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
...
Add glitchy elephant friend
2018-01-14 17:40:27 -05:00
0fb3bd09e9
Oops this should have been a part of last commit
2018-01-14 14:21:41 -08:00
1fa03e026a
Fixes onboarding modal ( #318 )
2018-01-14 14:13:24 -08:00
a5931e1f48
Fixed autocollapse detection
2018-01-14 13:29:51 -08:00
c2669f93d0
Fix eslint errors. #294 .
2018-01-14 05:56:43 -06:00
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.
2018-01-14 05:07:08 -06:00
e64cc311dd
Introduce a bit of luck into the elefriend selection. #294 .
2018-01-14 04:46:21 -06:00
53cbc9933e
Add wave background; blend elefriend in a bit more. #294 .
2018-01-14 04:00:21 -06:00
cd1377de7f
Bind click event to elefriend cycling. #294 .
2018-01-14 03:35:25 -06:00
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.
2018-01-14 03:06:11 -06:00
1e0b707018
Add the shrinking glitchy elefriend. #294 .
2018-01-13 21:27:39 -06:00
835eec8a4c
Prototype out glitchy elephant friend. #294 .
...
Glitched elephant friends kindly provided by @ncls7615.
2018-01-13 21:27:14 -06:00
f9b08e2142
Fix collapsed toot style
2018-01-14 11:13:55 +09:00
1ebe66b78c
Fix un-fullwidth media style
2018-01-14 11:07:32 +09:00
be2bac05aa
Fix media detailed style
2018-01-14 10:38:51 +09:00
b5476f6c75
Fix confirmation modal bug
2018-01-14 09:51:01 +09:00
bc0524834e
Fix letterbox bug
2018-01-14 09:25:35 +09:00
6ecf81cacf
Improve scss refactor 5
2018-01-14 09:17:38 +09:00
64425dbb77
Improve scss refactor 4
2018-01-14 09:12:10 +09:00
a16d885ac9
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
5f35b39f6f
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
bb2ca23839
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
a9be680807
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
6a73c8c8a2
Initial scss refactor
2018-01-14 03:41:20 +09:00
3a0b47982d
load public.js on vanilla#admin
2018-01-12 18:52:53 -08:00
9b9b7fa005
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
ee7217bc94
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
cf5789146b
Fix dropdown text
2018-01-12 23:18:25 +09:00
095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
35be02f21d
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
aef4b1af66
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
f43c2f12f3
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
9bdbe66316
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
b535f24fe5
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
0d4dcb5fb2
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
6d1c325167
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
7f4374d97d
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
8a0e4bb9a4
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
5963630c63
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
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
60433d03f5
Add missing comma
2018-01-08 18:38:28 -08:00
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
824a790e63
Threads now inherit privacy directly ( #309 )
2018-01-08 16:35:01 -08:00
ef0b7d1e76
fix list editor scss
2018-01-09 02:50:24 +09:00
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
b5874c1428
Fixes to search dropdown
2018-01-06 15:34:01 -08:00
61ef8d643e
fix typo in vanilla names.yml
2018-01-06 16:49:53 -05:00
9f29fd31ba
fixed ctrl enter
2018-01-06 19:58:04 +01:00
53caab0c0b
Fix the always-threaded bug
2018-01-06 19:55:53 +01:00
f5a4201ad8
Update ja.js
2018-01-07 01:51:49 +09:00
a251c42192
Merge pull request #296 from glitch-soc/thread-mode
...
Threaded mode~
2018-01-06 11:28:36 -05:00
2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
...
Fix search popout
2018-01-06 11:25:59 -05:00
fa92e88fb2
appease eslint
2018-01-06 10:30:49 -05:00
da98c33161
Fix search popout
2018-01-06 21:50:11 +09:00
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
c71d848855
my global .gitignore excluded this file ;_;
2018-01-05 21:40:02 -08:00
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
6932b464e6
Fixed improper dropdown func binding for #293 + toot button spacing
2018-01-05 21:02:53 -08:00
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
8bf9d9362a
Fixes composer mounting issue with #293
2018-01-05 18:30:06 -08:00
f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
2018-01-05 18:29:57 -05:00
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
faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
2018-01-05 18:29:08 -05:00
9fc08e4861
add key to lists div
2018-01-05 09:00:48 -06:00
6236577734
change how list ColumnLink keys are determined
2018-01-05 08:12:34 -06:00
d7ce339c2e
WIP <Compose> Refactor; Fin~
2018-01-04 21:17:30 -08:00
42f50049ff
WIP <Compose> Refactor; 1000 tiny edits
2018-01-04 18:33:13 -08:00
b4a3792201
WIP <Compose> Refactor; <ActionsModal>; dropdowns
2018-01-04 18:31:00 -08:00
083170bec7
WIP <Compose> Refactor; SCSS ed.
2018-01-04 18:23:46 -08:00
8713659dff
WIP <Compose> Refactor; <OnboardingModal> ed.
2018-01-04 18:21:59 -08:00
3c29f57404
WIP <Compose> Refactor; <Drawer> ed.
2018-01-04 18:21:59 -08:00
924ffe81d4
WIPgit status <Compose> Refactor; <Composer> ed.
2018-01-04 18:21:59 -08:00
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
72b99f6ee4
bug fix (tootsuite pr #6120 )
2017-12-31 08:26:50 -06:00
4ce44ba470
remove unused 'saveSettings' from column_settings_container
2017-12-30 16:42:26 -06:00
0dce26b82b
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
2017-12-30 11:45:01 -06:00
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
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
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
191b625a27
Fix account header avatar
2017-12-22 07:12:49 +09:00
7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
d736739e8f
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
9042f9a813
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
d3b2677775
Add en and ja
2017-12-19 20:16:48 +09:00
14aae9c05c
missed a semicolon
2017-12-17 22:21:15 -06:00
be50e45a74
use makeMapStateToProps
2017-12-17 22:00:25 -06:00
e4ebbf4f07
use list-ul icon in list header and web/lists
2017-12-17 21:25:18 -06:00
9e8fa3caee
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
e677dda07c
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
e9a5bde9a0
Update ja.js
2017-12-15 19:43:10 +09:00
61ed5b972c
Update ja.js
2017-12-15 19:38:13 +09:00
17e53b931c
code style fixes
2017-12-12 23:07:12 -06:00
9719983f2d
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
b6ded7119e
travis fixes
2017-12-12 08:50:31 -06:00
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
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
0466aa8d08
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
eec5d350fd
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
cd107e92cb
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
6b7085a33e
Linting fixes
2017-12-10 11:08:04 -08:00
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
d08d0f9f33
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
066458a659
removed one last app settings addition
2017-12-10 09:25:44 -06:00
7a8711ccac
removed app settings additions
2017-12-10 09:10:47 -06:00
8606e53384
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
c5a688d70e
remove trailing spaces
2017-12-09 12:41:24 -06:00
22cdbca82c
fixes, functioning now
2017-12-09 12:06:00 -06:00
a489e5d5cd
added a few more things
2017-12-09 11:21:41 -06:00
baf9ea8018
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
abe95b614b
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
02d71c6a11
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
4a5401a58e
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
28423dd046
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
b165950ca7
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
47157e07b2
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
f44c8fd130
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
9cdd81e9dd
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
96126a5b01
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
67d625c42d
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 432761f375
2017-12-06 22:35:45 -06:00
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
2f2467ce8e
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
d9800a5647
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
bc4fa6b198
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
Ash Levy
Thibaut Girka
David Yip
Ash Lea
Gô Shoemake
yuzulabo
imncls
cwm
beatrix
Marcin Mikołajczak
Ondřej Hruška