Commit graph

38626 commits

Author SHA1 Message Date
koyu
1bfa9149ee [Glitch] Change at icon in notification filter to reply-all
Port cfe2d1cc4a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
56ca0d8b1c [Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI
Port fdd1848c7c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
88481c9653 [Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI
Port 9027bfff0c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
8c38db77c1 [Glitch] Change vote results to display ex-aequo leading options as leading
Port 812a7828d1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
332be562ea [Glitch] Change vote results to display ex-aequo leading options as leading
Port 15b3eeb326 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
trwnh
9fda70ac63 [Glitch] Fix muted text color not applying to all text
Port e4289a50fc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
trwnh
ec244f6c88 [Glitch] Fix muted text color not applying to all text
Port d51201a75a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
a70911807c [Glitch] Fix follower/following lists resetting on back-navigation in web UI
Port aadf3981fa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
a2bf1f9f56 [Glitch] Fix follower/following lists resetting on back-navigation in web UI
Port 9683e1dcf8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
89d0173516 [Glitch] Fix public list of domain blocks being too verbose on about page
Port SCSS from 7b7c50f124 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
15973b77d6 [Glitch] Fix public list of domain blocks being too verbose on about page
Port SCSS from bd9685f798 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
c8030f582c [Glitch] Fix vote checkmark in poll results
Port 03d3481688 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
98cc81c0e2 [Glitch] Fix vote checkmark in poll results
Port b0cda7a504 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
11d07fae3b [Glitch] Change silences to always require approval on follow
Port front-end changes from 70990720c5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
8a63d659ac [Glitch] Change silences to always require approval on follow
Port front-end changes from 18b451c0e6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
82548d9403 [Glitch] Avoid storing audio and video file data in memory
Port f3d4db653c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
0349c4d1cf [Glitch] Avoid storing audio and video file data in memory
Port 860a77d45e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
c77eb90fa6 [Glitch] Use blob URL for Tesseract to avoid CORS issues
Port d6b6267c27 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
74af56b9cd [Glitch] Use blob URL for Tesseract to avoid CORS issues
Port 7baedcb61e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
526d24423c [Glitch] Fix emoji search not showing custom emoji when none are uncategorized
Port 25c70115c1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
4b7c436ae9 [Glitch] Fix emoji search not showing custom emoji when none are uncategorized
Port 0d2b60ab8b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
adc53b625e [Glitch] Revert "Change timelines to add new items to pending items when scrolled down #11867"
Port 69b44ba726 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
5c9ba9177a [Glitch] Revert "Change timelines to add new items to pending items when scrolled down #11867"
Port 8c4b5f7cef to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
404dbc5e96 [Glitch] Show user what options they have voted
Port front-end changes from c596206f8c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
ThibG
e25b7feb72 [Glitch] Show user what options they have voted
Port front-end changes from b359974d9b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Jeong Arm
4c318264bb [Glitch] Fix ugly TOC when title is too long
Port ffbd6a2f27 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Jeong Arm
2441d07cd5 [Glitch] Fix ugly TOC when title is too long
Port 26b810561a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
14e8ba0f07 [Glitch] Fix page body not being scrollable in admin layout
Port SCSS changes from 53ceb703b3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
27f922168a [Glitch] Fix page body not being scrollable in admin layout
Port SCSS changes from b9a8b38844 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
Eugen Rochko
f9de1ff756 [Glitch] Fix placeholder colors for inputs not being explicitly defined
Port 21cca10a6e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:57:18 +02:00
Eugen Rochko
6c8fefb0c9 [Glitch] Fix placeholder colors for inputs not being explicitly defined
Port b6df9c1067 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:57:18 +02:00
Eugen Rochko
c523096a7c [Glitch] Add table of contents to about page
Port SCSS changes from 61442032a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:44:38 +02:00
Eugen Rochko
dbb8d9308b [Glitch] Add table of contents to about page
Port SCSS changes from d930eb88b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:44:38 +02:00
Eugen Rochko
eedd66257b [Glitch] Add password challenge to 2FA settings, e-mail notifications
Port SCSS changes from 1781358bd9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:43:06 +02:00
Eugen Rochko
dd2a303a9b [Glitch] Add password challenge to 2FA settings, e-mail notifications
Port SCSS changes from e1066cd431 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:43:06 +02:00
Eugen Rochko
97ddda8bcd [Glitch] Change unconfirmed user login behaviour
Port SCSS changes from 6be7b414e2

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:42:22 +02:00
Eugen Rochko
40677e1793 [Glitch] Change unconfirmed user login behaviour
Port SCSS changes from 964ae8eee5

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 13:42:22 +02:00
Thibaut Girka
a1d016556a glitch-soc theme engine fixes for the challenges controller 2019-09-30 13:37:13 +02:00
Thibaut Girka
7fd54178d0 glitch-soc theme engine fixes for the challenges controller 2019-09-30 13:37:13 +02:00
Thibaut Girka
cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
Thibaut Girka
16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
ThibG
f088e090e4 Add voters count support (#11917)
* Add voters count to polls

* Add ActivityPub serialization and parsing of voters count

* Add support for voters count in WebUI

* Move incrementation of voters count out of redis lock

* Reword “voters” to “people”
2019-09-29 22:58:01 +02:00
ThibG
3babf8464b Add voters count support (#11917)
* Add voters count to polls

* Add ActivityPub serialization and parsing of voters count

* Add support for voters count in WebUI

* Move incrementation of voters count out of redis lock

* Reword “voters” to “people”
2019-09-29 22:58:01 +02:00
koyu
ac007dfb83 Change at icon in notification filter to reply-all (#11995) 2019-09-29 22:20:56 +02:00
koyu
cfe2d1cc4a Change at icon in notification filter to reply-all (#11995) 2019-09-29 22:20:56 +02:00
ThibG
fdd1848c7c Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)
* Add some explanation to the mute modal dialog

* Remove `isSubmitting` from mute modal code, this wasn't used

* Refactor block modal

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

* Refactor SCSS a bit

* Put mute modal toggle to the same side as in the report dialog for consistency

* Reword mute explanation

* Fix mute explanation styling

* Left-align all text in mute confirmation modal
2019-09-29 21:46:05 +02:00
ThibG
9027bfff0c Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)
* Add some explanation to the mute modal dialog

* Remove `isSubmitting` from mute modal code, this wasn't used

* Refactor block modal

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

* Refactor SCSS a bit

* Put mute modal toggle to the same side as in the report dialog for consistency

* Reword mute explanation

* Fix mute explanation styling

* Left-align all text in mute confirmation modal
2019-09-29 21:46:05 +02:00
Eugen Rochko
51a72a802f Add a nodeinfo endpoint (#12002)
* Add nodeinfo endpoint

* dont commit stuff from my local dev

* consistant naming since we implimented 2.1 schema

* Add some additional node info stuff

* Add nodeinfo endpoint

* dont commit stuff from my local dev

* consistant naming since we implimented 2.1 schema

* expanding this to include federation info

* codeclimate feedback

* CC feedback

* using activeserializers seems like a good idea...

* get rid of draft 2.1 version

* Reimplement 2.1, also fix metaData -> metadata

* Fix metaData -> metadata here too

* Fix nodeinfo 2.1 tests

* Implement cache for monthly user aggregate

* Useless

* Remove ostatus from the list of supported protocols

* Fix nodeinfo's open_registration reading obsolete setting variable

* Only serialize domain blocks with user-facing limitations

* Do not needlessly list noop severity in nodeinfo

* Only serialize domain blocks info in nodeinfo when they are set to be displayed to everyone

* Enable caching for nodeinfo endpoints

* Fix rendering nodeinfo

* CodeClimate fixes

* Please CodeClimate

* Change InstancePresenter#active_user_count_months for clarity

* Refactor NodeInfoSerializer#metadata

* Remove nodeinfo 2.1 support as the schema doesn't exist

* Clean-up
2019-09-29 21:31:51 +02:00
Eugen Rochko
5f69eb89e2
Add a nodeinfo endpoint (#12002)
* Add nodeinfo endpoint

* dont commit stuff from my local dev

* consistant naming since we implimented 2.1 schema

* Add some additional node info stuff

* Add nodeinfo endpoint

* dont commit stuff from my local dev

* consistant naming since we implimented 2.1 schema

* expanding this to include federation info

* codeclimate feedback

* CC feedback

* using activeserializers seems like a good idea...

* get rid of draft 2.1 version

* Reimplement 2.1, also fix metaData -> metadata

* Fix metaData -> metadata here too

* Fix nodeinfo 2.1 tests

* Implement cache for monthly user aggregate

* Useless

* Remove ostatus from the list of supported protocols

* Fix nodeinfo's open_registration reading obsolete setting variable

* Only serialize domain blocks with user-facing limitations

* Do not needlessly list noop severity in nodeinfo

* Only serialize domain blocks info in nodeinfo when they are set to be displayed to everyone

* Enable caching for nodeinfo endpoints

* Fix rendering nodeinfo

* CodeClimate fixes

* Please CodeClimate

* Change InstancePresenter#active_user_count_months for clarity

* Refactor NodeInfoSerializer#metadata

* Remove nodeinfo 2.1 support as the schema doesn't exist

* Clean-up
2019-09-29 21:31:51 +02:00
ThibG
812a7828d1 Change vote results to display ex-aequo leading options as leading (#12001) 2019-09-29 21:23:40 +02:00