fuyu
5711899c59
Don't display toggle reveal button in video modal when full screen ( #13026 )
2020-02-03 12:26:00 +01:00
Thibaut Girka
c6b587b115
Fix poll compose form being broken on single-column layout
2020-02-03 11:56:31 +01:00
Thibaut Girka
885e9227c6
Fix poll compose form being broken on single-column layout
2020-02-03 11:56:31 +01:00
ThibG
a33262b5b8
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-02-03 10:27:07 +01:00
ThibG
94cdbc4982
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
2020-02-03 09:31:32 +01:00
ThibG
3dcb279da3
[Glitch] Change how unread announcements are handled
...
Port 3adc722d1c
2020-02-03 09:31:32 +01:00
Sasha Sorokin
f0aef12b12
[Glitch] Add "Show thread" button to public profiles
...
Port 864c9a2141
2020-02-03 09:30:13 +01:00
Sasha Sorokin
dd6149ca0b
[Glitch] Add "Show thread" button to public profiles
...
Port 50cd73e5d7
2020-02-03 09:30:13 +01:00
Eugen Rochko
77e5732816
[Glitch] Fix mascot being too large, and a code style issue
...
Port 7774ac36e5
2020-02-03 09:27:51 +01:00
Eugen Rochko
9dc1f7d299
[Glitch] Fix mascot being too large, and a code style issue
...
Port bba0269d97
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
Thibaut Girka
369201a425
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
ThibG
3adc722d1c
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
4cd2d13bd2
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
Thibaut Girka
e135b293fa
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
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
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
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
Даниил Пронин
fe90bfa207
Fix Node version in Vagrant ( #13008 )
2020-01-30 12:05:56 +01:00
Даниил Пронин
2f978abd87
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
ThibG
0fd2d2eee2
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
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
7774ac36e5
Fix mascot being too large, and a code style issue ( #13002 )
2020-01-29 16:18:33 +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
6355996c4b
Bump version to 3.1.0rc2 ( #12999 )
2020-01-28 20:56:32 +01:00
Eugen Rochko
60e160a02d
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
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
2020-01-28 19:17:47 +01:00
Eugen Rochko
8bb5d1abaa
[Glitch] Fix design of announcements in admin UI
...
Port 305abc9e05
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
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
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
