444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
5 years ago
7de8c51873
Play animated custom emoji on hover ( #11348 )
...
* Play animated custom emoji on hover in status
* Play animated custom emoji on hover in display names
* Play animated custom emoji on hover in bios/bio fields
* Add support for animation on hover on public pages emojis too
* Fix tests
* Code style cleanup
5 years ago
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
5 years ago
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
5 years ago
8df0022e66
Added logout to dropdown menu ( #11353 )
...
* Added logout to dropdown menu
* Triggering build-and-test with empty commit as it seems it failed due to some internal failure
* Looks fine, ready to review
* Added changes from review
* method can be null without any problems
* Also target can be null
5 years ago
729723f857
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
5 years ago
9b1d3e4acb
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
5 years ago
7039dca12c
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
...
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
5 years ago
c07cca4727
Only scroll to the compose form if it's not horizontally in the viewport ( #11246 )
...
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
5 years ago
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
99924f282f
Memoize ancestorIds and descendantIds in detailed status view ( #11234 )
5 years ago
3922b518f7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
4f5b221be2
Display FTS warning based on actual search term, not the one being typed ( #11202 )
...
Follow-up to #11112
5 years ago
e64e6a03dd
Add categories for custom emojis ( #11196 )
...
Fix #7940
5 years ago
072158ee97
Fix swiping columns on mobile sometimes failing ( #11200 )
...
Fixes #9779
5 years ago
c8ba75b963
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ca8944728f
Add message telling FTS is disabled when no toot can be found because of this ( #11112 )
...
* Add message telling FTS is disabled when no toot can be found because of this
Fixes #11082
* Remove info icon and reword message
5 years ago
aaec64a500
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
- config/locales/simple_form.en.yml
5 years ago
3086c645fd
Add option to disable blurhash previews ( #11188 )
...
* Add option to disable blurhash previews
* Update option text
* Change options order
5 years ago
32a4494926
Scroll to compose form rather than reply indicator on focus ( #11182 )
5 years ago
5b20284f6f
Removed extra pipes from regex. ( #11181 )
5 years ago
ddd875ad99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
5 years ago
6eb5241099
Change camera icon to paperclip icon in upload form ( #11149 )
5 years ago
f7f23b4a19
Add audio uploads ( #11123 )
...
* Add audio uploads
Fix #4827
Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.
* Improve code style
5 years ago
5717f75340
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
01e362316c
Do not scroll in the compose panel on single-column ( #11093 )
5 years ago
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b4d67fe57a
Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )
5 years ago
dd45c63921
List attachments in reply indicator and boost modal ( #10997 )
...
* Add media attachments list to boost modal
* Add attachment list to reply indicator
5 years ago
1b4dcc3f78
Only show profile directory link when it's enabled ( #11064 )
5 years ago
1b0ff4cd69
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
210fa3a94e
Fix emoji-button appearing above privacy-dropdown ( #11027 )
5 years ago
e9ddd5a159
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
f4bc77f290
Improve light theme ( #10992 )
5 years ago
cc8f6b3cda
Fix some React warnings ( #10989 )
5 years ago
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
5 years ago
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
5 years ago
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
5 years ago
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
5 years ago
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
5 years ago
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
5 years ago
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
5 years ago
76918554a6
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
d93b82af87
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
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
5 years ago
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
5 years ago
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
5 years ago
3b9c02506d
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
Thibaut Girka
Eugen Rochko
koyu
PatOnTheBack
mayaeh
Wenceslao Páez Chávez
Takeshi Umeda
Jeong Arm