Thibaut Girka
c91d9b7389
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
2018-10-01 12:43:20 +02:00
Eugen Rochko
db1a581491
Double the threshold for "read more" functionality ( #8835 )
2018-10-01 03:38:10 +02:00
Eugen Rochko
5d5d1b528e
Double the threshold for "read more" functionality ( #8835 )
2018-10-01 03:38:10 +02:00
Spencer Alves
981a41ca2c
Add option to hide action bar in collapsed toots
2018-09-30 08:31:50 +02:00
Spencer Alves
4e60a0d543
Add option to hide action bar in collapsed toots
2018-09-30 08:31:50 +02:00
David Yip
d698c06aa8
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility
...
Port various accessibility improvements from upstream
2018-09-29 19:01:19 -05:00
David Yip
c065717b67
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility
...
Port various accessibility improvements from upstream
2018-09-29 19:01:19 -05:00
David Yip
278d21bb0b
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection
...
Make pre-selection of usernames optional when replying to a toot
2018-09-29 19:01:05 -05:00
David Yip
2bb3c8c944
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection
...
Make pre-selection of usernames optional when replying to a toot
2018-09-29 19:01:05 -05:00
David Yip
dc8da22a73
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view
...
Scroll to textarea when composing a toot
2018-09-29 19:00:31 -05:00
David Yip
19968912fa
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view
...
Scroll to textarea when composing a toot
2018-09-29 19:00:31 -05:00
David Yip
a469f72e3b
Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button
...
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
2018-09-29 19:00:06 -05:00
David Yip
5b43d7bcbf
Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button
...
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
2018-09-29 19:00:06 -05:00
Yamagishi Kazutoshi
78558e5e1c
Fix that Rails.cache information could not be sent via StatsD ( #8831 )
2018-09-30 00:05:59 +02:00
Yamagishi Kazutoshi
65f04e6046
Fix that Rails.cache information could not be sent via StatsD ( #8831 )
2018-09-30 00:05:59 +02:00
Eugen Rochko
0c47219e3a
Support /.well-known/change-password ( #8828 )
...
Fix #8771
2018-09-29 19:14:48 +02:00
Eugen Rochko
1e75e74f6b
Support /.well-known/change-password ( #8828 )
...
Fix #8771
2018-09-29 19:14:48 +02:00
Eugen Rochko
92e5d6b6e5
Fix timeline pagination ( #8827 )
...
Ruby's ** operator does not play well with non-Hash objects, which
the params slice is
Fix #8821
2018-09-29 19:03:33 +02:00
Eugen Rochko
6c835085a3
Fix timeline pagination ( #8827 )
...
Ruby's ** operator does not play well with non-Hash objects, which
the params slice is
Fix #8821
2018-09-29 19:03:33 +02:00
Eugen Rochko
09016dbda4
Adjust bootsnap configuration for newer version ( #8826 )
2018-09-29 18:34:36 +02:00
Eugen Rochko
e09301f414
Adjust bootsnap configuration for newer version ( #8826 )
2018-09-29 18:34:36 +02:00
Eugen Rochko
20beab56e4
Fix tootctl accounts reattaching not unsuspending deleted account ( #8812 )
2018-09-29 18:40:40 +09:00
Eugen Rochko
ac07bfb018
Fix tootctl accounts reattaching not unsuspending deleted account ( #8812 )
2018-09-29 18:40:40 +09:00
Masoud Abkenar
bf20094a3f
RTL: fix margins: public-layout.header.nav-button ( #8823 )
...
* RTL: fix margins: public-layout.header.nav-button
* add empty line to meet style guides
2018-09-29 11:04:26 +09:00
Masoud Abkenar
df2f4052b8
RTL: fix margins: public-layout.header.nav-button ( #8823 )
...
* RTL: fix margins: public-layout.header.nav-button
* add empty line to meet style guides
2018-09-29 11:04:26 +09:00
Thibaut Girka
3e1d2c70f7
Fix build status link in README.md
...
It was still linking to Travis, oops.
2018-09-28 21:18:04 +02:00
Thibaut Girka
76b8ae044d
Fix build status link in README.md
...
It was still linking to Travis, oops.
2018-09-28 21:18:04 +02:00
Thibaut Girka
e7ddcf50ab
Make pre-selection of usernames optional when replying to a toot
...
Fixes #751
2018-09-28 21:01:09 +02:00
Thibaut Girka
86b2b009dd
Make pre-selection of usernames optional when replying to a toot
...
Fixes #751
2018-09-28 21:01:09 +02:00
Thibaut Girka
39b29ae6eb
Fix styling issue in “Compose box options” local settings page
2018-09-28 18:55:44 +02:00
Thibaut Girka
15134beb1e
Fix styling issue in “Compose box options” local settings page
2018-09-28 18:55:44 +02:00
Thibaut Girka
d27b7d7645
Scroll to textarea when composing a toot
2018-09-28 18:44:55 +02:00
Thibaut Girka
9594c68532
Scroll to textarea when composing a toot
2018-09-28 18:44:55 +02:00
Thibaut Girka
c454db6f11
[Glitch] Adjust beforeUnload conditions
...
Port 05f90e3695
to glitch-soc
2018-09-28 17:09:25 +02:00
Thibaut Girka
fa18859b20
[Glitch] Adjust beforeUnload conditions
...
Port 05f90e3695
to glitch-soc
2018-09-28 17:09:25 +02:00
Thibaut Girka
acf5099504
Fix maxCharacters in vanilla front-end
2018-09-28 17:05:19 +02:00
Thibaut Girka
abffbba819
Fix maxCharacters in vanilla front-end
2018-09-28 17:05:19 +02:00
Eugen Rochko
ea769a7d02
Fix class autoloading issue in ActivityPub::Activity::Create ( #8820 )
2018-09-28 17:02:53 +02:00
Eugen Rochko
ef69c655cc
Fix class autoloading issue in ActivityPub::Activity::Create ( #8820 )
2018-09-28 17:02:53 +02:00
dependabot[bot]
a976cb4b04
Bump strong_migrations from 0.2.2 to 0.2.3 ( #8818 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.2...v0.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:35:44 +02:00
dependabot[bot]
e02c45941d
Bump strong_migrations from 0.2.2 to 0.2.3 ( #8818 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.2...v0.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:35:44 +02:00
dependabot[bot]
20af1615c1
Bump oj from 3.5.1 to 3.6.11 ( #8815 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.5.1 to 3.6.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:34:31 +02:00
dependabot[bot]
5da51771cd
Bump oj from 3.5.1 to 3.6.11 ( #8815 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.5.1 to 3.6.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:34:31 +02:00
dependabot[bot]
7ea3526554
Bump bootsnap from 1.3.0 to 1.3.2 ( #8816 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.0 to 1.3.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.0...v1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:33:10 +02:00
dependabot[bot]
b6985482f7
Bump bootsnap from 1.3.0 to 1.3.2 ( #8816 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.0 to 1.3.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.0...v1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:33:10 +02:00
dependabot[bot]
3804744368
Bump simple_form from 4.0.0 to 4.0.1 ( #8814 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:32:40 +02:00
dependabot[bot]
ec745b32de
Bump simple_form from 4.0.0 to 4.0.1 ( #8814 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:32:40 +02:00
Eugen Rochko
6dd97b97be
Add tootctl accounts backup ( #8811 )
2018-09-28 03:34:24 +02:00
Eugen Rochko
38f5f9cf5b
Add tootctl accounts backup ( #8811 )
2018-09-28 03:34:24 +02:00
Eugen Rochko
5ddcdf3753
Support min_id-based pagination in REST API ( #8736 )
...
* Allow min_id pagination in Feed#get
* Add min_id pagination to home and list timeline APIs
* Add min_id pagination to account statuses, public and tag APIs
* Remove unused stub in reports API
* Use min_id pagination in notifications, favourites, and fix order
* Fix HomeFeed#from_database not using paginate_by_id
2018-09-28 02:23:45 +02:00