tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
10,741 Commits 20 Branches 113 Tags 222 MiB
0ae7d84273
Commit Graph

10741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeong Arm
66fda37fd0 Scroll into search bar when focus (#12032) 2019-10-01 19:19:10 +02:00
Mathieu Brunot
b85fb6b5e7 Remove quotes in LDAP_SEARCH_FILTER example (#12019) 2019-10-01 19:18:50 +02:00
ThibG
26a8c6fd2d Fix custom emoji animation on hover in conversations view (#12040) 2019-10-01 17:11:14 +02:00
ThibG
3a4d994c40 Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid (#12037) 
* Add test to handle suspended and missing users in BootstrapTimelineService

* Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid
 2019-10-01 15:10:00 +02:00
ThibG
541269f8bc Fix missing propType for conversation delete (#12035) 2019-10-01 15:07:58 +02:00
Thibaut Girka
857c67f31b Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00
Eugen Rochko
b0323d0888
Add refresh button to list of rebloggers/favouriters in web UI (#12031) 2019-10-01 04:57:27 +02:00
Eugen Rochko
c35376132b
Fix long domain block descriptions breaking table layout (#12029) 2019-10-01 04:54:29 +02:00
Eugen Rochko
6faa98aee2
Fix delete conversation action not being reflected in web UI (#12030) 2019-10-01 04:54:17 +02:00
Eugen Rochko
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
mayaeh
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
Eugen Rochko
f7c146a9e1
Bump webpack from 4.35.3 to 4.41.0 (#12026) 
Fix #12023
 2019-10-01 01:19:36 +02:00
Eugen Rochko
e682d3aa9e
Fix active user count for different number of weeks using same cache (#12025) 
Fix #12003
 2019-10-01 01:19:24 +02:00
Eugen Rochko
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
ThibG
65db9df011
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-09-30 23:29:55 +02:00
Cutls
12c4ec0c83 Fix and remove ugly css around the conversation component (#12022) 2019-09-30 17:12:33 +02:00
abcang
9ef5532a7e Fix follow requests N+1 (#12004) 2019-09-30 17:02:03 +02:00
Thibaut Girka
3b855b5c82 Improve styling of DM view in glitch-soc 2019-09-30 17:01:16 +02:00
Thibaut Girka
14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00
Cutls
ddee0dd382 [Glitch] Fix overflow on conversations 
Port f31530b74d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 17:01:16 +02:00
Eugen Rochko
13bc2cd4af [Glitch] Change conversations UI 
Port bc5678d015 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 17:01:16 +02:00
Thibaut Girka
4d6ef02203 Fix using wrong component in ColumnBackButtonSlim 2019-09-30 15:58:29 +02:00
ThibG
e5a50eda4c [Glitch] Add voters count support 
Port front-end changes from 3babf8464b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 15:58:29 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7fd54178d0 glitch-soc theme engine fixes for the challenges controller 2019-09-30 13:37:13 +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
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
cfe2d1cc4a Change at icon in notification filter to reply-all (#11995) 2019-09-29 22:20:56 +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
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
15b3eeb326 Change vote results to display ex-aequo leading options as leading (#12001) 2019-09-29 21:23:40 +02:00
Eugen Rochko
13b06d4b3b
Bump version to 3.0.0rc2 (#11999) 2019-09-29 18:50:16 +02:00