17ee16cbfe
Fix clicking on the left side of a conversation not marking it as read ( #11041 )
5 years ago
cf7950977a
Fix can't save preference other ( #11042 )
5 years ago
d0f90c3e9d
[Glitch] Fix RTL layout not being RTL within the columns area
...
Port b44ae7d284
5 years ago
abb2700350
[Glitch] Change preferences page into appearance, notifications, and other
...
Port SCSS changes from 8bf8d6d9d9
5 years ago
5a158899bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
5 years ago
765b25f1cf
Minor cleanup
5 years ago
2fe493ba25
Fix unboost confirmation dialog not showing up on detailed statuses
5 years ago
6819b3333e
Add option to display a warning before boosting toots lacking media descriptions
5 years ago
7dd32100c3
Add DM conversations mode similar to upstream
5 years ago
75ef673216
Fix login sometimes redirecting to paths that are not pages ( #11019 )
...
Fix #11016
5 years ago
42a53e57d7
Fix emoji-button appearing above privacy-dropdown ( #11027 )
5 years ago
efe4ef1b20
Update fr.json ( #11024 )
5 years ago
6d44010dd4
i18n: Update Corsican front-end translation ( #11010 )
5 years ago
035755bf96
Run yarn manage:translations ( #11008 )
5 years ago
aed4fa02f1
Change priority of delete activity forwards for replies and reblogs ( #11002 )
...
Fix #11001
5 years ago
f698e28803
Fix position of search icon ( #11003 )
5 years ago
df11f10efd
i18n: Update Catalan translations ( #10998 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
* i18n: Update Catalan translations
* i18n: Update Catalan translations
5 years ago
0984e09538
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
5 years ago
2d601a278c
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
5 years ago
21acf681d2
Put poll options behind content warnings ( #10983 )
...
* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button
5 years ago
73e610790e
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
5 years ago
c7feecc715
Improve light theme ( #10992 )
5 years ago
b44ae7d284
Fix RTL layout not being RTL within the columns area ( #10990 )
5 years ago
f8e1c0da75
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port a36e4db82f
5 years ago
c15ff07c69
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 024ec0759c
5 years ago
a473a7912b
[Glitch] Scroll to compose form when focus
...
Port 91ae2d1275
5 years ago
5c1a46bdcf
Fix some React warnings ( #10989 )
5 years ago
2c240378b2
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port 1fee4b0fe2
5 years ago
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
5 years ago
b788e58ea4
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
5 years ago
390f22ab44
Fix display of alt-text when a media attachment is not available
5 years ago
2b35ddc80a
Fix display of alt-text when a media attachment is not available ( #10981 )
5 years ago
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
5 years ago
87f5646ec3
Add waiting time to list of pending accounts in admin UI ( #10985 )
5 years ago
e20f7876e8
Fix sass-lint config ( #10982 )
5 years ago
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
5 years ago
2b54b78962
Fix CW field automatically getting the focus when it is always enabled
5 years ago
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
5 years ago
024ec0759c
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
5 years ago
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
5 years ago
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
5 years ago
806c2f8102
Cleanup various controllers ( #10972 )
...
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
5 years ago
e80cb67ed7
Fix potential private status leak ( #10969 )
5 years ago
1fee4b0fe2
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
5 years ago
be6e54a70c
Do not misattribute inlined boosts if `attributedTo` isn't present ( #10967 )
...
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
5 years ago
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
5 years ago
a7952c3a54
Change reblogs counter to be updated when boosted privately ( #10964 )
5 years ago
57098a1b8d
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
5 years ago
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
5 years ago
f3a02e70a8
Fix poll API not requiring authentication on non-public polls ( #10960 )
...
* Fix poll API not requiring authentication on non-public polls
That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got
Fix #10959
* Add test
5 years ago
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
5 years ago
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
5 years ago
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
5 years ago
c45a330824
Handle blank poll options more gracefully ( #10946 )
...
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
5 years ago
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
5 years ago
77375ad7df
Fix profile picture preview ( #10931 )
5 years ago
d691b1f7d3
Added env variables for max image and video size.
...
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
5 years ago
1501b142d2
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
5 years ago
96ac52dabd
Improvement variable height in single column layout ( #10917 )
...
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
5 years ago
702dbf1622
Center 2-columns layout without side effect ( #10915 )
5 years ago
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
6e1ad5a03f
Raise exception when attempting to serialize local-only statuses
5 years ago
fb0489022c
Fix incorrect PropType in Glitch AutosuggestInput
5 years ago
c12383e06c
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
5 years ago
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
5 years ago
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
5 years ago
9c174f4d02
Fix safari post field display issue in single column layout ( #10883 )
5 years ago
6f624f449e
i18n: Update Corsican front-end translation ( #10884 )
5 years ago
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
5 years ago
d0dc7a60ab
I18n: Update Czech translation ( #10874 )
5 years ago
7fb3fa16dd
Truncate long URLs while providing alt text for inline images
5 years ago
d417a32290
Translate incoming remote img tags by a link
5 years ago
40117d908f
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from c5234ac2aa
5 years ago
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
31b8203887
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
5 years ago
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
5 years ago
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
5 years ago
938edb44a1
Fix video player regressions introduced by blurhash merge
5 years ago
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa609e238804ea
5 years ago
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
5 years ago
03054b27e1
Fix poll visibility on public pages ( #10817 )
...
* Fix poll visibility on public pages
* Revert "Fix poll visibility on public pages"
This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.
* Revert "Change poll options to alphabetic letters when status text is hidden"
This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
5 years ago
d46668d34b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
5 years ago
c65b14059a
[Glitch] Fix composer route opening when not needed
...
Port 9ff2739fb5
5 years ago
139730e3db
Create new click handler for status__expand area in status ( #10837 )
...
This click handler only activates on left-click, resolving #10798 .
This matches behavior in status_content.js, as added in #536
5 years ago
9e238804ea
Fix null error in status component when determining showMedia state ( #10838 )
...
* Fix null error in status component when determining showMedia state
Also update the showMedia value if the status passed to the
component changes
* Refactor media visibility computation into a defaultMediaVisibility function
* Fix default media visibility with reblogs
5 years ago
66081c489f
Fix wrong redirect from getting started to home in advanced Web UI ( #10839 )
...
* update Ruby to 2.5.3
* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835 )
5 years ago
6d4af23a69
Improvements to the single column layout ( #10835 )
...
* Improvements to the single column layout
- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel
* Redirect from getting started to home when navigation panel is visible
5 years ago
7ee189fa60
Add a keyboard shortcut to hide/show media ( #10647 )
...
* Move control of media visibility to parent component
* Add keyboard shortcut to toggle media visibility
5 years ago
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
5 years ago
a1bceb2cb6
Add responsive panels to the single-column layout ( #10820 )
...
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
5 years ago
57911e10c5
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
5 years ago
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
5 years ago
7b1d582232
Improve streaming server security ( #10818 )
...
* Check OAuth token scopes in the streaming API
* Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
5 years ago
4e953ee471
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
ce528d61b4
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
5 years ago
630aafa3a7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
5 years ago
028fb2060b
Fix possible race condition when processing statuses ( #10815 )
5 years ago
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
5 years ago
d445d5833e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
5 years ago
ThibG
ふるふる
Eugen Rochko
mayaeh
manuelviens
Alix Rossi
spla
Aditoo17
Jeong Arm
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Lady Lumb
Hanage999
slice
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws