0f97c82eac
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
07367bc6ec
Fix file upload
2019-04-24 07:57:28 +02:00
86108e7af7
Fix settings modal
2019-04-23 18:31:13 +02:00
72f3242a59
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
2019-04-23 04:39:21 +02:00
2d2eca5bda
Do not leak local-only toots to remote mentioned users
2019-04-22 23:37:50 +02:00
2ad61962ae
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
2019-04-22 23:07:27 +02:00
9aeb714b7a
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
fea727c61a
Do not switch to italic for status media buttons
2019-04-22 23:07:14 +02:00
22ad8c89b2
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
2019-04-22 23:07:14 +02:00
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
2019-04-22 22:57:39 +02:00
6f85bb754b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
1b8d2af1f9
Fix ReferenceError in dropdown
2019-04-22 20:15:47 +02:00
25cfabce26
Fix broken reference to handleSubmit
2019-04-22 20:15:47 +02:00
041e27bd2d
Cleanup
2019-04-22 20:15:47 +02:00
2ee26ba420
Move ComposerPublisher to Compose
2019-04-22 20:15:47 +02:00
bf8b0394b7
Add OptionsContainer
2019-04-22 20:15:47 +02:00
ef17da32f9
Move composer Dropdown from features/composer to features/compose
2019-04-22 20:15:47 +02:00
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
2019-04-22 20:15:47 +02:00
08faf16d66
ComposerTextarea → AutosuggestTextarea
2019-04-22 20:15:47 +02:00
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
2019-04-22 20:15:47 +02:00
f7d1772fc8
Move PollForm from features/composer to features/compose
2019-04-22 20:15:47 +02:00
2021f14e8f
Inline spoiler input
2019-04-22 20:15:47 +02:00
3529f6f4ae
ComposerReply → ReplyIndicator
2019-04-22 20:15:47 +02:00
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
2019-04-22 20:15:47 +02:00
5e4588524b
features/composer/index.js → ComposeForm
2019-04-22 20:15:47 +02:00
8ea0e64864
DrawerHeader → Header + HeaderContainer
2019-04-22 20:15:47 +02:00
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
2019-04-22 20:15:47 +02:00
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
2019-04-22 20:15:47 +02:00
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
2019-04-22 20:15:47 +02:00
7c2cc9d681
Rework DrawerResults to make them closer to upstream
2019-04-22 20:15:47 +02:00
5264424b71
Move DrawerSearch to Search + SearchContainer
2019-04-22 20:15:47 +02:00
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
2019-04-22 20:15:47 +02:00
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
2019-04-22 20:15:47 +02:00
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
2019-04-22 20:15:47 +02:00
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
2019-04-22 14:56:14 +02:00
92ced1e94b
Fix modal items cannot scroll on touch devices ( #10605 )
2019-04-22 14:55:50 +02:00
3c6f8de45a
Minor code cleanup ( #10613 )
2019-04-22 14:55:24 +02:00
483aa50856
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs ( #10565 )
2019-04-21 04:53:24 +02:00
47c0af88f1
Add hi.json ( #10573 )
2019-04-21 04:52:20 +02:00
fe19e9d7b1
Update hy.json ( #10591 )
2019-04-21 04:48:47 +02:00
e3dda38c8b
Treat meta[property] as a space-separated list ( #10604 )
...
The @property attribute in HTML is a space-separated list of values.
This change normalizes whitespace and finds the desired value in
the list instead of requiring an exact single-value match.
More details:
https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
2019-04-21 04:48:19 +02:00
d7c34fb945
Animate avatar GIFs on-hover on public profiles ( #10549 )
...
* Third time is the charm?
* Use full asset URL for data-static and data-original
̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
2019-04-21 04:47:39 +02:00
f7cc05db80
Update NL (Dutch) translation ( #10601 )
...
* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml
2019-04-21 04:46:08 +02:00
1fecdb013a
Use correct local names for fonts ( #10594 )
2019-04-21 04:42:02 +02:00
1af37e09f3
Configrationable repository url ( #10600 )
...
* config: Add GITHUB_REPOSITORY for repository name
* config: Add SOURCE_BASE_URL for repository url
* Show source_url and repository name on getting started
2019-04-21 04:41:34 +02:00
2da3b24eb8
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port a6fe7ae53c
2019-04-19 10:48:54 +02:00
3673665b46
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
3f40442f49
Fix keybase indication on dashboard
2019-04-19 00:57:39 +02:00
c22175bb86
Allow turning keybase off instance-wide
2019-04-19 00:57:39 +02:00
619d55358f
Shift+click on column Back button to return to last pinable column
2019-04-17 18:40:40 +02:00
Thibaut Girka