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
c2dfd5e4e2
Revert "Avoid using uppercase text-transform ( #12684 )" ( #12987 )
...
This reverts commit 7da54001fe
2020-01-27 13:44:29 +01:00
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
663ea84b08
Add publish/unpublish controls to announcements in admin UI ( #12967 )
2020-01-27 11:05:33 +01:00
4363d06986
Fix interactive delays in database migrations with no TTY ( #12969 )
...
Fix #12587
2020-01-27 11:04:42 +01:00
10e209d8e0
Change number animations direction based on decrease or increase ( #12971 )
2020-01-27 11:04:11 +01:00
dd4eec6bf6
Add animations to announcement reactions ( #12970 )
2020-01-27 11:03:45 +01:00
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
401f32f9ee
Fix expired announcements being re-published ( #12964 )
2020-01-26 22:43:18 +01:00
2f8c3c17ee
Fix link colors in announcements ( #12965 )
2020-01-26 22:26:50 +01:00
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
8924743349
Refactor notifications cleaning mode
2020-01-26 14:55:03 +01:00
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
389e3f6094
Fix status overflowing in report dialog ( #12959 )
...
Fixes #12942
2020-01-25 22:59:00 +01:00
3591621edc
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 20:31:22 +01:00
5e4d1f699e
[Glitch] Fix “new items glow” being displayed above settings and announcements
...
Port 90b13ffd00
2020-01-25 20:05:36 +01:00
98d5ab6be9
[Glitch] Fix spurious error and incorrect state change when adding a reaction twice
...
Port c06d2ff437
2020-01-25 19:53:04 +01:00
3d9310bf3f
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 19:46:24 +01:00
90b13ffd00
Fix “new items glow” being displayed above settings and announcements ( #12958 )
2020-01-25 19:40:36 +01:00
5bd752081f
Merge pull request #1267 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 19:07:32 +01:00
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
6ce72f1fee
[Glitch] Improve announcements design
...
Port 48c55b6392
2020-01-25 16:57:03 +01:00
27ddcddcd3
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 16:50:24 +01:00
48c55b6392
Improve announcements design ( #12954 )
...
* Move announcements above scroll container; add button to temporarily hide them
* Remove interface for dismissing announcements
* Display number of unread announcements
* Count unread announcements accurately
* Fix size of announcement box not fitting the currently displayed announcement
* Fix announcement box background color to match button color
2020-01-25 16:35:33 +01:00
ae2198bd95
Fix validations of reactions limit ( #12955 )
2020-01-25 16:00:29 +01:00
340cb4a04c
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-25 12:23:47 +01:00
fcd79a5584
New Crowdin translations ( #12936 )
...
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations doorkeeper.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Kannada)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations doorkeeper.en.yml (Icelandic)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (Kabyle)
[ci skip]
* New translations devise.en.yml (Kabyle)
[ci skip]
* New translations activerecord.en.yml (Spanish)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2020-01-25 11:54:10 +01:00
4e1efacfac
[Glitch] Add limit of 8 different reaction types per announcement
...
Port f816da9c64
2020-01-25 10:36:27 +01:00
f1e4738f81
[Glitch] Add number animations
...
Port 76f1ed834e
2020-01-25 10:36:27 +01:00
3c4bd03949
[Glitch] Change font size of announcements to be the same as statuses
...
Port b89e6cfe70
2020-01-25 10:21:13 +01:00
2bde217ea5
[Glitch] Fix unlocalized dropdown button title
...
Port 1268e3b572
2020-01-25 10:20:05 +01:00
1f8563c256
Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream
2020-01-25 10:17:13 +01:00
05351cbffb
[Glitch] minor server-sent events fixes
...
Port front-end changes from 0dfba0884e
2020-01-25 10:13:56 +01:00
61f699c0e9
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-25 10:04:41 +01:00
f816da9c64
Add limit of 8 different reaction types per announcement ( #12950 )
2020-01-25 05:23:33 +01:00
76f1ed834e
Add number animations ( #12948 )
2020-01-25 05:23:05 +01:00
71921f6bc3
Fix user disabling changing activity timestamps, fix nil error ( #12943 )
2020-01-25 05:22:35 +01:00
b89e6cfe70
Change font size of announcements to be the same as statuses ( #12949 )
2020-01-25 12:20:06 +09:00
1268e3b572
Fix unlocalized dropdown button title ( #12947 )
...
In detailed status component, "More" action bar button wasn't
localized. This commit fixes it according to previously used code.
2020-01-24 22:37:04 +01:00
288f509424
Fix type error in announcement reaction update event payload ( #12946 )
2020-01-24 22:08:24 +01:00
0dfba0884e
minor server-sent events fixes ( #12945 )
...
* Send output on the server-sent events stream immediately so the client sees that it was successfully opened even if it doesn't have any messages.
Fix transparent SSE streaming for the public:local and hashtag:local stream types.
* Tell caches to never store server-sent events.
2020-01-24 20:51:33 +01:00
14ca559705
Evenly spread space between tabs ( #12944 )
...
This commit fixes uneven spread of space between the tabs in profiles
or notifications (filters). The problem was that links and buttons
shown as blocks had their width determined according to the content
inside of them, so if one tab has more text content than another, it
is going to take over others space, which is uneven and results in
incorrectly aligned (?) tabs display.
By specifying the size of 100% for each tab, parent container will be
forced to divide available space by the number of elements and evenly
give each child fixed space, "text-align: center" then doing its best
job to keep tabs text centered in that space. This relatively fixes
the problem, but will introduce another one - when the block has more
content that its width allows to have, in this scenario the text should
be wrapped or will be displayed over the other elements, but I see this
more as translators' problem. Still, for this case "overflow: hidden"
is added and any unfitting text will be cut out.
2020-01-24 20:50:49 +01:00
0be67df4f0
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-24 17:28:22 +01:00
bdc1581556
Fix emoji button styling in glitch-soc
2020-01-24 16:45:29 +01:00
376e524278
[Glitch] Add announcements
...
Port front-end changes from f52c988e12
2020-01-24 16:45:29 +01:00
4f51fe03c9
[Glitch] Add “account timeline” filter category
...
Port JS changes from 43daeccccb
2020-01-24 15:27:15 +01:00
de76a8969e
[Glitch] Fix unfollow confirmations in account directory
...
Port ec3ee67564
2020-01-24 15:25:48 +01:00
4417e9e1fd
[Glitch] Add transparent support for EventSource streaming.
...
Port 619da5a4dc
2020-01-24 15:25:19 +01:00
9adeaf2bfc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
4bae4e972d
Bump version to 3.1.0rc1 ( #12932 )
2020-01-24 01:14:51 +01:00
Thibaut Girka
Eugen Rochko
Daigo 3 Dango
ButterflyOfFire
Sasha Sorokin
Ben Lubar