f9b81fd21f
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-09-30 23:29:55 +02:00
7c6fef81a4
Fix and remove ugly css around the conversation component ( #12022 )
2019-09-30 17:12:33 +02:00
2b89873dfc
Fix follow requests N+1 ( #12004 )
2019-09-30 17:02:03 +02:00
6abbda28fe
Improve styling of DM view in glitch-soc
2019-09-30 17:01:16 +02:00
254f94cb6b
Fix menu in settings/admin pages
2019-09-30 17:01:16 +02:00
5c53017f7e
[Glitch] Fix overflow on conversations
...
Port 45bdb2cea4
2019-09-30 17:01:16 +02:00
779423204a
[Glitch] Change conversations UI
...
Port 5d5af651f1
2019-09-30 17:01:16 +02:00
af4934f742
Fix using wrong component in ColumnBackButtonSlim
2019-09-30 15:58:29 +02:00
1aa14b5873
[Glitch] Add voters count support
...
Port front-end changes from f088e090e4
2019-09-30 15:58:29 +02:00
6e8131d46c
[Glitch] Change at icon in notification filter to reply-all
...
Port ac007dfb83
2019-09-30 15:58:29 +02:00
56ca0d8b1c
[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI
...
Port fdd1848c7c
2019-09-30 15:58:29 +02:00
8c38db77c1
[Glitch] Change vote results to display ex-aequo leading options as leading
...
Port 812a7828d1
2019-09-30 15:58:29 +02:00
9fda70ac63
[Glitch] Fix muted text color not applying to all text
...
Port e4289a50fc
2019-09-30 15:58:29 +02:00
a70911807c
[Glitch] Fix follower/following lists resetting on back-navigation in web UI
...
Port aadf3981fa
2019-09-30 15:58:29 +02:00
89d0173516
[Glitch] Fix public list of domain blocks being too verbose on about page
...
Port SCSS from 7b7c50f124
2019-09-30 15:58:29 +02:00
c8030f582c
[Glitch] Fix vote checkmark in poll results
...
Port 03d3481688
2019-09-30 15:58:29 +02:00
11d07fae3b
[Glitch] Change silences to always require approval on follow
...
Port front-end changes from 70990720c5
2019-09-30 15:58:29 +02:00
82548d9403
[Glitch] Avoid storing audio and video file data in memory
...
Port f3d4db653c
2019-09-30 15:58:29 +02:00
c77eb90fa6
[Glitch] Use blob URL for Tesseract to avoid CORS issues
...
Port d6b6267c27
2019-09-30 15:58:29 +02:00
526d24423c
[Glitch] Fix emoji search not showing custom emoji when none are uncategorized
...
Port 25c70115c1
2019-09-30 15:58:29 +02:00
adc53b625e
[Glitch] Revert "Change timelines to add new items to pending items when scrolled down #11867"
...
Port 69b44ba726
2019-09-30 15:58:29 +02:00
404dbc5e96
[Glitch] Show user what options they have voted
...
Port front-end changes from c596206f8c
2019-09-30 15:58:29 +02:00
4c318264bb
[Glitch] Fix ugly TOC when title is too long
...
Port ffbd6a2f27
2019-09-30 15:58:29 +02:00
14e8ba0f07
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from 53ceb703b3
2019-09-30 15:58:29 +02:00
f9de1ff756
[Glitch] Fix placeholder colors for inputs not being explicitly defined
...
Port 21cca10a6e
2019-09-30 13:57:18 +02:00
c523096a7c
[Glitch] Add table of contents to about page
...
Port SCSS changes from 61442032a2
2019-09-30 13:44:38 +02:00
eedd66257b
[Glitch] Add password challenge to 2FA settings, e-mail notifications
...
Port SCSS changes from 1781358bd9
2019-09-30 13:43:06 +02:00
97ddda8bcd
[Glitch] Change unconfirmed user login behaviour
...
Port SCSS changes from 6be7b414e2
2019-09-30 13:42:22 +02:00
a1d016556a
glitch-soc theme engine fixes for the challenges controller
2019-09-30 13:37:13 +02:00
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
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
ac007dfb83
Change at icon in notification filter to reply-all ( #11995 )
2019-09-29 22:20:56 +02:00
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
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
812a7828d1
Change vote results to display ex-aequo leading options as leading ( #12001 )
2019-09-29 21:23:40 +02:00
7918c98190
Bump version to 3.0.0rc2 ( #11999 )
2019-09-29 18:50:16 +02:00
11e7f5936e
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
009f0e0202
Bump set-value from 2.0.0 to 2.0.1 ( #11997 )
2019-09-29 16:54:35 +02:00
e4289a50fc
Fix muted text color not applying to all text ( #11996 )
...
Pleroma generates polls without p tag
2019-09-29 16:54:24 +02:00
aadf3981fa
Fix follower/following lists resetting on back-navigation in web UI ( #11986 )
...
Fix #11452
2019-09-29 16:27:00 +02:00
ae03161ad9
Fix account migration not affecting followers on origin server ( #11980 )
2019-09-29 16:23:13 +02:00
7b7c50f124
Fix public list of domain blocks being too verbose on about page ( #11967 )
2019-09-29 16:23:01 +02:00
03e29f4c51
Do not add margin light when opening modal on mobile ( #11830 )
2019-09-29 14:30:58 +02:00
f5c71a6cd2
Add (back) option to set redirect notice on account without moving followers ( #11994 )
...
Fix #11913
2019-09-29 05:03:19 +02:00
03d3481688
Fix vote checkmark in poll results ( #11990 )
2019-09-28 19:41:36 +02:00
d8f09d5853
Fix unscoped being used in the wrong place ( #11987 )
...
Regression from #11982
2019-09-28 05:23:32 +02:00
561b0509c3
Fix redirecting non-functional accounts on public pages ( #11978 )
...
Fix #11969
2019-09-28 01:33:27 +02:00
386dc65671
Fix preview card image not being re-fetched even if link is re-posted ( #11981 )
...
Fix #11956
2019-09-28 01:33:16 +02:00
6baaceefcd
Fix index not being used in Status.reblogs_map ( #11982 )
...
Regression from #11623
2019-09-28 01:33:02 +02:00
d73822dc01
Fix older migrations not working due to new default scope ( #11983 )
...
Fix #11952 , regression from #11623
2019-09-28 01:05:26 +02:00
ThibG