Claire
536892b8ae
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-21 13:52:03 +02:00
Takeshi Umeda
b1d4f21db0
[Glitch] Fix not to show follow button in global suggestion
...
Port baed52c2a7
2021-04-21 13:50:51 +02:00
Takeshi Umeda
72eac238ba
[Glitch] Fix to update suggestion list after dismiss
...
Port 9bb3341849
2021-04-21 13:50:51 +02:00
Claire
8fc0b592cb
[Glitch] Add border to 🚲 emoji
...
Port front-end changes from e78d06eecf
2021-04-21 13:50:51 +02:00
Eugen Rochko
e6501d5112
[Glitch] Add cold-start follow recommendations
...
Port front-end changes from f7117646af
2021-04-21 13:50:51 +02:00
Claire
2c322addf3
Hide floating action button on onboarding page ( #16082 )
2021-04-20 21:28:01 +02:00
Eugen Rochko
7762d3d275
Change follow recommendations to be limited to 20 instead of 40 in web UI ( #16077 )
2021-04-20 15:07:51 +02:00
Claire
e2a2bc9021
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
Not really a conflict, upstream change (removing the spam checker) too close
to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
Same.
- `app/services/remove_status_service.rb`:
Same.
- `app/views/admin/settings/edit.html.haml`:
Same.
- `config/settings.yml`:
Same.
- `config/environments/production.rb`:
Not a real conflict, upstream added a default HTTP header, but we have
extra headers in glitch-soc.
Added the header.
2021-04-20 12:17:14 +02:00
Eugen Rochko
b5ac17c4b6
Fix newlines not being considered sentence separators in account note ( #16079 )
...
Also bullets
2021-04-20 02:34:08 +02:00
Eugen Rochko
bf903dc510
Change onboarding by replacing tutorial with follow recommendations in web UI ( #16060 )
2021-04-19 14:45:15 +02:00
Takeshi Umeda
baed52c2a7
Fix not to show follow button in global suggestion ( #16045 )
...
* Fix not to show follow button in global suggestion
* Fix style
2021-04-16 10:06:42 +02:00
Takeshi Umeda
9bb3341849
Fix to update suggestion list after dismiss ( #16044 )
...
* Fix to update suggestion list after dismiss
* Change to inline
* Fix style
2021-04-16 10:06:16 +02:00
Claire
e78d06eecf
Add border to 🚲 emoji ( #16035 )
2021-04-13 23:43:51 +02:00
Eugen Rochko
f7117646af
Add cold-start follow recommendations ( #15945 )
2021-04-12 12:37:14 +02:00
Eugen Rochko
2ae8c41e5d
[Glitch] Add system checks to dashboard in admin UI
...
Port SCSS changes from 487e37d6d4
2021-04-05 14:34:36 +02:00
Claire
6be0b4b014
[Glitch] Fix crash in old browsers
...
Port abad99fa10
2021-04-05 14:33:42 +02:00
Claire
c901ae77d4
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-05 14:31:07 +02:00
Noiob
39b9a0619a
Remove superfluous toot length check
2021-04-05 14:30:43 +02:00
Eugen Rochko
487e37d6d4
Add system checks to dashboard in admin UI ( #15989 )
2021-04-03 14:12:30 +02:00
Claire
abad99fa10
Fix crash in old browsers ( #15985 )
...
Fixes #15984
2021-04-01 00:00:12 +02:00
Claire
15efa32cca
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-31 10:34:29 +02:00
Marcin Mikołajczak
f8e50eaea3
Add transition to media modal background ( #15843 )
...
* Add transition to media modal background
* use reduceMotion
* Move background color transition into css
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
2021-03-24 13:51:32 +01:00
Claire
5ea53b6158
[Glitch] Fix compose form behavior in mobile view
...
Port 034f37b85a
2021-03-24 11:21:21 +01:00
dependabot[bot]
b61e44461c
[Glitch] Bump react-select from 3.2.0 to 4.0.2
...
Add cacheKey to NonceProvider for react-select
Port changes from c3aef491d6
2021-03-24 11:01:57 +01:00
Claire
f60c99a8fb
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-24 10:53:50 +01:00
Claire
034f37b85a
Fix compose form behavior in mobile view ( #15555 )
...
* Fix ComposeForm being mounted twice in mobile view
Fixes #13094
* Fix compose form focus and pre-selection behavior in mobile view
* Split _updateFocusAndSelection out of componentDidUpdate
2021-03-24 10:19:07 +01:00
dependabot[bot]
c3aef491d6
Bump react-select from 3.2.0 to 4.0.2 ( #15624 )
...
* Bump react-select from 3.2.0 to 4.0.2
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.2.0 to 4.0.2.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
* Add cacheKey to NonceProvider for react-select
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-03-22 15:41:47 +09:00
Claire
5d48402be1
Fixing the hero widget ( #15926 )
...
* Removing last-child padding conflicts with light theme in hero widget
* Add missing background color to widget
* Reset widget.scss to default
* Hope this works
Co-authored-by: koyu <me@koyu.space>
2021-03-19 20:23:32 +01:00
Claire
2bb573d021
Messing around with box-shadow
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:57 +01:00
Claire
e71f4d468b
Add more button states?
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:54 +01:00
Claire
200d7a1708
Change notification settings UI to be more compact
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-19 14:47:06 +01:00
Claire
3b7b607300
Migrate glitch-soc local notification settings to upstream system
2021-03-19 13:57:36 +01:00
Claire
db6551ec09
Add option to opt out of unread notification markers
...
Port 55ac2b9c60
2021-03-19 13:57:32 +01:00
Claire
3ad6ef72cb
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-19 13:57:15 +01:00
Claire
55ac2b9c60
Add option to opt out of unread notification markers ( #15842 )
...
Fixes #15133
2021-03-19 02:44:57 +01:00
Claire
318efa49de
Fix various CodeClimate warnings
2021-03-06 14:51:53 +01:00
Claire
7336276252
[Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character counting
...
Port 65db262550
2021-03-02 12:37:23 +01:00
Claire
7cffe8dca7
[Glitch] Add borders to 📱 and 📲 emojis
...
Port a8139ab016
2021-03-02 12:27:29 +01:00
Claire
974ddc28a3
[Glitch] Fix WebUI crashing when SVG support is disabled
...
Port 0635c8760d
2021-03-02 12:26:12 +01:00
Claire
d8fdbb054e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
conflict.
Applied upstream changes.
- `package.json`:
glitch-soc-only dependency textually too close to a dependency updated
upstream, not a real conflict.
Applied upstream changes.
2021-03-02 12:06:58 +01:00
Claire
65db262550
Update twitter-text from 1.14 to 3.1.0 and fix toot character counting ( #15382 )
...
* Update twitter-text from 1.14 to 3.1.0
* Disable emoji parsing
* Properly depend on twitter-text for url detection
* Fix some URLs being wrongly detected client-side
* Add test for server-side validation of non-autolinkable URLs
* Fix server-side status length counting
2021-03-02 12:02:56 +01:00
Claire
a8139ab016
Add borders to 📱 and 📲 emojis ( #15794 )
2021-03-01 21:22:54 +01:00
Claire
0635c8760d
Fix WebUI crashing when SVG support is disabled ( #15809 )
...
Fixes #14910
2021-02-28 01:01:34 +01:00
abcang
6ae04d990c
[Glitch] Fix default searchTokens
...
Port 2127f40e6b
2021-02-22 15:47:17 +01:00
Eugen Rochko
24fb5d7572
[Glitch] Add server rules
...
Port SCSS changes from 8331fdf7e0
2021-02-22 15:45:28 +01:00
Claire
679642e26c
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
abcang
2127f40e6b
Fix default searchTokens ( #15775 )
2021-02-22 11:26:08 +01:00
Eugen Rochko
8331fdf7e0
Add server rules ( #15769 )
2021-02-21 19:50:12 +01:00
Claire
49eef466b8
[Glitch] Add dropdown for boost privacy in boost confirmation modal
...
Port 07b46cb332
2021-02-12 12:31:49 +01:00
Claire
9213b02656
Refactor privacy dropdown to have an interface closer to upstream's
2021-02-12 12:04:04 +01:00
