about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
2019-05-10Fix media description confirmation modalThibaut Girka
Fixes #1040
2019-05-09Update simple_form.fr.yml (#10726)manuelviens
* Minor modif and add Modified '' by ’ and added invite_request * Update simple_form.fr.yml Modifications suggérées par ThibG * Update simple_form.fr.yml Remplacement des ' par des ’. * Update simple_form.fr.yml Ajout de deux petits espaces devant sessions:
2019-05-09Add strings for Slovak (#10734)Marek Ľach
* Add strings for Slovak * Update sk.yml
2019-05-09Update fr.yml (#10727)manuelviens
* Update fr.yml Added missing lines * Update fr.yml Application des modifications de ThibG * Update fr.yml Modifications proposées par ThibG
2019-05-09Add ES_PREFIX in .env.production.sample (#10087)Stanislas
2019-05-09Add confirm modal for unboosting toots (#10287)Aurélien Reeves
[#3815] Display the boost modal also when unboosting toots.
2019-05-09Add emoji suggestions to CW and poll option fields (#10555)ThibG
* Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus
2019-05-09Prevent silenced local users from notifying remote users not following them ↵ThibG
(#10575) * Prevent silenced local users from notifying remote users not following them This is an attempt to extend the local restrictions of silenced users to the federation. * Add tests * Add tests for making sure private status don't get sent over OStatus
2019-05-09Add some caching for HTML versions of statuses pages (#10701)ThibG
2019-05-09Improve poll link accessibility (#10720)Maciek Baron
* Add distinction between hover and active/focus states * Resolves #10198
2019-05-09Remove custom emojis on "tootctl domains purge" (#10721)Jeong Arm
* Remove custom emojis on domains purge * Change message "Removing" to "Removed"
2019-05-09Record deleted(by mod) status to prevent re-appear (#10732)Jeong Arm
* Record deleted(by mod) status to prevent re-appear * Move to Tombstone * Add missing migration script
2019-05-08Bring back crossed eye icon on gallery (#10715)Jeong Arm
2019-05-08Fix tabs bar on mobileThibaut Girka
Fixes #1037
2019-05-07Fix some colors of high contrast theme (#10711)nzws
* Fix "nothing here" text color of high contrast * Fix counter border color of high contrast
2019-05-07Fix front-end crash when a video has a blurhash and is hidden behind a CWThibaut Girka
2019-05-07Bump redis from 4.1.0 to 4.1.1 (#10722)dependabot[bot]
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.0...v4.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-07i18n Update Catalan translation (#10719)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
2019-05-06Bump parallel_tests from 2.28.0 to 2.29.0 (#10716)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-06Add description on hover in media gallery (#10713)ThibG
2019-05-05Fix content warning button displaying a link icon when no status card is setThibaut Girka
2019-05-06i18n: Update Japanese translations (#10706)mayaeh
* Update Japanese translations. run yarn manage:translations This commit includes translations by some users that were done at the transifex. * Reduce translation text because it becomes two lines.
2019-05-061 NL string update (#10709)jeroenpraat
* 1 NL string update No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language * Update nl.json
2019-05-05fix pinned columns ’s Media-only buttonKirishima21
Media-only toggles could not be used on pinned columns. The commit fixes this problem.
2019-05-05Merge pull request #1032 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-05Bump version to 2.8.2 (#10703)Eugen Rochko
2019-05-05[Glitch] Make sure the instance banner is never croppedBaptiste Gelez
Port 21209c2b52d1ed1d1dee2dad2d725ffc7714701b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-05Minor Slovak locale update (#10705)Marek Ľach
2019-05-05I18n: Update Czech translation 🇨🇿 (#10704)Aditoo17
* I18n: Update Czech translation * Tiny fix
2019-05-05Make sure the instance banner is never cropped (#10702)Baptiste Gelez
2019-05-04Minor style fixesThibaut Girka
2019-05-04Bump blurhash from 0.1.2 to 0.1.3 (#10700)Eugen Rochko
2019-05-04[Glitch] Change font weight of sensitive button to 500Eugen Rochko
Port 63b1388fefff9414c2d0f9883f2d33f7c73284c6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04[Glitch] Make the "mark media as sensitive" button more obvious in web UIEugen Rochko
Port 05ef3462ba0af7b147a7cfa8de2735e99dc59ac5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04Add visibility icon back in media galleryThibaut Girka
2019-05-04Add back description on hoverThibaut Girka
2019-05-04[Glitch] Fix transition: allThibG
Port 7aa749ab46b53bc5b234332ac35acc09a636fc28 to glitch-soc
2019-05-04[Glitch] Make the cursor icon consistant across media types in account media ↵ThibG
gallery
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-04[Glitch] Add button to view context to media modalEugen Rochko
Port eb63217210b0ab85ff1fcca9506d5e7931382a56 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04[Glitch] Fix alignment of items in the account gallery in web UI and load ↵Eugen Rochko
more per page Port 967e419f8fa87af74f4bb530d7493c1dde02fca8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04[Glitch] Change account gallery in web UIEugen Rochko
Port 3f143606faa6181ff2745b6bd29ac8ea075088bf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04Minor CSS fixesThibaut Girka
2019-05-04[Glitch] Add blurhashEugen Rochko
Port front-end changes from fba96c808d25d2fc35ec63ee6745a1e55a95d707 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04Fix transition: all (#10699)ThibG
2019-05-04Add SOURCE_TAG to show source repository's tag (#10698)Ushitora Anqou
2019-05-04Minor account media gallery fixes (#10695)ThibG
* Make the cursor icon consistant across media types in account media gallery * Fix the video player modal causing scroll position to reset
2019-05-04Fix glitch SCSS for links in error messages in admin interfaceThibG
Port SCSS changes from 011b032300657ccca4a42866749afc6ec2588ecc
generated by cgit-pink (git 2.37.1) at 2024-12-25 19:16:07 +0000