541269f8bc
Fix missing propType for conversation delete ( #12035 )
2019-10-01 15:07:58 +02:00
857c67f31b
Fix new user confirmation page styling
2019-10-01 13:48:47 +02:00
b0323d0888
Add refresh button to list of rebloggers/favouriters in web UI ( #12031 )
2019-10-01 04:57:27 +02:00
c35376132b
Fix long domain block descriptions breaking table layout ( #12029 )
2019-10-01 04:54:29 +02:00
6faa98aee2
Fix delete conversation action not being reflected in web UI ( #12030 )
2019-10-01 04:54:17 +02:00
9ba40a6bfd
Remove HEAD request from fetching link previews ( #12028 )
...
It is not really necessary and we need to reduce requests
2019-10-01 04:54:10 +02:00
b258583d2b
Fix hashtag link to directory in AdminUI ( #12005 )
...
* Fixed not to generate link if no user used hashtag in directory
* Added missing translation for AdminUI custom emojis
* run yarn manage:translations en
2019-10-01 01:20:22 +02:00
f7c146a9e1
Bump webpack from 4.35.3 to 4.41.0 ( #12026 )
...
Fix #12023
2019-10-01 01:19:36 +02:00
e682d3aa9e
Fix active user count for different number of weeks using same cache ( #12025 )
...
Fix #12003
2019-10-01 01:19:24 +02:00
5c42f47617
Fix records not being indexed sometimes ( #12024 )
...
It's possible that after commit callbacks were not firing when
exceptions occurred in the process. Also, the default Sidekiq
strategy does not push indexing jobs immediately, which is not
necessary and could be part of the issue too.
2019-10-01 01:19:11 +02:00
65db9df011
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-30 23:29:55 +02:00
12c4ec0c83
Fix and remove ugly css around the conversation component ( #12022 )
2019-09-30 17:12:33 +02:00
9ef5532a7e
Fix follow requests N+1 ( #12004 )
2019-09-30 17:02:03 +02:00
3b855b5c82
Improve styling of DM view in glitch-soc
2019-09-30 17:01:16 +02:00
14f797873d
Fix menu in settings/admin pages
2019-09-30 17:01:16 +02:00
ddee0dd382
[Glitch] Fix overflow on conversations
...
Port f31530b74d
2019-09-30 17:01:16 +02:00
13bc2cd4af
[Glitch] Change conversations UI
...
Port bc5678d015
2019-09-30 17:01:16 +02:00
4d6ef02203
Fix using wrong component in ColumnBackButtonSlim
2019-09-30 15:58:29 +02:00
e5a50eda4c
[Glitch] Add voters count support
...
Port front-end changes from 3babf8464b
2019-09-30 15:58:29 +02:00
1bfa9149ee
[Glitch] Change at icon in notification filter to reply-all
...
Port cfe2d1cc4a
2019-09-30 15:58:29 +02:00
88481c9653
[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI
...
Port 9027bfff0c
2019-09-30 15:58:29 +02:00
332be562ea
[Glitch] Change vote results to display ex-aequo leading options as leading
...
Port 15b3eeb326
2019-09-30 15:58:29 +02:00
ec244f6c88
[Glitch] Fix muted text color not applying to all text
...
Port d51201a75a
2019-09-30 15:58:29 +02:00
a2bf1f9f56
[Glitch] Fix follower/following lists resetting on back-navigation in web UI
...
Port 9683e1dcf8
2019-09-30 15:58:29 +02:00
15973b77d6
[Glitch] Fix public list of domain blocks being too verbose on about page
...
Port SCSS from bd9685f798
2019-09-30 15:58:29 +02:00
98cc81c0e2
[Glitch] Fix vote checkmark in poll results
...
Port b0cda7a504
2019-09-30 15:58:29 +02:00
8a63d659ac
[Glitch] Change silences to always require approval on follow
...
Port front-end changes from 18b451c0e6
2019-09-30 15:58:29 +02:00
0349c4d1cf
[Glitch] Avoid storing audio and video file data in memory
...
Port 860a77d45e
2019-09-30 15:58:29 +02:00
74af56b9cd
[Glitch] Use blob URL for Tesseract to avoid CORS issues
...
Port 7baedcb61e
2019-09-30 15:58:29 +02:00
4b7c436ae9
[Glitch] Fix emoji search not showing custom emoji when none are uncategorized
...
Port 0d2b60ab8b
2019-09-30 15:58:29 +02:00
5c9ba9177a
[Glitch] Revert "Change timelines to add new items to pending items when scrolled down #11867 "
...
Port 8c4b5f7cef
2019-09-30 15:58:29 +02:00
e25b7feb72
[Glitch] Show user what options they have voted
...
Port front-end changes from b359974d9b
2019-09-30 15:58:29 +02:00
2441d07cd5
[Glitch] Fix ugly TOC when title is too long
...
Port 26b810561a
2019-09-30 15:58:29 +02:00
27f922168a
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from b9a8b38844
2019-09-30 15:58:29 +02:00
6c8fefb0c9
[Glitch] Fix placeholder colors for inputs not being explicitly defined
...
Port b6df9c1067
2019-09-30 13:57:18 +02:00
dbb8d9308b
[Glitch] Add table of contents to about page
...
Port SCSS changes from d930eb88b6
2019-09-30 13:44:38 +02:00
dd2a303a9b
[Glitch] Add password challenge to 2FA settings, e-mail notifications
...
Port SCSS changes from e1066cd431
2019-09-30 13:43:06 +02:00
40677e1793
[Glitch] Change unconfirmed user login behaviour
...
Port SCSS changes from 964ae8eee5
2019-09-30 13:42:22 +02:00
7fd54178d0
glitch-soc theme engine fixes for the challenges controller
2019-09-30 13:37:13 +02:00
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
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
cfe2d1cc4a
Change at icon in notification filter to reply-all ( #11995 )
2019-09-29 22:20:56 +02:00
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
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
15b3eeb326
Change vote results to display ex-aequo leading options as leading ( #12001 )
2019-09-29 21:23:40 +02:00
13b06d4b3b
Bump version to 3.0.0rc2 ( #11999 )
2019-09-29 18:50:16 +02:00
9d22ad8093
New Crowdin translations ( #11985 )
...
* 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-29 17:10:01 +02:00
3582fa5c17
Bump set-value from 2.0.0 to 2.0.1 ( #11997 )
2019-09-29 16:54:35 +02:00
d51201a75a
Fix muted text color not applying to all text ( #11996 )
...
Pleroma generates polls without p tag
2019-09-29 16:54:24 +02:00
9683e1dcf8
Fix follower/following lists resetting on back-navigation in web UI ( #11986 )
...
Fix #11452
2019-09-29 16:27:00 +02:00
ThibG
Eugen Rochko
mayaeh
Cutls
abcang
koyu
trwnh
Jeong Arm