alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,807 Commits
9 Branches
0 Tags
183 MiB
Commit Graph

9807 Commits (9699506dc41a3182f4238390e10b178b4da11b92)

Author SHA1 Message Date
dependabot-preview[bot] e67f38020f Bump httplog from 1.3.0 to 1.3.1 (#11034) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.3.0...v1.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:16:22 +09:00
dependabot-preview[bot] 04b4d2b4fa Bump pghero from 2.2.0 to 2.2.1 (#11033) 
Bumps [pghero](https://github.com/ankane/pghero) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:16:15 +09:00
dependabot-preview[bot] 7b058c5687 Bump rubocop-rails from 2.0.0 to 2.0.1 (#11032) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:16:03 +09:00
dependabot-preview[bot] f765cd97b2 Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.41.0...v1.42.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:15:33 +09:00
Eugen Rochko 103a9f4466
Fix sanitizer making block level elements unreadable (#10836) 
Fix #10834
 2019-06-16 21:46:36 +02:00
Thibaut Girka f57a0f89a8 Fix styling of poll options on public pages in glitch flavour 2019-06-16 21:33:27 +02:00
ThibG 118701b548
Merge pull request #1121 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-16 21:25:37 +02:00
Thibaut Girka 5717f75340 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
Thibaut Girka d3aaacb6d4 Do not scroll in the compose panel on single-column 2019-06-16 19:13:22 +02:00
Eugen Rochko 65efe892cf
Fix check-i18n builds (#11084) 
* Fix check-i18n builds

* Remove check for missing plural forms
 2019-06-16 19:12:12 +02:00
ThibG 01e362316c Do not scroll in the compose panel on single-column (#11093) 2019-06-16 18:46:55 +02:00
Yusuke Nakamura 0828126784 Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094) 
Restore and change from 89096860
 2019-06-16 18:36:47 +02:00
Thibaut Girka a29ab6f1bd Fix composer buttons overflowing the composer box in single-column 2019-06-16 15:55:55 +02:00
Eugen Rochko b6f76d1306 [Glitch] Change full logo to use primary text color of the given theme 
Port 20dda5cca0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-15 18:49:44 +02:00
Thibaut Girka e433386545 Fix replying not automatically switching to compose form on mobile 2019-06-14 20:37:54 +02:00
Dan Hunsaker 54192a9b6f Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
ThibG c0e5f32d13
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-13 23:53:21 +02:00
Thibaut Girka 0fd7a8b63d Include necessary JS in auth pages 2019-06-13 22:38:22 +02:00
ThibG 7b68e1725c [Glitch] List attachments in boost modal 
Port dd45c63921 to glitch-soc
 2019-06-13 22:28:51 +02:00
Thibaut Girka 60adda7e59 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-13 22:23:20 +02:00
ThibG 80849812d2 [Glitch] Fix ordering of keyboard access between CW field, textarea and emoji picker 
Port b4d67fe57a to glitch-soc
 2019-06-13 22:15:31 +02:00
ThibG d1edbfaed3 [Glitch] Only show profile directory link when it's enabled 
Port 1b4dcc3f78 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
ThibG 983cbd558d [Glitch] Fix border-bottom of active tab bars 
Port faafc3ae25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Thibaut Girka 0f41be5581 Fix notification badge 2019-06-13 22:15:31 +02:00
Thibaut Girka 0ccc06b87f Fix multiple-column padding 2019-06-13 22:15:31 +02:00
Thibaut Girka a773d02946 Add hints to make local settings about layout more explicit 2019-06-13 22:15:31 +02:00
Thibaut Girka 44b1a39682 Replace link to favourites with link to bookmarks 2019-06-13 22:15:31 +02:00
Thibaut Girka 9400ec43cc Fix navigation panel 2019-06-13 22:15:31 +02:00
Thibaut Girka 127ead34c4 Restore navigation bar position glitch-soc setting 2019-06-13 22:15:31 +02:00
Thibaut Girka b191861e15 Use forceSingleColumn only in automatic layout mode 2019-06-13 22:15:31 +02:00
Thibaut Girka 47307e6c13 Default to multiple column mode if backend doesn't have appropriate seting 2019-06-13 22:15:31 +02:00
Thibaut Girka b222d1ae26 Fix and refactor SCSS 2019-06-13 22:15:31 +02:00
Thibaut Girka 7fd8797d20 Add app settings link to single-column mode 2019-06-13 22:15:31 +02:00
Eugen Rochko 1b130f964f [Glitch] Fix position of search icon 
Port 9add88a920 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 362f3973be [Glitch] Fix some React warnings 
Port cc8f6b3cda to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 3485acefed [Glitch] Fix margins on profile metadata in single column mode 
Port ed19f33440 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Wenceslao Páez Chávez 867d1233c7 [Glitch] Fix overlap of emoji button on search popup 
Port fe3bf3b0fc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Takeshi Umeda 8f924eb961 [Glitch] Fix emoji picker being always displayed 
Port c402c291f4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko a5398c3df8 [Glitch] Add profile directory link to single column navigation panel 
Port 6077eca240 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Takeshi Umeda 1329308bc7 [Glitch] Improvement variable height in single column layout 
Port d93b82af87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Hanage999 02d6187894 [Glitch] Center 2-columns layout without side effect 
Port 7c1ca0c37b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 763735f92e [Glitch] Refactor footers in web UI into a single component 
Port 451e5980b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
abcang 9bb4f796db [Glitch] Display notifications count on a new single column 
Port 3593b85423 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Hanage999 c095eed121 [Glitch] Fix wrong redirect from getting started to home in advanced Web UI 
Port 4a818ac2de to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko ff88387a4a [Glitch] Improvements to the single column layout 
Port 0e445ebb13 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko d99a661f08 [Glitch] Add responsive panels to the single-column layout 
Port 1e5532e693 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 0bd9f23e6d [Glitch] Various improvements to single column layout 
Port 84dc21d55d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko 610b4b44c4 [Glitch] Add single-column mode 
Port 9ddeb30f90 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko c9eeb2e832
Bump version to 2.9.0 (#11074) 2019-06-13 20:19:21 +02:00
Eugen Rochko 5c7f1e8e2f
New Crowdin translations (#11075) 
* New translations en.json (German)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Esperanto)
[ci skip]

* i18n-tasks normalize
 2019-06-13 20:17:56 +02:00