about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-10-03Small changesReverite
2019-10-01Merge branch 'glitch' into productionReverite
2019-10-01Fix new user confirmation page stylingThibaut Girka
2019-09-30Merge branch 'glitch' into productionReverite
2019-09-30Merge pull request #1224 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-09-30Improve styling of DM view in glitch-socThibaut Girka
2019-09-30Fix menu in settings/admin pagesThibaut Girka
2019-09-30[Glitch] Fix overflow on conversationsCutls
Port f31530b74d0f2ab77845db26babc25f5de337bd4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Change conversations UIEugen Rochko
Port bc5678d0151dd96e0ec5f3d4084ac6356c1d02f5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30Fix using wrong component in ColumnBackButtonSlimThibaut Girka
2019-09-30[Glitch] Add voters count supportThibG
Port front-end changes from 3babf8464b0903b854ec16d355909444ef3ca0bc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Change at icon in notification filter to reply-allkoyu
Port cfe2d1cc4a3c531741fd769241593ebbe03b6711 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UIThibG
Port 9027bfff0c25a6da1bcef7ce880e5d8211062d1d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Change vote results to display ex-aequo leading options as leadingThibG
Port 15b3eeb326d7e6a026235ece25c3be75250de92f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix muted text color not applying to all texttrwnh
Port d51201a75ac47ac90615ee8987534c5772274779 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix follower/following lists resetting on back-navigation in web UIEugen Rochko
Port 9683e1dcf8bbddb07b818960abf254248be3575c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix public list of domain blocks being too verbose on about pageEugen Rochko
Port SCSS from bd9685f7980838ecc675af20cf52ef1e686d98d6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix vote checkmark in poll resultsThibG
Port b0cda7a504655f6ced33802af67cabb6f3e46e19 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Change silences to always require approval on followThibG
Port front-end changes from 18b451c0e6cf6a927a22084f94b423982de0ee8b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Avoid storing audio and video file data in memoryThibG
Port 860a77d45ee9d17117364868f0932b4fcbe07d3d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Use blob URL for Tesseract to avoid CORS issuesThibG
Port 7baedcb61e15200478f3ad6deb96d452cd63499a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix emoji search not showing custom emoji when none are uncategorizedEugen Rochko
Port 0d2b60ab8b13a28e99a83e1104e7208de2025304 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Revert "Change timelines to add new items to pending items when ↵Eugen Rochko
scrolled down #11867" Port 8c4b5f7cef60700af7ae64c7b524d899a1d033c5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Show user what options they have votedThibG
Port front-end changes from b359974d9b356bb723fe046466b178328cf9bbaf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix ugly TOC when title is too longJeong Arm
Port 26b810561a5b7cfd1766699358d998b5882a5876 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix page body not being scrollable in admin layoutEugen Rochko
Port SCSS changes from b9a8b38844278f26b9d1d1d53256e0781ba3575a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Fix placeholder colors for inputs not being explicitly definedEugen Rochko
Port b6df9c10671cd7bf48de3dbd7a94a92fb0a148ec to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Add table of contents to about pageEugen Rochko
Port SCSS changes from d930eb88b671fa6e5573fe7342bcdda87501bdb7 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Add password challenge to 2FA settings, e-mail notificationsEugen Rochko
Port SCSS changes from e1066cd4319a220d5be16e51ffaf5236a2f6e866 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30[Glitch] Change unconfirmed user login behaviourEugen Rochko
Port SCSS changes from 964ae8eee593687f922c873fa7b378bb6e3e39bb Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30glitch-soc theme engine fixes for the challenges controllerThibaut Girka
2019-09-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-29Add voters count support (#11917)ThibG
* 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-29Change at icon in notification filter to reply-all (#11995)koyu
2019-09-29Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)ThibG
* 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-29Add a nodeinfo endpoint (#12002)Eugen Rochko
* 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-29Change vote results to display ex-aequo leading options as leading (#12001)ThibG
2019-09-29Bump version to 3.0.0rc2 (#11999)Eugen Rochko
2019-09-29New Crowdin translations (#11985)Eugen Rochko
* New translations en.yml (German) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations devise.en.yml (Italian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Polish) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations devise.en.yml (Greek) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Dutch) [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.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations doorkeeper.en.yml (Thai) [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 doorkeeper.en.yml (Turkish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [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 (Spanish) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [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 en.json (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Hebrew) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations simple_form.en.yml (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations simple_form.en.yml (Croatian) [ci skip] * New translations doorkeeper.en.yml (Croatian) [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 en.json (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations simple_form.en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations simple_form.en.yml (Serbian (Latin)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (French) [ci skip] * i18n-tasks normalize * yarn manage:translations
2019-09-29Bump set-value from 2.0.0 to 2.0.1 (#11997)Eugen Rochko
2019-09-29Fix muted text color not applying to all text (#11996)trwnh
Pleroma generates polls without p tag
2019-09-29Fix follower/following lists resetting on back-navigation in web UI (#11986)Eugen Rochko
Fix #11452
2019-09-29Fix account migration not affecting followers on origin server (#11980)Eugen Rochko
2019-09-29Fix public list of domain blocks being too verbose on about page (#11967)Eugen Rochko
2019-09-29Do not add margin light when opening modal on mobile (#11830)Yamagishi Kazutoshi
2019-09-29Add (back) option to set redirect notice on account without moving followers ↵Eugen Rochko
(#11994) Fix #11913
2019-09-28Fix vote checkmark in poll results (#11990)ThibG
2019-09-28Fix unscoped being used in the wrong place (#11987)Eugen Rochko
Regression from #11982
2019-09-28Fix redirecting non-functional accounts on public pages (#11978)Eugen Rochko
Fix #11969
2019-09-28Fix preview card image not being re-fetched even if link is re-posted (#11981)Eugen Rochko
Fix #11956
generated by cgit-pink (git 2.37.1) at 2024-11-07 23:11:09 +0000