treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
9,616 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9616 Commits (5137951499fe54d3365f9cd439061a92f56065b1)

Author SHA1 Message Date
Marek Ľach 30946461be Update simple_form.sk.yml (#11028) 2019-06-10 16:25:27 +09:00
manuelviens 602bccc0ab Update simple_form.fr.yml (#11021) 2019-06-10 13:12:51 +09:00
manuelviens 2e12b42f2b Update fr.yml (#11023) 2019-06-10 13:12:28 +09:00
manuelviens efe4ef1b20 Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Marek Ľach 843bc1d3da Update sk.yml (#11015) 
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-06-09 22:55:37 +02:00
ThibG 585aa16ec0 Fix old migrations failing because of new version of `strong_migrations` (#11018) 2019-06-09 22:55:28 +02:00
Thibaut Girka c23e0e761e Fix old migrations failing because of new version of `strong_migrations` 
Fixes #1099
 2019-06-09 22:32:12 +02:00
Jeong Arm bd5ab2542c Add missing Korean translations (#11014) 2019-06-09 21:07:50 +02:00
Alix Rossi 6d44010dd4 i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09:00
Eugen Rochko 13f112c116 Bump version to 2.9.0rc1 (#11004) 2019-06-09 15:53:08 +02:00
Eugen Rochko 035755bf96 Run yarn manage:translations (#11008) 2019-06-09 15:52:42 +02:00
Eugen Rochko aed4fa02f1 Change priority of delete activity forwards for replies and reblogs (#11002) 
Fix #11001
 2019-06-09 12:47:33 +02:00
Eugen Rochko f698e28803 Fix position of search icon (#11003) 2019-06-09 01:59:42 +02:00
spla df11f10efd i18n: Update Catalan translations (#10998) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-06-09 08:32:22 +09:00
Eugen Rochko 0984e09538 Fix more issues in the light theme (#10996) 
* Fix tabs bar in light theme

* Fix borders on small screens in light theme
 2019-06-08 22:32:59 +02:00
Darius Kazemi 66ec27e0c8 Specify gzip required in tootctl emoji help (#11000) 2019-06-08 12:43:11 -04:00
Aditoo17 2d601a278c I18n: Update Czech translation 🇨🇿 (#10995) 
* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)
 2019-06-08 17:58:40 +02:00
ThibG 21acf681d2 Put poll options behind content warnings (#10983) 
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
 2019-06-08 17:40:59 +02:00
Eugen Rochko 73e610790e Change full logo to use primary text color of the given theme (#10994) 
* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme
 2019-06-08 15:30:06 +02:00
Eugen Rochko c7feecc715 Improve light theme (#10992) 2019-06-08 10:23:41 +02:00
Eugen Rochko b44ae7d284 Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +02:00
ThibG e63f020c57 Merge pull request #1097 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-07 22:15:44 +02:00
Eugen Rochko f8e1c0da75 [Glitch] Fix not being able to directly switch between list timelines in web UI 
Port a36e4db82f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
ThibG c15ff07c69 [Glitch] Fix “mark as sensitive” not being used in delete & redraft 
Port 024ec0759c to glitch-soc
 2019-06-07 17:39:46 +02:00
Jeong Arm a473a7912b [Glitch] Scroll to compose form when focus 
Port 91ae2d1275 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-07 17:39:46 +02:00
Eugen Rochko 5c1a46bdcf Fix some React warnings (#10989) 2019-06-07 17:15:18 +02:00
Thibaut Girka 2c240378b2 [Glitch] Fix refreshing featured toots when the new collection is empty 
Port 1fee4b0fe2 to glitch-soc
 2019-06-07 17:05:32 +02:00
Thibaut Girka 00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
 2019-06-07 17:00:36 +02:00
Eugen Rochko b788e58ea4 Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
Thibaut Girka 390f22ab44 Fix display of alt-text when a media attachment is not available 2019-06-07 16:39:07 +02:00
ThibG 2b35ddc80a Fix display of alt-text when a media attachment is not available (#10981) 2019-06-07 12:41:08 +02:00
Alix Rossi 9cf5686de5 i18n: Update Corsican translations (#10987) 2019-06-07 19:12:17 +09:00
Eugen Rochko 8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
Eugen Rochko 87f5646ec3 Add waiting time to list of pending accounts in admin UI (#10985) 2019-06-07 03:24:10 +02:00
Yamagishi Kazutoshi e20f7876e8 Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
ThibG 131bc26601 Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
Wenceslao Páez Chávez 796b8e8d34 Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
Thibaut Girka 2b54b78962 Fix CW field automatically getting the focus when it is always enabled 2019-06-06 13:26:42 +02:00
Eugen Rochko a36e4db82f Fix not being able to directly switch between list timelines in web UI (#10973) 2019-06-06 13:04:49 +02:00
ThibG 024ec0759c Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
Yamagishi Kazutoshi cb4f45ab83 require rubocop-rails in .rubocop.yml (#10974) 
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"

This reverts commit fd0a944959.

* Disable Rails/HelperInstanceVariable
 2019-06-06 12:31:48 +02:00
Takeshi Umeda 88a04bf6c4 Fix emoji picker being always displayed (#10979) 
* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests
 2019-06-06 12:30:14 +02:00
Jeong Arm 91ae2d1275 Scroll to compose form when focus (#10970) 
* Scroll to compose form when focus

* Get rid of constructor
 2019-06-05 15:29:45 +02:00
ThibG 806c2f8102 Cleanup various controllers (#10972) 
* Remove skip_session! as it is not supported in Rails 5

* Minor cleanup in StreamEntriesController

* Remove redundant mark_cacheable! calls
 2019-06-05 14:02:59 +02:00
ThibG e80cb67ed7 Fix potential private status leak (#10969) 2019-06-05 13:40:20 +02:00
ThibG 1fee4b0fe2 Fix refreshing featured toots when the new collection is empty (#10971) 
Fixes #10945
 2019-06-05 13:39:59 +02:00
ThibG 5e251a9b55 Merge pull request #1093 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-05 13:28:05 +02:00
ThibG be6e54a70c Do not misattribute inlined boosts if `attributedTo` isn't present (#10967) 
* Do not misattribute inlined boosts if `attributedTo` isn't present

Fixes #10950

* Fix tests
 2019-06-04 23:24:31 +02:00
Eugen Rochko b01b8521ec Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Eugen Rochko a7952c3a54 Change reblogs counter to be updated when boosted privately (#10964) 2019-06-04 23:11:44 +02:00