tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
11,360 Commits 20 Branches 113 Tags 222 MiB
553a16c6f8
Commit Graph

11360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
4cd2d13bd2 When submitting markers, use last displayed notification, not last received one 2020-02-01 19:53:01 +01:00
Thibaut Girka
e135b293fa Fetch last read notification id to update unread notification count on load 2020-02-01 19:53:01 +01:00
abcang
61a7390b66
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
37dc12dd53
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
Даниил Пронин
2f978abd87
Fix Node version in Vagrant (#13008) 2020-01-30 12:05:56 +01:00
ThibG
0fd2d2eee2
Fix english wording (#13003) 2020-01-29 18:39:44 +01:00
Sasha Sorokin
50cd73e5d7
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
bba0269d97
Fix mascot being too large, and a code style issue (#13002) 2020-01-29 16:18:33 +01:00
Eugen Rochko
60e160a02d
Bump version to 3.1.0rc2 (#12999) 2020-01-28 20:56:32 +01:00
Shlee
71baacb49a Update Dockerfile (#12997) 2020-01-28 20:33:09 +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
cf5b769857 Add support for xmpp: and magnet: URIs to misleading link detection code 2020-01-28 20:25:56 +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
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
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
44744e3ce1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-28 19:15:03 +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
8071b71b9f
Update changelog for 3.1.0rc1 (#12992) 2020-01-28 17:19:42 +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
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
305abc9e05
Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +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
67b8af34b3
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-01-27 17:26:53 +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
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
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
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
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
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
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
c2dfd5e4e2
Revert "Avoid using uppercase text-transform (#12684)" (#12987) 
This reverts commit 7da54001fe.
 2020-01-27 13:44:29 +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
663ea84b08
Add publish/unpublish controls to announcements in admin UI (#12967) 2020-01-27 11:05:33 +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
10e209d8e0
Change number animations direction based on decrease or increase (#12971) 2020-01-27 11:04:11 +01:00
Eugen Rochko
dd4eec6bf6
Add animations to announcement reactions (#12970) 2020-01-27 11:03:45 +01:00
ThibG
42d2a915e4 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
401f32f9ee
Fix expired announcements being re-published (#12964) 2020-01-26 22:43:18 +01:00
Eugen Rochko
2f8c3c17ee
Fix link colors in announcements (#12965) 2020-01-26 22:26:50 +01:00
Eugen Rochko
b9d74d4076
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
8924743349 Refactor notifications cleaning mode 2020-01-26 14:55:03 +01:00
ButterflyOfFire
408b3e2b93 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
389e3f6094 Fix status overflowing in report dialog (#12959) 
Fixes #12942
 2020-01-25 22:59:00 +01:00
ThibG
3591621edc
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-01-25 20:31:22 +01:00
ThibG
5e4d1f699e [Glitch] Fix “new items glow” being displayed above settings and announcements 
Port 90b13ffd00 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 20:05:36 +01:00
ThibG
98d5ab6be9 [Glitch] Fix spurious error and incorrect state change when adding a reaction twice 
Port c06d2ff437 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-01-25 19:53:04 +01:00
Thibaut Girka
3d9310bf3f Merge branch 'master' into glitch-soc/merge-upstream 2020-01-25 19:46:24 +01:00
ThibG
90b13ffd00 Fix “new items glow” being displayed above settings and announcements (#12958) 2020-01-25 19:40:36 +01:00
ThibG
5bd752081f
Merge pull request #1267 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-01-25 19:07:32 +01:00
ThibG
c06d2ff437 Fix spurious error and incorrect state change when adding a reaction twice (#12957) 
* Fix spurious error and incorrect state change when adding a reaction twice

* Remove superfluous top border for announcements box
 2020-01-25 18:19:24 +01:00