Commit graph

38492 commits

Author SHA1 Message Date
Shlee
71baacb49a Update Dockerfile (#12997) 2020-01-28 20:33:09 +01:00
Sasha Sorokin
d0cc024ce9 Add missing translations (#12996)
This commit adds missing translations for #12966 and #12954.
2020-01-28 20:28:38 +01:00
Sasha Sorokin
0c611e3115 Add missing translations (#12996)
This commit adds missing translations for #12966 and #12954.
2020-01-28 20:28:38 +01:00
Thibaut Girka
26c449515e Add support for xmpp: and magnet: URIs to misleading link detection code 2020-01-28 20:25:56 +01:00
Thibaut Girka
cf5b769857 Add support for xmpp: and magnet: URIs to misleading link detection code 2020-01-28 20:25:56 +01:00
ThibG
93f1edd430 Merge pull request #1272 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-01-28 19:38:37 +01:00
ThibG
abe2cc489b
Merge pull request #1272 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-01-28 19:38:37 +01:00
Eugen Rochko
4dc279fb9e [Glitch] Fix design of announcements in admin UI
Port 6c643bed6a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:47 +01:00
Eugen Rochko
8bb5d1abaa [Glitch] Fix design of announcements in admin UI
Port 305abc9e05 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:47 +01:00
Eugen Rochko
3ecc114ec6 [Glitch] Change announcements to be collapsed on page load in web UI
Port 5bc109eeb7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:06 +01:00
Eugen Rochko
ed5fb51168 [Glitch] Change announcements to be collapsed on page load in web UI
Port 0fcc4b1c56 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28 19:17:06 +01:00
Thibaut Girka
fbf97961fc Merge branch 'master' into glitch-soc/merge-upstream 2020-01-28 19:15:03 +01:00
Thibaut Girka
44744e3ce1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-28 19:15:03 +01:00
ThibG
4e90375279 Fix Gemfile.lock (#12995)
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues

* Fix deprecation warnings

* Fix Gemfile.lock

* More changes to catch Gemfile.lock issues
2020-01-28 18:50:44 +01:00
ThibG
1051de0165 Fix Gemfile.lock (#12995)
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues

* Fix deprecation warnings

* Fix Gemfile.lock

* More changes to catch Gemfile.lock issues
2020-01-28 18:50:44 +01:00
Eugen Rochko
1e836349a0 Update changelog for 3.1.0rc1 (#12992) 2020-01-28 17:19:42 +01:00
Eugen Rochko
8071b71b9f
Update changelog for 3.1.0rc1 (#12992) 2020-01-28 17:19:42 +01:00
Shlee
4533a6c264 Bump Rack from 2.0.8 to 2.1.2 (#12991)
* Update Gemfile

* Update Gemfile.lock
2020-01-28 15:23:16 +01:00
Shlee
720fee0685 Bump Rack from 2.0.8 to 2.1.2 (#12991)
* Update Gemfile

* Update Gemfile.lock
2020-01-28 15:23:16 +01:00
Sasha Sorokin
cce0870311 Fix regressions caused by #12961 (#12961)
This commit attempts to fix most of regressions caused by #12961
pull request which added even spread of space between tabs.

The following fixes were done:

- Don't hide overflow in tabs

   As tabs use ::after and ::before pseudo-elements to create arrow on
   the bottom of selected tab, "overflow: hidden" will cause this arrow
   to look split from the bottom container.

   For the future we probably should use slider element instead, which
   would align according to currently selected tab, instead of relying
   on pseudo-elements. Such method would also allow smooth transitions.

- Disallow wrapping tab text on insufficient space

   This would fix some unwanted behavior[1] when on insufficient width,
   renderer might attempt wrapping text to not overtake others' space.

   [1]: https://mastodon.social/@Gargron/103546083813829165
2020-01-28 02:21:18 +01:00
Sasha Sorokin
04459687f8 Fix regressions caused by #12961 (#12961)
This commit attempts to fix most of regressions caused by #12961
pull request which added even spread of space between tabs.

The following fixes were done:

- Don't hide overflow in tabs

   As tabs use ::after and ::before pseudo-elements to create arrow on
   the bottom of selected tab, "overflow: hidden" will cause this arrow
   to look split from the bottom container.

   For the future we probably should use slider element instead, which
   would align according to currently selected tab, instead of relying
   on pseudo-elements. Such method would also allow smooth transitions.

- Disallow wrapping tab text on insufficient space

   This would fix some unwanted behavior[1] when on insufficient width,
   renderer might attempt wrapping text to not overtake others' space.

   [1]: https://mastodon.social/@Gargron/103546083813829165
2020-01-28 02:21:18 +01:00
Eugen Rochko
6c643bed6a Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
Eugen Rochko
305abc9e05
Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
Eugen Rochko
5bc109eeb7 Change announcements to be collapsed on page load in web UI (#12990) 2020-01-28 02:20:47 +01:00
Eugen Rochko
0fcc4b1c56
Change announcements to be collapsed on page load in web UI (#12990) 2020-01-28 02:20:47 +01:00
ThibG
b1ccf0609d Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-01-27 17:26:53 +01:00
ThibG
67b8af34b3
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-01-27 17:26:53 +01:00
Eugen Rochko
f64a9ae775 [Glitch] Change number animations direction based on decrease or increase
Port d67f2c1c25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:06:03 +01:00
Eugen Rochko
cf230d551f [Glitch] Change number animations direction based on decrease or increase
Port 10e209d8e0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:06:03 +01:00
Eugen Rochko
4a882562c6 [Glitch] Add animations to announcement reactions
Port 1130c5167c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:05:37 +01:00
Eugen Rochko
b0139dcf5e [Glitch] Add animations to announcement reactions
Port dd4eec6bf6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:05:37 +01:00
ThibG
51bd2205a1 [Glitch] Change last_status_at to be a date, not datetime
Port d9cdd58423 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:03:24 +01:00
ThibG
41d0869d7f [Glitch] Change last_status_at to be a date, not datetime
Port 42d2a915e4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:03:24 +01:00
Eugen Rochko
c7cdca7afb [Glitch] Fix link colors in announcements
Port 3ae0b03603 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:46 +01:00
Eugen Rochko
187a822074 [Glitch] Fix link colors in announcements
Port 2f8c3c17ee to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:46 +01:00
Eugen Rochko
a20b14b6b4 [Glitch] Add streaming API updates for announcements being modified or deleted
Port dd68e44cfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:06 +01:00
Eugen Rochko
e36d0a98cc [Glitch] Add streaming API updates for announcements being modified or deleted
Port b9d74d4076 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 16:01:06 +01:00
ThibG
042964971f [Glitch] Fix status overflowing in report dialog
Port 8f37f20ff9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 15:59:25 +01:00
ThibG
8a8936725e [Glitch] Fix status overflowing in report dialog
Port 389e3f6094 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27 15:59:25 +01:00
Thibaut Girka
9604766a18 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
Thibaut Girka
c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
Eugen Rochko
87098751c4 Revert "Avoid using uppercase text-transform (#12684)" (#12987)
This reverts commit d0ab8d2d0f.
2020-01-27 13:44:29 +01:00
Eugen Rochko
c2dfd5e4e2
Revert "Avoid using uppercase text-transform (#12684)" (#12987)
This reverts commit 7da54001fe.
2020-01-27 13:44:29 +01:00
Daigo 3 Dango
da7c7cba19 Explicitly install rack gem (#12972)
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:

```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```
2020-01-27 11:06:34 +01:00
Daigo 3 Dango
7b8e0d3477 Explicitly install rack gem (#12972)
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:

```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```
2020-01-27 11:06:34 +01:00
Eugen Rochko
9fb8165712 Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +01:00
Eugen Rochko
663ea84b08
Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +01:00
Eugen Rochko
0cc5eb50dd Fix interactive delays in database migrations with no TTY (#12969)
Fix #12587
2020-01-27 11:04:42 +01:00
Eugen Rochko
4363d06986
Fix interactive delays in database migrations with no TTY (#12969)
Fix #12587
2020-01-27 11:04:42 +01:00
Eugen Rochko
d67f2c1c25 Change number animations direction based on decrease or increase (#12971) 2020-01-27 11:04:11 +01:00