about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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-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.
2018-03-17Bump version to 2.3.2rc1Eugen Rochko
2018-03-17Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)Eugen Rochko
Fix 6734
2018-03-17Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)Daniel Hunsaker
This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.
2018-03-17Correct the reference to user's password in mastodon:add_user task (#6800)Akihiko Odaki
2018-03-17Upgrade Paperclip to version 6.0.0 (#6754)Yamagishi Kazutoshi
2018-03-17Properly center .nothing-here (#6787) (#6788)trwnh
Apply "margin: 0 auto;" at line 443 to fix issue #6787
2018-03-17Cache HTML page with Service Worker (#6802)Akihiko Odaki
This is the first step to make Mastodon work offline. It is also required by Chromium to trigger Web Manifest automated install prompt.
2018-03-17[Nanobox] Stream backups to the warehouse (#6799)Daniel Hunsaker
The `curl` docs are terrible. Use `-X POST -T` instead of `--data-binary`, to avoid loading entire backups into memory _before_ transferring to the warehouse, and just stream the data across as it comes in.
2018-03-16Merge pull request #391 from ashkitten/compressed-notifsDavid Yip
fix non-notification boosts for compressed notifications
2018-03-16fix non-notification boostsAsh Levy
2018-03-16[Glitch] Federate pinned statuses over ActivityPubThibaut Girka
Port 9110db41c53a2f3f22affc23b364362133997d3e to glitch
2018-03-16[Glitch] Improve style of web UI account tabsThibaut Girka
Port of 38b9af76a2365b2099dd2d6a77225a4ace8c290f to glitch
2018-03-16[Glitch] Add "Toots/Toots with replies/Media" tab below profile headerThibaut Girka
Port 51310125051a75ef7af4e8ffc8b6532c151e96b6 to glitch
2018-03-16Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changesDavid Yip
Port reports ui changes to glitch-soc flavour
2018-03-16Merge pull request #389 from ThibG/glitch-soc/error-500David Yip
Fix error 500 page
2018-03-16Merge pull request #386 from ashkitten/compressed-notifsDavid Yip
compress boost/fave notifications more
2018-03-16Fix error 500 pageThibaut Girka
2018-03-16Fix toot text color in the report modalThibaut Girka
2018-03-16Show media on report UIThibaut Girka
Ports 219aac7800a086a75f3ef36f71955bb8b6ccc2c0 to glitch-soc
2018-03-16Add close modal icon to report dialog (#6591)Thibaut Girka
Port 379cdfaac5838c7008b80c8f317ca6403da683a9 to glitch-soc flavour
2018-03-16Port federated reports UI to glitchsocThibaut Girka
Port 41a01bec2337e7021634f2e9c78d86a1c3002fcf to glitch-soc
2018-03-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-13compress boost/fave notifications moreAsh Levy
2018-03-14i18n: Update Polish translation (#6780)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-13Weblate translations (2018-03-13) (#6777)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/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations
2018-03-13Bump version to 2.3.1Eugen Rochko
2018-03-13Hide loading bar on status interactions (#6774)Eugen Rochko
2018-03-13Bump version to 2.3.1rc3Eugen Rochko
2018-03-13Merge branch 'kagucho-spoiler'Eugen Rochko
2018-03-13Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoilerEugen Rochko
2018-03-13Log BackupWorker backtrace, delete Backup if retries exhausted (#6769)Eugen Rochko
2018-03-13Fix #6757: Adjust RTL styles for landing page (#6768)Eugen Rochko
2018-03-13Change the title of sensitive button by state (#6771)Akihiko Odaki
Icon showing the state may be confusing. (does the slahed eye icon mean the state that it is sensitive, or to mark it as sensitive?) Moreover, it may not help for blind people. The title will give the precise representation of the current state.
2018-03-13Change the title of spoiler button by stateAkihiko Odaki
The title will give the precise representation of the current state. It would be helpful for blind people.
2018-03-13Fix #6762: Do not overwrite some status attributes in reducer (#6767)Eugen Rochko
2018-03-13[Nanobox] Fix DB backup task (#6766)Daniel Hunsaker
Not sure how I missed that it had been using the wrong evar this entire time...
2018-03-13Do not run lint in Travis CI (#6763)Akihiko Odaki
Lint is done by codeclimate
2018-03-12Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: README.md
2018-03-12Detailed SMTP setup (#6759)Ushitora Anqou
* add detailed SMTP settings setup in mastodon:setup * add localhost SMTP settings setup in mastodon:setup * SMTP settings setup should exit after successful delivery of test mail
2018-03-12Merge pull request #384 from ThibG/glitch-soc/features/no-media-urlGô Shoemake
Remove text requirement when media attached from statuses (fixes #381)
2018-03-12Merge pull request #344 from chriswmartin/getting-started-badge-mergeGô Shoemake
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
2018-03-12Remove text requirement when media attached from statuses (fixes #381)Thibaut Girka
Ports cfa9b6e13ab3c434f3901df6f614d0aa94a3d1ed to glitchsoc
2018-03-12set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)艮 鮟鱇
2018-03-12Bump version to 2.3.1rc2Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-09 09:00:15 +0000