mastodon

vbatts/mastodon

Fork 0

Commit graph

865cb39e9b lock capistrano to 3.8.0 (#1890) Alex Dunn 2017-04-16 03:52:18 -07:00
5d710b1139 Make file attachment on MediaAttachment optional (#1865) Eugen 2017-04-16 12:51:30 +02:00
fd81916e86 cache blockings for reducing queries. Keiji Yoshimi 2017-04-15 23:59:39 +09:00
8a58942c80 Fix up recovery codes design a little (#1866) Eugen 2017-04-16 04:32:57 +02:00
f97272549c Remove unused gem: coffee-rails (#1885) luigi 2017-04-16 04:02:29 +02:00
363de2dffd Leave out the "Expires" header from S3 uploads (#1886) Joachim Viide 2017-04-16 05:01:58 +03:00
6a1ac9b31f capistrano: allow overriding repo_url and branch (#1889) Alex Dunn 2017-04-15 19:01:27 -07:00
3834e1e69b View spec fix (#1888) Matt Jankowski 2017-04-15 21:40:33 -04:00
95bcbaa434 Fix #1852 - Ensure feeds have valid <title> tags (#1875) Eugen 2017-04-16 02:40:36 +02:00
911338bdcc Show error message if video cannot be loaded (#1879) Isabelle Knott 2017-04-15 19:12:47 -04:00
0f8b7d0660 Removed Heroku in-process spawning. (#1873) Ash Furrow 2017-04-15 17:02:13 -04:00
e332552816 Indicate when a toot is part of a chain with a "reply all" icon (#1869) Eugen 2017-04-15 22:48:41 +02:00
0d83569899 Fix cross-origin integrity (#1871) Eugen 2017-04-15 22:48:30 +02:00
515434ed87 English localization for mention notification was missing (#1867) Eugen 2017-04-15 22:48:17 +02:00
3d3e32befb Check for a custom css file to help customization of instances (#1368) Naouak 2017-04-15 22:47:48 +02:00
fa08b5079d Make the rake mastodon:users:clear task properly clear out unconfirmed users (#1777) Eugen 2017-04-15 21:55:28 +02:00
00392d3c63 ActiveRecord::NotFound is not defined (#1864) alpaca-tc 2017-04-16 04:17:59 +09:00
28606d730a Fix typo in simple_form.eo.yml (#1848) oliverkeeble 2017-04-15 15:46:48 +01:00
1c8477eab2 Give SINGLE_USER a chance to register (#1820) Marcin Cieślak 2017-04-15 16:46:27 +02:00
6670e6d33f Add password reset for users from admin accounts area (#1841) Matt Jankowski 2017-04-15 10:44:59 -04:00
9d2f55ecc3 Remove isRequired from optional prop (#1843) Henry Smith 2017-04-15 16:44:28 +02:00
b7ec2fd492 Fix function call name typo (#1851) Henry Smith 2017-04-15 16:41:22 +02:00
3b8908c114 About page contact email (#1839) Matt Jankowski 2017-04-15 07:33:25 -04:00
7b10794afb Add rails-i18n gem (#1837) Hiromi Kai 2017-04-15 20:32:53 +09:00
355965c17b Silence Devise deprecation warning about TestHelpers (#1840) Matt Jankowski 2017-04-15 07:30:57 -04:00
0f889523e4 views/about: use Setting.site_title instead of hardcoding (#1508) Alex Dunn 2017-04-15 04:28:09 -07:00
f4045ba3d9 Add eslint-plugin-jsx-a11y (#1651) Zac Anger 2017-04-15 05:27:27 -06:00
df4ff9a8e1 Add recovery code support for two-factor auth (#1773) Patrick Figel 2017-04-15 13:26:03 +02:00
67ad84b7eb Add some missing Spanish translations (#1818) luigi 2017-04-15 13:25:00 +02:00
f0f6a3279a Update ja.jsx (#1822) Amakasu Ryoma 2017-04-15 20:24:33 +09:00
9e620ca16c Fix Japanese translation of ja.yml (#1835) Setuu 2017-04-15 20:18:08 +09:00
bddd36f260 Add a classname to the loading bar (#1826) Alda Marteau-Hardi 2017-04-15 13:17:54 +02:00
b857551617 fixed privacy mistake of japanese translation of privacy.change (#1832) Keiji, Yoshimi 2017-04-15 20:17:20 +09:00
e28a5aab08 Add tasks for open/close registration (#1823) Andrew 2017-04-15 04:17:07 -07:00
f9d7ec8971 ActiveRecord::Relation does not respond to #id (#1834) alpaca-tc 2017-04-15 20:16:24 +09:00
40fd1de488 Account search service refactor (#1791) Matt Jankowski 2017-04-14 21:17:07 -04:00
31f0bcf804 Refresh webfinger (#1323) ThibG 2017-04-15 03:16:05 +02:00
09540192c9 Rename admin/accounts_helper to admin/filter_helper (#1816) Matt Jankowski 2017-04-14 21:09:55 -04:00
08059ddda9 jslint: fix jslint warnings (#1704) Koala Yeung 2017-04-15 08:57:26 +08:00
a3aa9381c4 Update devise.fr.yml (#1728) goofy-bz 2017-04-15 02:55:43 +02:00
120a37a197 Add translations for zh-TW (Taiwan) (#1794) Shouko Yu 2017-04-15 08:49:43 +08:00
ec9999cdfe Update Traditional Chinese, HK (zh-HK) translation (#1759) Koala Yeung 2017-04-15 08:48:30 +08:00
e806d3c3f0 Update nl.yml (#1764) Fjoerfoks 2017-04-15 02:45:46 +02:00
4ba6acd518 Update nl.jxs (#1766) Fjoerfoks 2017-04-15 02:44:33 +02:00
061922b38c Update devise.fr.yml (#1792) Olivier Humbert 2017-04-15 02:44:10 +02:00
5d8d827436 Update Russian translation (#1733) Ratmir Karabut 2017-04-15 03:43:51 +03:00
cde1f37d93 Use site title on tags#show page (#1802) Matt Jankowski 2017-04-14 20:37:20 -04:00
89707ad0ac add basic microformats tests (#1803) Ben Roberts 2017-04-14 20:37:00 -04:00
4bebeb27d3 More Norwegian translations (#1805) Thor Harald Johansen 2017-04-15 02:33:37 +02:00
ef879a8839 Send initial state in a <script type="application/json"> tag (#1806) Joachim Viide 2017-04-15 03:32:42 +03:00
9240ca6cef Mispelling & minor fixes (#1814) Darío Hereñú 2017-04-14 21:31:16 -03:00
619817d29e Remove unused will_paginate.page_gap key from i18n (#1815) Matt Jankowski 2017-04-14 20:30:55 -04:00
0655f16cc1 [css] reduce spacing between text elements on about pages (#1510) Alex Dunn 2017-04-14 17:29:32 -07:00
ade004b5ee Polish translation (needs more love though) (#807) rysiekpl 2017-04-15 02:22:46 +02:00
7609593e48 Add REDIS_DB env variable to configure Redis database (#1366) Les Orchard 2017-04-14 20:21:13 -04:00
a9529d3b4b Allow running mastodon on a different domain as the one used for identifying users (#1267) ThibG 2017-04-15 02:15:46 +02:00
0d2910478a Use image too in docker-compose (#1109) Pierre Ozoux 2017-04-15 01:07:59 +01:00
5ab0ffc6c8 Custom Paperclip path. (#778) Valentin Lorentz 2017-04-15 02:07:21 +02:00
8482f67caf update Node to 6.x LTS (#1228) Alex Dunn 2017-04-14 17:05:41 -07:00
fe8dd58bc1 Add list of muted user to UI and Getting Started (#1799) Patrick Figel 2017-04-15 01:23:49 +02:00
92cd207c50 Introduce capybara and first feature spec (#1801) Chad Pytel 2017-04-14 19:21:02 -04:00
f5cd138323 Improve i18n chooser (#1804) Matt Jankowski 2017-04-14 19:12:39 -04:00
66ea015a01 Remove current directory from PATH (#1779) Kazuhiro NISHIYAMA 2017-04-15 02:10:38 +09:00
1616cf98a1 Add missing Japanese translations (#1785) Kazuhiro NISHIYAMA 2017-04-15 02:10:12 +09:00
5aae6384ff Fix Japanese translation for remote_follow (#1771) Takayuki KUSANO 2017-04-15 02:09:52 +09:00
fa89deb4eb Add title attribute to URLs in statuses (#1755) Luc Didry 2017-04-14 13:22:56 +02:00
26a892dd90 Fix invalid byte sequence issue in nl.jsx (#1751) Matt Jankowski 2017-04-14 07:00:03 -04:00
8321884eef Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753) Effy Elden 2017-04-14 20:50:00 +10:00
290e8ef854 Remove .keep in models (#1748) 西小倉宏信 2017-04-14 19:43:29 +09:00
067eb220c6 Include pkg-config as a gem dependency. (#1717) Bryce Chidester 2017-04-14 02:15:03 -07:00
1467515d3d Use landmark regions on columns (#1732) JP DeVries 2017-04-14 11:12:59 +02:00
8b74aa4217 Admin reports controller improvements (#1714) Matt Jankowski 2017-04-14 05:10:28 -04:00
a6807201d2 Implementing Subresource Integrity (#1729) maxypy 2017-04-14 11:09:20 +02:00
4445ebdad2 Fix getting started commands out of order (#1737) Ian Kelling 2017-04-14 01:04:19 -08:00
c019b0acfd Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745) Effy Elden 2017-04-14 19:02:25 +10:00
7447e7a2ea Merge branch 'matteoaquila-master' v1.1.2 Eugen Rochko 2017-04-13 22:26:54 +02:00
c8be05a4a7 Fix italian translation Eugen Rochko 2017-04-13 22:26:32 +02:00
41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master Eugen Rochko 2017-04-13 22:25:07 +02:00
c5afe573da Fix drag & drop overlay not appearing on firefox (#1721) Eugen 2017-04-13 22:21:34 +02:00
485310a43c Make browserify respect changes in node_modules for asset compilation (#1722) Eugen 2017-04-13 22:21:20 +02:00
9aae9ae40c Update devise.it.yml Matteo Aquila 2017-04-13 22:09:47 +02:00
1fb125b630 Update devise.it.yml Matteo Aquila 2017-04-13 22:06:19 +02:00
057567d548 Make boost modal off by default (#1719) Eugen 2017-04-13 21:53:59 +02:00
169c68a739 Add filename extension to paperclip (#1718) Yusuke Abe 2017-04-14 04:52:56 +09:00
9f182346d7 Use english in reported by translation (#1713) Matt Jankowski 2017-04-13 15:49:46 -04:00
a58c935c3d Fr missing strings (#1708) spf 2017-04-13 21:49:34 +02:00
c0c56db0fa Translate admin (#1702) Thomas Citharel 2017-04-13 21:49:07 +02:00
d9dc0fe84e smtp delivery type fix (#1556) James Moore 2017-04-13 10:51:49 -07:00
55b56e3f95 terms: remove redundant words (#1578) Alyssa Ross 2017-04-13 18:50:19 +01:00
c4d39b1b3d quick typo fix in en.jsx: Rejec -> Reject (#1701) R Tucker 2017-04-13 13:37:04 -04:00
ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +02:00
043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +02:00
9e5c1c487e Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +02:00
5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +09:00
ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +08:00
6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +02:00
5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +02:00
efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +02:00
e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +02:00
d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +02:00