Commit graph

11516 commits

Author SHA1 Message Date
ThibG
a33262b5b8 Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-02-03 10:27:07 +01:00
ThibG
e571f7005e [Glitch] Change how unread announcements are handled
Port 99cf92a3cf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:31:32 +01:00
Sasha Sorokin
f0aef12b12 [Glitch] Add "Show thread" button to public profiles
Port 864c9a2141 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:30:13 +01:00
Eugen Rochko
77e5732816 [Glitch] Fix mascot being too large, and a code style issue
Port 7774ac36e5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03 09:27:51 +01:00
Thibaut Girka
e76a010414 Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
ThibG
99cf92a3cf Change how unread announcements are handled (#13020)
* Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read

* Change how unread announcements are counted in UI

* Add unread marker to announcements and mark announcements as unread as they are displayed

* Fixups
2020-02-03 01:53:09 +01:00
Thibaut Girka
947645c355 When submitting markers, use last displayed notification, not last received one 2020-02-01 19:53:01 +01:00
Thibaut Girka
8c5689775f Fetch last read notification id to update unread notification count on load 2020-02-01 19:53:01 +01:00
abcang
94bc823eb6 Search account domain in lowercase (#13016)
* Search account domain in lowercase

* fix rubocop error

* fix spec/models/account_spec.rb
2020-02-01 15:42:24 +01:00
Renato "Lond" Cerqueira
9e7b2242f7 Fix error when sending moderation notification (#13014)
Since the statuses helper is not loaded, the rtl helper cannot be found
and the email cannot be sent.
2020-02-01 15:42:12 +01:00
Даниил Пронин
fe90bfa207 Fix Node version in Vagrant (#13008) 2020-01-30 12:05:56 +01:00
ThibG
b290b5880d Fix english wording (#13003) 2020-01-29 18:39:44 +01:00
Sasha Sorokin
864c9a2141 Add "Show thread" button to public profiles (#13000)
This adds "Show thread" button to the status view which is used in
profiles. The logic to display the button is mimicking logic in
web app available at app/javascript/mastodon/components/status.js#L439.

* The little change in components CSS required to remove enforced
  underline for all links on public pages on our button.
2020-01-29 17:35:54 +01:00
Eugen Rochko
7774ac36e5 Fix mascot being too large, and a code style issue (#13002) 2020-01-29 16:18:33 +01:00
Eugen Rochko
6355996c4b Bump version to 3.1.0rc2 (#12999) 2020-01-28 20:56:32 +01:00
Shlee
4f80dd3e26 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
Thibaut Girka
26c449515e 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
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
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
Thibaut Girka
fbf97961fc 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
Eugen Rochko
1e836349a0 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
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
Eugen Rochko
6c643bed6a 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
ThibG
b1ccf0609d 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
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
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
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
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
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
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
Eugen Rochko
87098751c4 Revert "Avoid using uppercase text-transform (#12684)" (#12987)
This reverts commit d0ab8d2d0f.
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
Eugen Rochko
9fb8165712 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
d67f2c1c25 Change number animations direction based on decrease or increase (#12971) 2020-01-27 11:04:11 +01:00
Eugen Rochko
1130c5167c Add animations to announcement reactions (#12970) 2020-01-27 11:03:45 +01:00
ThibG
d9cdd58423 Change last_status_at to be a date, not datetime (#12966)
* Return last_status_at as date, not datetime

* Fix relative timestamp for dates when delay is inferior to 1 day

* Also fix public directory

* Fix error when last_status_at isn't set
2020-01-26 23:13:48 +01:00
Eugen Rochko
9d3bba9576 Fix expired announcements being re-published (#12964) 2020-01-26 22:43:18 +01:00
Eugen Rochko
3ae0b03603 Fix link colors in announcements (#12965) 2020-01-26 22:26:50 +01:00
Eugen Rochko
dd68e44cfa Add streaming API updates for announcements being modified or deleted (#12963)
Change `all_day` to be a visual client-side cue only

Publish immediately if `scheduled_at` is in the past

Add `published_at` and `updated_at` to announcements JSON
2020-01-26 20:07:26 +01:00
Thibaut Girka
9f924a3283 Refactor notifications cleaning mode 2020-01-26 14:55:03 +01:00
ButterflyOfFire
4bacf6aa2f Add kabyle language to Mastodon (#12962)
* Add kabyle language to settings_helper

* Adding kabyle language to application.rb
2020-01-26 14:42:35 +01:00
ThibG
8f37f20ff9 Fix status overflowing in report dialog (#12959)
Fixes #12942
2020-01-25 22:59:00 +01:00
ThibG
bfa5de08dd Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-01-25 20:31:22 +01:00