about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-03-23Merge pull request #398 from ashkitten/compressed-notifsDavid Yip
make expanded notifications show like default
2018-03-23Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-23[i18n] Occitan update (#6869)Quentí
* Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize
2018-03-22expanded notifications show like defaultAsh Levy
2018-03-22Bump version to 2.3.2Eugen Rochko
2018-03-22Bump version to 2.3.2rc5Eugen Rochko
2018-03-22Do not re-query mentions from serializers (#6858)Eugen Rochko
Fix performance regression from #6836
2018-03-22Restore username validation to disallow dots, for now (#6863)Eugen Rochko
Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.
2018-03-22Fix MENTION_RE to not match nil usernames (#6862)ThibG
2018-03-22Hide floating action button on thread views (#6859)Eugen Rochko
2018-03-21Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-03-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-21Update sanitize and loofah (#6855)Patrick Figel
Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS vulnerabilities present in these gems when built against libxml2 >= 2.9.2.
2018-03-21Permit dots in usernames with conditions (#6844)Eugen Rochko
* Permit dots in usernames with conditions - Dot cannot be the start or end of username - a.lice and al.ice are considered the same during sign-up * Fix regex mixin flags
2018-03-21Remove debug option from Babel preset env (#6852)Akihiko Odaki
2018-03-20Bump version to 2.3.2rc4Eugen Rochko
2018-03-20Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-20Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)Eugen Rochko
Fix #6816, fix #6790
2018-03-20Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestionsDavid Yip
[Glitch] Cancel outdated pending compose suggestions
2018-03-20Fix i18n fallback configuration conflicts with environment configurations ↵Akihiko Odaki
(#6843)
2018-03-20Use username/domain to match existing accounts in ActivityPub (#6842)Eugen Rochko
See also: #6837, #6667
2018-03-20[Glitch] Cancel outdated pending compose suggestionsThibaut Girka
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
2018-03-20Cancel outdated pending compose suggestions (#6838)ThibG
2018-03-20request: in the event of failure, try other IPs (#6761) (#6813)Rey Tucker
* request: in the event of failure, try other IPs (#6761) In the case where a name has multiple A/AAAA records, we should try subsequent records instead of immediately failing when we have a failure on the first IP address. This significantly improves delivery success when there are network connectivity problems affecting only IPv4 or IPv6. * fix method call style * request_spec: adjust test case to use Addrinfo * request: Request/open: move private addr check to within begin/rescue * request_spec: add case to test failover, fix exception check * Double Addrinfo.foreach so that it correctly yields instances
2018-03-19Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-03-19Merge pull request #394 from ashkitten/compressed-notifsDavid Yip
fix compressed notifications again (#393)
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19Serialize mentions in the order they are added (#6836)ThibG
Up until now, the order seemed to be in the *opposite* order, which caused the WebUI to populate mentions in reversed order when replying to toots local to one's instance.
2018-03-19Display content warning in mail notification emails (#6832)ThibG
2018-03-19rename pam email environment variable to something more understandable and ↵Alexander
default to LOCAL_DOMAIN (better fallback) (#6833)
2018-03-19bugfixes and gem update (#6831)Alexander
* update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning
2018-03-19Fix e-mail changed notification (fixes #6778) (#6835)ThibG
In Devise::Mailer#email_changed, the new email might be in the email attr. See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb
2018-03-19Weblate translations 20180319 (#6827)Renato "Lond" Cerqueira
* Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 91.7% (533 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Spanish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Finnish) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 76.7% (446 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 93.2% (542 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations
2018-03-19Bump version to 2.3.2rc3Eugen Rochko
2018-03-19fix .status__info__icons layoutAsh Lea
2018-03-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: config/i18n-tasks.yml
2018-03-18Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-03-18Merge pull request #388 from ThibG/glitch-soc/federated-pinned-tootsDavid Yip
Port WebUI toots/with reply/media tabs and pinned toots to glitch
2018-03-19Ignore media validation when attaching to status during processing (#6822)Eugen Rochko
Fix #6821
2018-03-18Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)Eugen Rochko
Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...
2018-03-18Fix elephant graphic being draggable and selectable (#6819)Eugen Rochko
2018-03-18fix compressed notifications again (#393)Ash Levy
2018-03-18Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-18If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)Eugen Rochko
Fix #6784
2018-03-18Synchronize HTML page cache with sessions (#6815)Akihiko Odaki
2018-03-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-17Add entropy to download filenames (#6811)nightpool
pretty quick fix, and with the 1 week expiration i don't think we need to be too worried about the existing files closes #6798
2018-03-17Bump version to 2.3.2rc2Eugen Rochko
2018-03-17Re-add git and nodejs-npm to Dockerfile (#6810)Eugen Rochko
Fix #6809 I don't know why, either
2018-03-17Revert "Upgrade Paperclip to version 6.0.0" (#6807)Eugen Rochko
* Revert "Bump version to 2.3.2rc1" This reverts commit cdf8b92fea269209cedf38c50bca276cdf47b1fe. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit 0074cad44ffcbbdbc798f57a21829359741e60d9. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit 4a0a19fe54f1d2d433ad3d72c35f2bbb915279f6. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit 338bff8b93fa939c2968818e53386fd0c013d9a9. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit b88fcd53f711673b21e5ff4a547dbf929866a2ee.
generated by cgit-pink (git 2.37.1) at 2024-12-27 13:47:57 +0000