]>
cat aescling's git repositories - mastodon.git/log
ThibG [Wed, 12 Jun 2019 22:14:27 +0000 (00:14 +0200)]
[Glitch] Fix border-bottom of active tab bars
Port
faafc3ae25378121148356b60d1bef6f57013069 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Wed, 12 Jun 2019 18:58:47 +0000 (20:58 +0200)]
Fix notification badge
Thibaut Girka [Wed, 12 Jun 2019 18:49:56 +0000 (20:49 +0200)]
Fix multiple-column padding
Thibaut Girka [Wed, 12 Jun 2019 18:40:20 +0000 (20:40 +0200)]
Add hints to make local settings about layout more explicit
Thibaut Girka [Wed, 12 Jun 2019 18:13:49 +0000 (20:13 +0200)]
Replace link to favourites with link to bookmarks
Thibaut Girka [Wed, 12 Jun 2019 17:38:57 +0000 (19:38 +0200)]
Fix navigation panel
Thibaut Girka [Wed, 12 Jun 2019 15:30:36 +0000 (17:30 +0200)]
Restore navigation bar position glitch-soc setting
Thibaut Girka [Wed, 12 Jun 2019 15:18:45 +0000 (17:18 +0200)]
Use forceSingleColumn only in automatic layout mode
Thibaut Girka [Wed, 12 Jun 2019 15:15:43 +0000 (17:15 +0200)]
Default to multiple column mode if backend doesn't have appropriate seting
Thibaut Girka [Wed, 12 Jun 2019 14:03:10 +0000 (16:03 +0200)]
Fix and refactor SCSS
Thibaut Girka [Wed, 12 Jun 2019 13:45:00 +0000 (15:45 +0200)]
Add app settings link to single-column mode
Eugen Rochko [Sat, 8 Jun 2019 23:59:42 +0000 (01:59 +0200)]
[Glitch] Fix position of search icon
Port
9add88a920200bc0610b25434ad056469f28eae5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Fri, 7 Jun 2019 15:15:18 +0000 (17:15 +0200)]
[Glitch] Fix some React warnings
Port
cc8f6b3cdaca81be99875c27002e0280d1d88191 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Tue, 4 Jun 2019 21:11:57 +0000 (23:11 +0200)]
[Glitch] Fix margins on profile metadata in single column mode
Port
ed19f33440f4ccfe5323c6a8a67a345682652873 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Wenceslao Páez Chávez [Thu, 6 Jun 2019 11:40:17 +0000 (06:40 -0500)]
[Glitch] Fix overlap of emoji button on search popup
Port
fe3bf3b0fc7c74ce12b48a4e03498c410bfd82f5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Takeshi Umeda [Thu, 6 Jun 2019 10:30:14 +0000 (19:30 +0900)]
[Glitch] Fix emoji picker being always displayed
Port
c402c291f4991e2b021d8c13b557e6a8f650dcf3 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Tue, 4 Jun 2019 17:50:38 +0000 (19:50 +0200)]
[Glitch] Add profile directory link to single column navigation panel
Port
6077eca240d3dc8765380c99896d85ab6e9c4ea9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Takeshi Umeda [Sun, 2 Jun 2019 08:05:54 +0000 (17:05 +0900)]
[Glitch] Improvement variable height in single column layout
Port
d93b82af87de90eaa29eb54a423722fb9fb45b38 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Hanage999 [Sat, 1 Jun 2019 04:59:21 +0000 (13:59 +0900)]
[Glitch] Center 2-columns layout without side effect
Port
7c1ca0c37b7e68bd4e388afb3bca55d2b71fd2ad to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Mon, 27 May 2019 19:58:41 +0000 (21:58 +0200)]
[Glitch] Refactor footers in web UI into a single component
Port
451e5980b609eca5b20041963aca0098508475d7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
abcang [Mon, 27 May 2019 19:56:29 +0000 (04:56 +0900)]
[Glitch] Display notifications count on a new single column
Port
3593b854233da1dbb49e95c929019c60a53eca79 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Hanage999 [Sun, 26 May 2019 10:22:33 +0000 (19:22 +0900)]
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
Port
4a818ac2deffaff9925ce5b160dbc5385b815a87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Sun, 26 May 2019 00:55:37 +0000 (02:55 +0200)]
[Glitch] Improvements to the single column layout
Port
0e445ebb1392c8dbce320509d219f16c7c221406 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Sat, 25 May 2019 19:27:00 +0000 (21:27 +0200)]
[Glitch] Add responsive panels to the single-column layout
Port
1e5532e693d9533ee37f553aeb191e284178fa52 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Thu, 23 May 2019 18:01:10 +0000 (20:01 +0200)]
[Glitch] Various improvements to single column layout
Port
84dc21d55d8627182ce201baeddb6fbbdf8748c2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Wed, 22 May 2019 23:35:22 +0000 (01:35 +0200)]
[Glitch] Add single-column mode
Port
9ddeb30f90f9402eb567c88354d4956fcfdf0361 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Thu, 13 Jun 2019 10:50:52 +0000 (12:50 +0200)]
Fix clicking on the elefriend
Thibaut Girka [Wed, 12 Jun 2019 07:46:39 +0000 (09:46 +0200)]
Properly handle unboosting statuses from detailed view
Fixes #1106
ThibG [Tue, 11 Jun 2019 20:18:41 +0000 (22:18 +0200)]
Merge pull request #1105 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Tue, 11 Jun 2019 00:26:37 +0000 (02:26 +0200)]
[Glitch] Fix list not being automatically unpinned when it returns 404 in web UI
Port
92b572e2a3830086497900fa78dcfcc2ae919e33 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Tue, 11 Jun 2019 19:55:00 +0000 (21:55 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Eugen Rochko [Tue, 11 Jun 2019 19:49:12 +0000 (21:49 +0200)]
Update Crowdin configuration file
Masoud Abkenar [Tue, 11 Jun 2019 17:55:29 +0000 (19:55 +0200)]
l10n: update Persian translations (fa.yml) (#11052)
* l10n: update Persian translations (fa.yml)
* Fix fa.yml syntax
* i18n-tasks normalize
Masoud Abkenar [Tue, 11 Jun 2019 15:37:52 +0000 (17:37 +0200)]
l10n: update Persian translation (#11050)
* l10n: update Persian translation
* Update fa.yml
唐宗勛 [Tue, 11 Jun 2019 04:08:40 +0000 (12:08 +0800)]
update zh-CN translations (#11046)
Jeong Arm [Tue, 11 Jun 2019 04:06:42 +0000 (13:06 +0900)]
Fix Korean translate (#11047)
Eugen Rochko [Tue, 11 Jun 2019 00:26:37 +0000 (02:26 +0200)]
Fix list not being automatically unpinned when it returns 404 in web UI (#11045)
ThibG [Mon, 10 Jun 2019 21:01:56 +0000 (23:01 +0200)]
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Mon, 10 Jun 2019 19:36:20 +0000 (21:36 +0200)]
Add German translations (#11043)
Thibaut Girka [Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Mon, 10 Jun 2019 17:27:10 +0000 (19:27 +0200)]
Fix clicking on the left side of a conversation not marking it as read (#11041)
ふるふる [Mon, 10 Jun 2019 17:26:43 +0000 (02:26 +0900)]
Fix can't save preference other (#11042)
Eugen Rochko [Fri, 7 Jun 2019 21:35:26 +0000 (23:35 +0200)]
[Glitch] Fix RTL layout not being RTL within the columns area
Port
25f93f40974c61b5a02770fe0b1d016213397d1d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Fri, 7 Jun 2019 01:39:24 +0000 (03:39 +0200)]
[Glitch] Change preferences page into appearance, notifications, and other
Port SCSS changes from
1db4117030ac69b1083ddfe7390dedb02cede421 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Mon, 10 Jun 2019 16:30:41 +0000 (18:30 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
Thibaut Girka [Fri, 7 Jun 2019 16:57:31 +0000 (18:57 +0200)]
Minor cleanup
Thibaut Girka [Fri, 7 Jun 2019 16:57:10 +0000 (18:57 +0200)]
Fix unboost confirmation dialog not showing up on detailed statuses
Thibaut Girka [Fri, 7 Jun 2019 16:38:07 +0000 (18:38 +0200)]
Add option to display a warning before boosting toots lacking media descriptions
Thibaut Girka [Sun, 9 Jun 2019 10:07:23 +0000 (12:07 +0200)]
Add DM conversations mode similar to upstream
Eugen Rochko [Mon, 10 Jun 2019 10:28:13 +0000 (12:28 +0200)]
Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
mayaeh [Mon, 10 Jun 2019 10:27:17 +0000 (19:27 +0900)]
Fix emoji-button appearing above privacy-dropdown (#11027)
Marek Ľach [Mon, 10 Jun 2019 07:25:27 +0000 (09:25 +0200)]
Update simple_form.sk.yml (#11028)
manuelviens [Mon, 10 Jun 2019 04:12:51 +0000 (00:12 -0400)]
Update simple_form.fr.yml (#11021)
manuelviens [Mon, 10 Jun 2019 04:12:28 +0000 (00:12 -0400)]
Update fr.yml (#11023)
manuelviens [Mon, 10 Jun 2019 04:07:11 +0000 (00:07 -0400)]
Update fr.json (#11024)
Marek Ľach [Sun, 9 Jun 2019 20:55:37 +0000 (22:55 +0200)]
Update sk.yml (#11015)
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
ThibG [Sun, 9 Jun 2019 20:55:28 +0000 (22:55 +0200)]
Fix old migrations failing because of new version of `strong_migrations` (#11018)
Thibaut Girka [Sun, 9 Jun 2019 20:31:23 +0000 (22:31 +0200)]
Fix old migrations failing because of new version of `strong_migrations`
Fixes #1099
Jeong Arm [Sun, 9 Jun 2019 19:07:50 +0000 (04:07 +0900)]
Add missing Korean translations (#11014)
Alix Rossi [Sun, 9 Jun 2019 14:23:30 +0000 (16:23 +0200)]
i18n: Update Corsican front-end translation (#11010)
Eugen Rochko [Sun, 9 Jun 2019 13:53:08 +0000 (15:53 +0200)]
Bump version to 2.9.0rc1 (#11004)
Eugen Rochko [Sun, 9 Jun 2019 13:52:42 +0000 (15:52 +0200)]
Run yarn manage:translations (#11008)
Eugen Rochko [Sun, 9 Jun 2019 10:47:33 +0000 (12:47 +0200)]
Change priority of delete activity forwards for replies and reblogs (#11002)
Fix #11001
Eugen Rochko [Sat, 8 Jun 2019 23:59:42 +0000 (01:59 +0200)]
Fix position of search icon (#11003)
spla [Sat, 8 Jun 2019 23:32:22 +0000 (01:32 +0200)]
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
Eugen Rochko [Sat, 8 Jun 2019 20:32:59 +0000 (22:32 +0200)]
Fix more issues in the light theme (#10996)
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
Darius Kazemi [Sat, 8 Jun 2019 16:43:11 +0000 (11:43 -0500)]
Specify gzip required in tootctl emoji help (#11000)
Aditoo17 [Sat, 8 Jun 2019 15:58:40 +0000 (17:58 +0200)]
I18n: Update Czech translation 🇨🇿 (#10995)
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
ThibG [Sat, 8 Jun 2019 15:40:59 +0000 (17:40 +0200)]
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
Eugen Rochko [Sat, 8 Jun 2019 13:30:06 +0000 (15:30 +0200)]
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
Eugen Rochko [Sat, 8 Jun 2019 08:23:41 +0000 (10:23 +0200)]
Improve light theme (#10992)
Eugen Rochko [Fri, 7 Jun 2019 21:35:26 +0000 (23:35 +0200)]
Fix RTL layout not being RTL within the columns area (#10990)
ThibG [Fri, 7 Jun 2019 20:15:44 +0000 (22:15 +0200)]
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Thu, 6 Jun 2019 11:04:49 +0000 (13:04 +0200)]
[Glitch] Fix not being able to directly switch between list timelines in web UI
Port
5bfd802c571a2793bb59ba4540407a6147e82f88 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
ThibG [Thu, 6 Jun 2019 11:04:34 +0000 (13:04 +0200)]
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
Port
2657765d2a6804f34ce65bfdab7ec96f07d99732 to glitch-soc
Jeong Arm [Wed, 5 Jun 2019 13:29:45 +0000 (22:29 +0900)]
[Glitch] Scroll to compose form when focus
Port
8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Fri, 7 Jun 2019 15:15:18 +0000 (17:15 +0200)]
Fix some React warnings (#10989)
Thibaut Girka [Fri, 7 Jun 2019 15:05:32 +0000 (17:05 +0200)]
[Glitch] Fix refreshing featured toots when the new collection is empty
Port
d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b to glitch-soc
Thibaut Girka [Fri, 7 Jun 2019 15:00:36 +0000 (17:00 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
Eugen Rochko [Fri, 7 Jun 2019 14:51:08 +0000 (16:51 +0200)]
Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)
Thibaut Girka [Thu, 6 Jun 2019 11:34:33 +0000 (13:34 +0200)]
Fix display of alt-text when a media attachment is not available
ThibG [Fri, 7 Jun 2019 10:41:08 +0000 (12:41 +0200)]
Fix display of alt-text when a media attachment is not available (#10981)
Alix Rossi [Fri, 7 Jun 2019 10:12:17 +0000 (12:12 +0200)]
i18n: Update Corsican translations (#10987)
Eugen Rochko [Fri, 7 Jun 2019 01:39:24 +0000 (03:39 +0200)]
Change preferences page into appearance, notifications, and other (#10977)
Eugen Rochko [Fri, 7 Jun 2019 01:24:10 +0000 (03:24 +0200)]
Add waiting time to list of pending accounts in admin UI (#10985)
Yamagishi Kazutoshi [Thu, 6 Jun 2019 16:51:46 +0000 (01:51 +0900)]
Fix sass-lint config (#10982)
ThibG [Thu, 6 Jun 2019 06:45:06 +0000 (08:45 +0200)]
Change e-mail contact for CoC enforcement
Wenceslao Páez Chávez [Thu, 6 Jun 2019 11:40:17 +0000 (06:40 -0500)]
Fix overlap of emoji button on search popup (#10978)
Thibaut Girka [Thu, 6 Jun 2019 10:14:11 +0000 (12:14 +0200)]
Fix CW field automatically getting the focus when it is always enabled
Eugen Rochko [Thu, 6 Jun 2019 11:04:49 +0000 (13:04 +0200)]
Fix not being able to directly switch between list timelines in web UI (#10973)
ThibG [Thu, 6 Jun 2019 11:04:34 +0000 (13:04 +0200)]
Fix “mark as sensitive” not being used in delete & redraft (#10980)
Yamagishi Kazutoshi [Thu, 6 Jun 2019 10:31:48 +0000 (19:31 +0900)]
require rubocop-rails in .rubocop.yml (#10974)
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"
This reverts commit
121d19d7fa239c52ce86352d3fdae0649c892a20.
* Disable Rails/HelperInstanceVariable
Takeshi Umeda [Thu, 6 Jun 2019 10:30:14 +0000 (19:30 +0900)]
Fix emoji picker being always displayed (#10979)
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
Jeong Arm [Wed, 5 Jun 2019 13:29:45 +0000 (22:29 +0900)]
Scroll to compose form when focus (#10970)
* Scroll to compose form when focus
* Get rid of constructor
ThibG [Wed, 5 Jun 2019 12:02:59 +0000 (14:02 +0200)]
Cleanup various controllers (#10972)
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
ThibG [Wed, 5 Jun 2019 11:40:20 +0000 (13:40 +0200)]
Fix potential private status leak (#10969)
ThibG [Wed, 5 Jun 2019 11:39:59 +0000 (13:39 +0200)]
Fix refreshing featured toots when the new collection is empty (#10971)
Fixes #10945
ThibG [Wed, 5 Jun 2019 11:28:05 +0000 (13:28 +0200)]
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Tue, 4 Jun 2019 21:24:31 +0000 (23:24 +0200)]
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
Eugen Rochko [Tue, 4 Jun 2019 21:11:57 +0000 (23:11 +0200)]
Fix margins on profile metadata in single column mode (#10961)