about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-06-12l10n: update Persian translations (fa.yml) (#11052)Masoud Abkenar
* l10n: update Persian translations (fa.yml) * Fix fa.yml syntax * i18n-tasks normalize
2019-06-12l10n: update Persian translation (#11050)Masoud Abkenar
* l10n: update Persian translation * Update fa.yml
2019-06-11update zh-CN translations (#11046)唐宗勛
2019-06-11Fix Korean translate (#11047)Jeong Arm
2019-06-11Fix list not being automatically unpinned when it returns 404 in web UI (#11045)Eugen Rochko
2019-06-10Merge pull request #1102 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-10Add German translations (#11043)Eugen Rochko
2019-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-10Fix clicking on the left side of a conversation not marking it as read (#11041)ThibG
2019-06-10Fix can't save preference other (#11042)ふるふる
2019-06-10[Glitch] Fix RTL layout not being RTL within the columns areaEugen Rochko
Port 25f93f40974c61b5a02770fe0b1d016213397d1d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10[Glitch] Change preferences page into appearance, notifications, and otherEugen Rochko
Port SCSS changes from 1db4117030ac69b1083ddfe7390dedb02cede421 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-06-10Minor cleanupThibaut Girka
2019-06-10Fix unboost confirmation dialog not showing up on detailed statusesThibaut Girka
2019-06-10Add option to display a warning before boosting toots lacking media descriptionsThibaut Girka
2019-06-10Add DM conversations mode similar to upstreamThibaut Girka
2019-06-10Fix login sometimes redirecting to paths that are not pages (#11019)Eugen Rochko
Fix #11016
2019-06-10Fix emoji-button appearing above privacy-dropdown (#11027)mayaeh
2019-06-10Update simple_form.sk.yml (#11028)Marek Ľach
2019-06-10Update simple_form.fr.yml (#11021)manuelviens
2019-06-10Update fr.yml (#11023)manuelviens
2019-06-10Update fr.json (#11024)manuelviens
2019-06-09Update sk.yml (#11015)Marek Ľach
* Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml
2019-06-09Fix old migrations failing because of new version of `strong_migrations` ↵ThibG
(#11018)
2019-06-09Fix old migrations failing because of new version of `strong_migrations`Thibaut Girka
Fixes #1099
2019-06-09Add missing Korean translations (#11014)Jeong Arm
2019-06-09i18n: Update Corsican front-end translation (#11010)Alix Rossi
2019-06-09Bump version to 2.9.0rc1 (#11004)Eugen Rochko
2019-06-09Run yarn manage:translations (#11008)Eugen Rochko
2019-06-09Change priority of delete activity forwards for replies and reblogs (#11002)Eugen Rochko
Fix #11001
2019-06-09Fix position of search icon (#11003)Eugen Rochko
2019-06-09i18n: Update Catalan translations (#10998)spla
* 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-08Fix more issues in the light theme (#10996)Eugen Rochko
* Fix tabs bar in light theme * Fix borders on small screens in light theme
2019-06-08Specify gzip required in tootctl emoji help (#11000)Darius Kazemi
2019-06-08I18n: Update Czech translation 🇨🇿 (#10995)Aditoo17
* I18n: Update Czech translation * Fix * Re-fix * And also this * The real fix now (hopefully)
2019-06-08Put poll options behind content warnings (#10983)ThibG
* 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-08Change full logo to use primary text color of the given theme (#10994)Eugen Rochko
* Change full logo to use primary text color of the given theme * Fix colors of public layout header in light theme
2019-06-08Improve light theme (#10992)Eugen Rochko
2019-06-07Fix RTL layout not being RTL within the columns area (#10990)Eugen Rochko
2019-06-07Merge pull request #1097 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-07[Glitch] Fix not being able to directly switch between list timelines in web UIEugen Rochko
Port 5bfd802c571a2793bb59ba4540407a6147e82f88 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07[Glitch] Fix “mark as sensitive” not being used in delete & redraftThibG
Port 2657765d2a6804f34ce65bfdab7ec96f07d99732 to glitch-soc
2019-06-07[Glitch] Scroll to compose form when focusJeong Arm
Port 8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07Fix some React warnings (#10989)Eugen Rochko
2019-06-07[Glitch] Fix refreshing featured toots when the new collection is emptyThibaut Girka
Port d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b to glitch-soc
2019-06-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
2019-06-07Change /settings/preferences to redirect to appearance, add ↵Eugen Rochko
/settings/preferences/other (#10988)
2019-06-07Fix display of alt-text when a media attachment is not availableThibaut Girka
2019-06-07Fix display of alt-text when a media attachment is not available (#10981)ThibG