44744e3ce1
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-28 19:15:03 +01:00
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
8071b71b9f
Update changelog for 3.1.0rc1 ( #12992 )
2020-01-28 17:19:42 +01:00
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
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
305abc9e05
Fix design of announcements in admin UI ( #12989 )
2020-01-28 02:21:00 +01:00
0fcc4b1c56
Change announcements to be collapsed on page load in web UI ( #12990 )
2020-01-28 02:20:47 +01:00
67b8af34b3
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-27 17:26:53 +01:00
cf230d551f
[Glitch] Change number animations direction based on decrease or increase
...
Port 10e209d8e0
2020-01-27 16:06:03 +01:00
b0139dcf5e
[Glitch] Add animations to announcement reactions
...
Port dd4eec6bf6
2020-01-27 16:05:37 +01:00
41d0869d7f
[Glitch] Change last_status_at to be a date, not datetime
...
Port 42d2a915e4
2020-01-27 16:03:24 +01:00
187a822074
[Glitch] Fix link colors in announcements
...
Port 2f8c3c17ee
2020-01-27 16:01:46 +01:00
e36d0a98cc
[Glitch] Add streaming API updates for announcements being modified or deleted
...
Port b9d74d4076
2020-01-27 16:01:06 +01:00
8a8936725e
[Glitch] Fix status overflowing in report dialog
...
Port 389e3f6094
2020-01-27 15:59:25 +01:00
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
Thibaut Girka