mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Author	SHA1	Message	Date
Ash Furrow	723f25a999	Admin UI for confirming users (#2245 ) * Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.	2017-04-23 04:43:42 +02:00
Eugen	59b1de0bcf	Add a confirmation modal: (#2279 ) - Deleting a toot - Muting, blocking someone - Clearing notifications Remove source map generation from development environment, as it is a huge performance sink hole with little gains	2017-04-23 04:39:50 +02:00
Akihiko Odaki	df46864b39	Alter Japanese translations for CW and NSFW (#2305 ) The previous translation for NSFW, "不適切" means "impertinent". This change suggests "閲覧注意", which means the content requires precaution, instead. However, "閲覧注意" was also a translation for CW. CW is now translated as "警告", which simply means "warnings".	2017-04-23 04:31:40 +02:00
Matt Jankowski	ee82d8a876	Move force_ssl check to production config (#2165 ) The force_ssl method from controllers does not add all of the options that the sitewide configuration in a config block does. For example, HSTS enforcement is not added by the controller method, but is added by this style.	2017-04-23 04:22:22 +02:00
ばん	5817bae2da	fix can toot whitespace (#2218 )	2017-04-22 19:48:55 +02:00
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296 ) * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	2017-04-22 04:23:17 +02:00
Ashley	05ac28f3e4	Added API for single notification dismissal (#2251 ) * Added API backend for notification dismissal * Added render statement * Changed statement	2017-04-22 02:30:35 +02:00
Akihiko Odaki	0f852c6f74	Do not set port for puma if it is bound to unix socket (#2289 ) Setting port after binding a unix socket puma listen to both of an unix socket and TCP/IP, which is not a desired behavior.	2017-04-22 01:22:20 +02:00
Yamagishi Kazutoshi	1948f9e767	Remove deprecated features at React v15.5 (#1905 ) * Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up `59a77923b3`	2017-04-21 20:05:35 +02:00
Eduardo Elias	27ea2a88c1	Language: Missing keys for pt and pt-BR (#2277 )	2017-04-21 19:53:47 +02:00
Akihiko Odaki	16cd648181	Allow to listen Unix socket (#2085 ) * Allow puma to listen Unix socket * streaming: Show the whole listening address instead of the port Port is not always appropriate (e.g. Unix socket) * streaming: Close server before exiting This change especially allows to remove Unix socket before exiting.	2017-04-21 19:24:31 +02:00
Yamagishi Kazutoshi	53b21ac1cd	Add Japanese translation for display name and bio counter (#2275 ) * Add Japanese translation for display name and bio counter * Remove dep key	2017-04-21 19:23:20 +02:00
Eduardo Elias	e4550811b2	Language: Update missing key for pt and pt-BR (#2276 )	2017-04-21 19:23:02 +02:00
Eduardo Elias	704846a258	Fix: missing : for language (#2274 )	2017-04-21 19:18:16 +02:00
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200 ) * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)	2017-04-21 19:16:26 +02:00
Koala Yeung	1714f08d75	Add Ido (io) translation (#2202 ) * Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.	2017-04-21 19:15:25 +02:00
Sebastian Morr	74c474a652	Display remaining characters when editing display name and bio (#2219 )	2017-04-21 18:17:21 +02:00
jeroenpraat	d2dc31a74a	Ruby time format fixed (#2259 )	2017-04-21 16:47:15 +02:00
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181 ) * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	2017-04-21 03:30:59 +02:00
May Kittens Devour Your Soul	25d2853db2	Croatian language updates & fixes (#2203 ) * Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml	2017-04-21 03:30:15 +02:00
Ash Furrow	6c34eafe02	Enables the Polish translation. (#2235 )	2017-04-21 03:29:11 +02:00
jeroenpraat	bbff431e3a	Updated Dutch strings and added Dutch onboarding modal strings (#2243 ) * A bit of more explanation * Update nl.yml * That's more elegant * More consistent and adding missing translation * Update * Update * Added Dutch onboarding modal strings	2017-04-21 03:29:00 +02:00
Mingye Wang	3b342be2f2	Initial overhaul at zh-CN YML translations (#2242 ) This commit provides a heavy proofreading of zh-CN translations, and mainly draws from the zh-HK source when a translation is found too incoherent. Translating directly from en is used when zh-HK translation is not available. This commit also completes the tweet-toot (choo-choo, actually) for zh-cn introduced in #2044. Some minor copyediting, as well as additional en translations, has been fed back into zh-hk text.	2017-04-21 03:27:45 +02:00
Ash Furrow	66b39ccaed	Removes timestamp from URLs. (#2185 )	2017-04-20 03:54:24 +02:00
Miguel Jacq	b79ba3db8a	Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180 )	2017-04-20 03:12:14 +02:00
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162 )	2017-04-19 22:19:32 +02:00
Alex Dunn	35bdacba7a	capistrano: link robots.txt (#1576 ) Related to #1533.	2017-04-19 14:28:23 +02:00
tmyt	6c83fec971	Make configuarable s3_permissions for paperclip (#2139 )	2017-04-19 14:20:36 +02:00
Yamagishi Kazutoshi	8b8e140c71	Change to switch signature version for Amazon S3 (#2124 )	2017-04-19 14:18:50 +02:00
Matt Jankowski	8bac0350d1	Restful refactor of accounts/ routes (#2133 ) * Add routing specs for accounts followers and following actions * Use more restful route naming for public account follow pages Moves two actions: - accounts#followers to accounts/follower_accounts#index - accounts#following to accounts/following_accounts#index Adds routing spec to ensure prior URLs are preserved.	2017-04-19 13:52:37 +02:00
Isao Sugimoto	0a850a8edb	update simple_form.ja.yml (follow for #1991 ) (#2113 )	2017-04-19 03:55:19 +02:00
Isao Sugimoto	71f5cf12d2	update ja.yml (follow for #2106 ) (#2109 )	2017-04-19 00:52:30 +02:00
Michel	9d8bf4ea42	Update fr.yml (#2107 ) Just updated some values. Best regards, cyweo	2017-04-19 00:52:19 +02:00
Eugen	96268e76e6	Fix wording on admin instances view, fix typos in language detector spec (#2106 )	2017-04-18 23:39:51 +02:00
Eugen	e09ab2c0bd	Fix #1642 , fix #1912 - Dictate content-type file extension (#2078 ) * Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing	2017-04-18 23:15:44 +02:00
Isao Sugimoto	0d6c1e9cba	missing translate ja.yml (#2100 )	2017-04-18 22:29:39 +02:00
Eugen	ff5baa5349	Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079 ) * Add rate limits for logins and sign-ups by IP (5 in 5 minutes) Should be enough for normal attempts * Add rate limit for forgotten password form as well	2017-04-18 22:29:14 +02:00
Matt Jankowski	55e1503522	Instances list in admin (#2095 ) * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	2017-04-18 21:09:07 +02:00
Matt Jankowski	66d8f99a30	Admin reports with accounts (#2092 ) * Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id	2017-04-18 19:36:18 +02:00
Olivier Humbert	ee919bedd6	French translation update (#2063 ) fixes	2017-04-18 15:21:47 +02:00
Koala Yeung	0a1b024600	Add Occitan (oc) translation (#2077 ) * Added oc.yml * Added `config/locales/oc.yml`. Translated in General Occitan (Quent-in). * Added oc.jsx (Occitan translation) * Written in General Occitan (lengadocian) * Added `app/assets/javascripts/components/locales/oc.js` * Added doorkeeper.oc.yml * Added `config/locales/doorkeeper.oc.yml` (Quent-in) * Added simple_form.oc.yml * Added `config/locales/simple_form.oc.yml` (Quent-in). * Merge en.yml changes into oc.yml Added new strings for translations * Fix typo in oc.yml * Update javascript locale support (oc) * Update ruby locale list (oc) * Fix oc.yml * Remove obsoleted translations * Moved old translation of `reports` to `admin.reports`	2017-04-18 15:21:16 +02:00
Ratmir Karabut	50ed72767d	Update Russian translation (#1967 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency	2017-04-18 15:20:37 +02:00
Eugen Rochko	57d784f1e4	Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif	2017-04-18 01:25:50 +02:00
jeroenpraat	e1e15adf1d	Updated, improved and fixed Dutch language strings (#2030 ) * Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed	2017-04-18 00:16:03 +02:00
spf	8fd6552bca	French i18n-tasks missing fr (#2018 )	2017-04-17 20:27:11 +02:00
Matt Jankowski	21a767dcfa	Improve handling of HTTP_ACCEPT for webfinger (#2008 ) This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983	2017-04-17 19:58:03 +02:00
IWAI, Masaharu	f8546ad5a2	Update Japanese translation (#1993 ) Sync text for toot form	2017-04-17 15:15:24 +02:00
Brad Urani	e813810e03	Open sidekiq and pghero admin pages in new browser tabs (#1596 ) * Open sidekiq and pghero admin pages in new tabs * Add missing comma	2017-04-17 12:26:45 +02:00
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	2017-04-17 12:14:03 +02:00
Miguel Jacq	e9eaf9e33c	Allow using an SMTP server without authentication (#1597 ) * Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none	2017-04-17 10:41:19 +02:00
Hugo Gameiro	6685106daa	Add Brazilian Portuguese and fix European Portuguese (#1966 ) * update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes * add pt_br to index.jsx * add pt-BR to import index.jsx * add pt-BR to mastodon.jsx * add pt-BR to settings_helper.rb * add pt-BR to application.rb * order alphabetically pt.jsx * create pt-BR.jsx * Create devise.pt-BR.yml * language improvements to devise.pt.yml * created doorkeeper.pt-BR.yml * fixes to doorkeeper.pt.yml * create pt-BR.yml * improvements to pt.yml * Create simple_form.pt-BR.yml * Improvements to simple_form.pt.yml * improvements to pt.yml	2017-04-17 10:38:27 +02:00
May Kittens Devour Your Soul	8ad6722eea	Create hr.jsx (#1945 ) * Create hr.jsx Start of Croatian translation * Update settings_helper.rb * Update application.rb * Update application.rb * Update index.jsx	2017-04-17 10:38:13 +02:00
Toshiyuki Takahashi	be6cabb315	Improved Japanese translation in ja.yml (#1981 )	2017-04-17 10:32:41 +02:00
Ingo Blechschmidt	78bdfc4589	Fix tiny typo (#1956 )	2017-04-17 10:29:49 +02:00
Yamagishi Kazutoshi	5e94643058	Fix minor typo in Japanese translation "保村" -> "保存" (#1968 )	2017-04-17 04:22:14 +02:00
Toshiyuki Takahashi	dc6fe4e04b	Improved Japanese translation in devise.ja.yml (#1969 )	2017-04-17 04:22:09 +02:00
Matt Jankowski	2b6b89491d	Remove unused registrations: key from PT yml locale (#1952 )	2017-04-16 20:53:16 +02:00
Matt Jankowski	f87b51fda8	I18n health warnings (#1949 ) * Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685fadc069e619bb6d1066190de195d942. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis	2017-04-16 19:37:01 +02:00
oliverkeeble	86d1dcc97a	Fix translation of 'reblogged' in eo.yml (#1942 )	2017-04-16 18:11:07 +02:00
Eduardo Elias	86eaaf0761	Add missing keys to PT locale (#1941 )	2017-04-16 18:04:19 +02:00
Kazuhiro NISHIYAMA	c2762fa498	Add missing Japanese translations (#1923 ) And `i18n-tasks add-missing -l ja` changes some quotes.	2017-04-16 16:07:45 +02:00
Eduardo Elias	da302a43cd	Improve PT locale on simple_form (#1917 ) * Improve PT locale on simple_form * Add missing keys to PT locale	2017-04-16 14:56:04 +02:00
Matt Jankowski	75f416a492	Fix yaml issue in ja locale (#1916 ) * Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx	2017-04-16 14:55:04 +02:00
George Hattori	6df63465b9	Improve Japanese translation (#1909 )	2017-04-16 13:44:57 +02:00
新都心(Neet Shin)	f2997c9715	Update Japanese Translate (#1903 ) * [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx	2017-04-16 13:42:16 +02:00
Alex Dunn	865cb39e9b	lock capistrano to 3.8.0 (#1890 )	2017-04-16 12:52:18 +02:00
Eugen	5d710b1139	Make file attachment on MediaAttachment optional (#1865 ) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI	2017-04-16 12:51:30 +02:00
Joachim Viide	363de2dffd	Leave out the "Expires" header from S3 uploads (#1886 )	2017-04-16 04:01:58 +02:00
Alex Dunn	6a1ac9b31f	capistrano: allow overriding repo_url and branch (#1889 )	2017-04-16 04:01:27 +02:00
Ash Furrow	0f8b7d0660	Removed Heroku in-process spawning. (#1873 )	2017-04-15 23:02:13 +02:00
Naouak	3d3e32befb	Check for a custom css file to help customization of instances (#1368 ) * User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.	2017-04-15 22:47:48 +02:00
oliverkeeble	28606d730a	Fix typo in simple_form.eo.yml (#1848 )	2017-04-15 16:46:48 +02:00
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841 )	2017-04-15 16:44:59 +02:00
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773 ) * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	2017-04-15 13:26:03 +02:00
luigi	67ad84b7eb	Add some missing Spanish translations (#1818 ) * Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación	2017-04-15 13:25:00 +02:00
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835 )	2017-04-15 13:18:08 +02:00
goofy-bz	a3aa9381c4	Update devise.fr.yml (#1728 ) Very light grammar fix to improve gender-neutral	2017-04-15 02:55:43 +02:00
Shouko Yu	120a37a197	Add translations for zh-TW (Taiwan) (#1794 )	2017-04-15 02:49:43 +02:00
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759 ) * Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings	2017-04-15 02:48:30 +02:00
Fjoerfoks	e806d3c3f0	Update nl.yml (#1764 ) Some rewording, typos and switching to infinitve	2017-04-15 02:45:46 +02:00
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792 ) * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	2017-04-15 02:44:10 +02:00
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.	2017-04-15 02:33:37 +02:00
Darío Hereñú	9240ca6cef	Mispelling & minor fixes (#1814 )	2017-04-15 02:31:16 +02:00
Matt Jankowski	619817d29e	Remove unused will_paginate.page_gap key from i18n (#1815 ) This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.	2017-04-15 02:30:55 +02:00
rysiekpl	ade004b5ee	Polish translation (needs more love though) (#807 ) * Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia	2017-04-15 02:22:46 +02:00
Les Orchard	7609593e48	Add REDIS_DB env variable to configure Redis database (#1366 )	2017-04-15 02:21:13 +02:00
ThibG	a9529d3b4b	Allow running mastodon on a different domain as the one used for identifying users (#1267 ) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.	2017-04-15 02:15:46 +02:00
Valentin Lorentz	5ab0ffc6c8	Custom Paperclip path. (#778 ) * Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).	2017-04-15 02:07:21 +02:00
Kazuhiro NISHIYAMA	1616cf98a1	Add missing Japanese translations (#1785 )	2017-04-14 19:10:12 +02:00
Takayuki KUSANO	5aae6384ff	Fix Japanese translation for remote_follow (#1771 ) Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.	2017-04-14 19:09:52 +02:00
Matt Jankowski	8b74aa4217	Admin reports controller improvements (#1714 ) * Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles	2017-04-14 11:10:28 +02:00
Effy Elden	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 )	2017-04-14 11:02:25 +02:00
Eugen Rochko	c8be05a4a7	Fix italian translation	2017-04-13 22:26:32 +02:00
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	2017-04-13 22:25:07 +02:00
Eugen	485310a43c	Make browserify respect changes in node_modules for asset compilation (#1722 )	2017-04-13 22:21:20 +02:00
Matteo Aquila	9aae9ae40c	Update devise.it.yml	2017-04-13 22:09:47 +02:00
Matteo Aquila	1fb125b630	Update devise.it.yml	2017-04-13 22:06:19 +02:00
Eugen	057567d548	Make boost modal off by default (#1719 )	2017-04-13 21:53:59 +02:00
Yusuke Abe	169c68a739	Add filename extension to paperclip (#1718 )	2017-04-13 21:52:56 +02:00
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713 )	2017-04-13 21:49:46 +02:00
spf	a58c935c3d	Fr missing strings (#1708 ) * Fix missing translation for username already taken * fr - note too long translation	2017-04-13 21:49:34 +02:00
Thomas Citharel	c0c56db0fa	Translate admin (#1702 ) * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	2017-04-13 21:49:07 +02:00
James Moore	d9dc0fe84e	smtp delivery type fix (#1556 ) * delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment	2017-04-13 19:51:49 +02:00
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696 )	2017-04-13 19:18:32 +02:00
Koala Yeung	1206627c59	Add Dutch translation (nl) (#1682 ) * Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml	2017-04-13 16:02:23 +02:00
Matteo Aquila	0220f3a171	Update application.rb	2017-04-13 15:33:45 +02:00
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	2017-04-13 15:28:30 +02:00
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	2017-04-13 15:28:15 +02:00
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	2017-04-13 15:27:56 +02:00
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	2017-04-13 15:27:37 +02:00
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684 )	2017-04-13 13:40:58 +02:00
May Kittens Devour Your Soul	90d0018fd5	Adds Croatian language [Hrvatski] (#1000 ) * Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml	2017-04-13 13:38:44 +02:00
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640 ) * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	2017-04-13 13:23:45 +02:00
Ratmir Karabut	af7e880df5	Update Russian translation (#1570 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error	2017-04-13 13:23:23 +02:00
Svetlozar Todorov	aa7bf1515c	Fix #624 - Add localization for Bulgarian (#645 ) * Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations	2017-04-13 13:16:28 +02:00
Matt Jankowski	137100dcf3	Clean up well-known routes/controllers (#1649 ) * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers	2017-04-13 13:09:07 +02:00
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664 ) * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	2017-04-13 13:04:23 +02:00
Thor Harald Johansen	ccaf3dbc5a	Adjustments to the Norwegian translation (#1648 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.	2017-04-13 02:17:26 +02:00
lindwurm	9966bd27c2	[l10n] ja: Improve Japanese Translations (#1631 ) * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-04-12 20:41:50 +02:00
pinfort	38e24a699b	fix Japanese translation (#1623 ) * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正	2017-04-12 20:19:38 +02:00
Manato Kameya	bf3e56b8ad	Fix incorrect notation in simple_form.ja.yml (#1620 )	2017-04-12 20:19:27 +02:00
CgX	e32edd247f	Update fr.yml (#1600 ) Mistake on %{link} variable	2017-04-12 19:56:09 +02:00
Matt Jankowski	c44a700252	Quick best practice cleanup of views/helpers (#1546 ) * Remove trailing whitespace * Use query methods instead of explicit .blank? checks	2017-04-12 18:24:18 +02:00
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541 ) * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	2017-04-12 18:20:44 +02:00
Carlos A. Escobar	3064ef96a1	Added missing Spanish translations strings (#1292 ) * Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings	2017-04-12 17:16:40 +02:00
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549 ) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-12 17:11:49 +02:00
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611 )	2017-04-12 17:07:51 +02:00
Matt Jankowski	b352a8e5d4	Default to json type for webfinger requests (#1583 )	2017-04-12 16:03:37 +02:00
Koala Yeung	24eb45425e	Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544 ) * Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.	2017-04-12 08:50:50 +02:00
Eugen	40bdf43297	Change default log level in production from :debug to :info for less I/O (#1579 )	2017-04-11 23:28:23 +02:00
Eugen	5cdd2c2414	Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563 )	2017-04-11 22:49:53 +02:00
Matt Jankowski	3ddd936b03	Refactor exports controller (#1567 ) * Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes	2017-04-11 22:00:43 +02:00
Thomas Citharel	327a6e166f	Update french locale (#1525 ) * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-11 21:54:40 +02:00
pinfort	6f5268b02d	Add Japanese translation (#1552 ) * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	2017-04-11 21:52:09 +02:00
jukper	4964433190	Revised finnish translation (#1537 )	2017-04-11 21:41:40 +02:00
Jantso Porali	9e3c4fd2d7	Update language files (#1516 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515	2017-04-11 21:41:29 +02:00
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	2017-04-11 20:43:56 +02:00
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	2017-04-11 10:10:16 -04:00
Yann GUERN	a85d4473aa	Avoid user enumeration with devise paranoid mode (#1527 )	2017-04-11 14:21:15 +02:00
Matt Jankowski	4ada50985a	Pagination improvements (#1445 ) * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	2017-04-11 01:11:41 +02:00
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159 ) * Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0	2017-04-10 22:47:41 +02:00
Alexander Mankuta	0dbbc16c69	More SMTP customization (#1372 ) * Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support	2017-04-10 21:48:30 +02:00
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	2017-04-10 12:52:06 +02:00
R Tucker	8bfdbf0aa6	Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289 ) * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)	2017-04-09 18:34:29 +02:00
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179 ) * Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>	2017-04-09 18:33:40 +02:00
Olivier Humbert	082bef3027	French translation update (#1271 ) * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	2017-04-09 14:55:58 +02:00
spf	e6b48a7048	French typo (#1257 ) * French typo * Datetime french translation	2017-04-09 14:54:47 +02:00
Matt Jankowski	e5282e4ec0	Clean up about page (#1282 ) * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	2017-04-09 14:47:25 +02:00
Matt Jankowski	71706f21c2	Ignore implied formats for catch all route requests (#1340 ) A request to `/test` would show the custom 404 page, but a request to `/test.test` would return a 404 with an empty body. This change ignores the format on incoming catch all route requests, so that the html 404 page is returned on these requests.	2017-04-09 14:39:41 +02:00
Eugen	d5a675099a	Add env variable to disable prepared statements (#1293 )	2017-04-09 05:46:32 +02:00
Ash Furrow	c3e7bac1cc	Allows setting log level in env variable (#1290 ) * Allows setting log level in env variable. * Made changes based on feedback in #1290.	2017-04-09 01:42:13 +02:00
Eugen	9acdb166e8	Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled (#1278 ) * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	2017-04-08 22:20:08 +02:00
Thomas Citharel	41f8fde83e	Update french translation (#1148 ) Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-08 13:11:16 +02:00
Sebastian Hübner	f860eb7d71	Fixed two translation errors (#1139 ) Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx	2017-04-08 13:03:11 +02:00
Korbinian	8f9a11b642	Update simple_form.de.yml (#971 )	2017-04-08 13:02:07 +02:00
Jantso Porali	01d8003867	Updated about page in Finnish language (#1170 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation	2017-04-08 12:17:34 +02:00
Olivier Humbert	ed3dfd0bee	French translation update (#1188 ) * Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency	2017-04-08 12:16:49 +02:00
Shel R	fef478781d	Merge branch 'master' into master	2017-04-07 22:21:21 -04:00
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	2017-04-07 14:23:18 -04:00
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	2017-04-07 13:07:03 +02:00
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954 )	2017-04-07 12:58:12 +02:00
Eugen Rochko	e3a3422a65	Allow setting of default language through config Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	2017-04-07 12:40:26 +02:00
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140 )	2017-04-07 11:09:14 +02:00
André Lewin	bf7cefa516	Merge branch 'master' into master	2017-04-05 20:28:58 +02:00
Eugen Rochko	29ffe1cad3	Make sure Rabl is using Oj	2017-04-05 19:29:30 +02:00
Jantso Porali	837030db98	updated blocking translation	2017-04-05 14:53:35 +02:00
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	2017-04-05 14:49:29 +02:00
Jantso Porali	d3bf0307db	updated translation for about page	2017-04-05 14:47:42 +02:00
JantsoP	20b53e6add	Merge branch 'master' into master	2017-04-05 10:07:17 +02:00
JantsoP	3ec221d3b7	updated reblog to boost translation Since it is that :D	2017-04-05 09:57:25 +02:00
JantsoP	473e4f7813	udpdated display_name translation	2017-04-05 09:52:31 +02:00
JantsoP	b845ef395d	updated reblog translation	2017-04-05 09:51:35 +02:00
Eugen Rochko	667ffafef8	Fix spec	2017-04-05 03:31:26 +02:00
Eugen	086a88f3bb	Merge pull request #863 from Eychics/master Add closed_registrations message on French language	2017-04-05 03:11:13 +02:00
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master Updated Finnish Translation	2017-04-05 03:09:20 +02:00
Eugen	c12214963e	Merge pull request #866 from kklleemm/patch-1 Fix typos on french translations	2017-04-05 03:06:41 +02:00
Eugen	aa8dacbc8a	Merge pull request #792 from chapeaumeinfreund/master Updated and fixed german orthography	2017-04-05 03:05:50 +02:00
Eugen	ce524cbb49	Merge pull request #790 from chapeaumeinfreund/patch-1 Updated and fixed german orthography	2017-04-05 03:05:31 +02:00
Eugen	117b22e905	Merge pull request #852 from peterkeen/email-whitelist-817 [#817] Add email whitelist	2017-04-05 03:04:58 +02:00
Eugen	57466d542b	Merge pull request #805 from nevillepark/master Changed "reblogs" to "boosts"	2017-04-05 03:00:57 +02:00
Clément D	350958babf	Fix typos on french translations	2017-04-04 19:09:54 +02:00
Thibaut (Eychics)	9a5d6e9715	Add closed_registrations message on French language	2017-04-04 18:58:19 +02:00
Pete Keen	e9a6da6bc7	[#817 ] Add email whitelist This adds the ability to filter user signup with a whitelist instead of or in addition to a blacklist. Fixes #817	2017-04-04 11:20:15 -04:00
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	2017-04-04 15:28:12 +02:00
JantsoP	db4a41cf58	Merge branch 'master' into master	2017-04-04 08:41:46 +02:00
JantsoP	dc89fc17cc	updated translation	2017-04-04 08:29:53 +02:00
Neville Park	ce1ca28594	Changed "reblogs" to "boosts"	2017-04-03 17:45:36 -04:00
axolotl	0700521ef3	added Esperanto (eo)	2017-04-03 20:22:50 +02:00
Eugen Rochko	98a93aa07e	Fix norwegian translation being malformed	2017-04-03 19:50:55 +02:00
Korbinian	ec8029a955	Updated and fixed orthography	2017-04-03 19:10:48 +02:00
Korbinian	7dd5ba42a3	Updated and fixed german orthography	2017-04-03 19:01:17 +02:00
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	2017-04-03 18:55:06 +02:00
Christopher Kolstad	5cb011b66b	Add Norwegian locale	2017-04-03 16:32:03 +02:00
JantsoP	65d667dc6c	another typo. fuck me	2017-04-03 14:56:13 +02:00
JantsoP	d3fde60297	fixed an sneaky peaky tpy	2017-04-03 14:54:53 +02:00
JantsoP	85a8b62ca2	add finnish translation add finnish translation	2017-04-03 14:43:07 +02:00
JantsoP	97803600ed	add finnish translation add finnish translation	2017-04-03 14:20:50 +02:00
JantsoP	bfa99981e5	Merge branch 'master' into master	2017-04-03 13:50:57 +02:00
JantsoP	6501ffdadc	add finnish translation add finnish translation	2017-04-03 13:35:12 +02:00
JantsoP	b0f4c9b91f	finnish translation finnish translation	2017-04-03 13:25:46 +02:00
JantsoP	f9b4f30de6	updated final translation updated final translation	2017-04-03 13:07:09 +02:00
JantsoP	87854745e9	Create new translation file Still in progress. Should be done shortly	2017-04-03 12:42:09 +02:00
Angristan	c97fc5c1f4	Improve french translation	2017-04-03 11:04:00 +02:00
Valentin Lorentz	fbcba65f81	Improve French translation Fix typos and typography. Make vocabulary and grammar more uniform.	2017-04-03 03:16:37 +02:00
Eugen	61894582b8	Merge pull request #746 from eramdam/feature/improve-french-locales Feature/improve french locales (again)	2017-04-03 00:25:56 +02:00
Damien Erambert	71cf9d0608	Fix typo in simple_form.fr.yml	2017-04-02 14:04:06 -07:00
Damien Erambert	5e45982ed9	Improve translation of data import in fr.yml	2017-04-02 14:03:57 -07:00
Damien Erambert	b829460b4a	Better translation for revoked token in doorkeeper.fr.yml	2017-04-02 14:03:41 -07:00
Damien Erambert	65e6a00817	Fix date format in doorkeeper.fr.yml	2017-04-02 14:03:31 -07:00
Eugen	48cb2dccd2	Merge pull request #741 from eramdam/feature/improve-french-locales Improve/add some French locales	2017-04-02 22:22:44 +02:00
Eugen Rochko	5b12624847	Add proper error page for request timeouts	2017-04-02 19:43:44 +02:00
Damien Erambert	cb1989cbd8	Add locale in devise.fr.yml	2017-04-01 23:38:40 -07:00
Damien Erambert	03d676faa8	Add french translation for "scopes" in doorkeeper.fr.yml	2017-04-01 23:35:11 -07:00
Damien Erambert	9e26af264e	Fix small typo in doorkeeper.fr.yml	2017-04-01 23:34:37 -07:00
Damien Erambert	f9f6098e22	Complete localization of in simple_form.fr.yml	2017-04-01 23:26:26 -07:00
Damien Erambert	2c881e6717	Improve french locales on the backend (WIP)	2017-04-01 23:15:49 -07:00
Eugen Rochko	5e26295e06	Fix #700 - hide spoilers on static pages	2017-03-31 13:54:36 +02:00
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )	2017-03-30 19:42:33 +02:00
Eugen Rochko	f864fee116	Fix up some localizations	2017-03-26 13:22:38 +02:00
leopku	d5d5afff9c	🌐 add simplified chinese language	2017-03-26 14:13:18 +08:00
leopku	fc9bbdfd34	🚧 chinese translation WIP	2017-03-24 19:03:14 +08:00
leopku	349c6cfa2b	🌐 add chinese language file	2017-03-24 18:53:41 +08:00
leopku	c46843c65c	🔧 S3 protocol from ENV add support for reading S3 protocol from ENV also add S3_HOSTNAME in .env.production.sample	2017-03-23 15:44:55 +08:00
Eugen Rochko	d6ed2eb512	Prettier account and stream entry URLs	2017-03-22 19:55:14 +01:00
Eugen Rochko	05cf086766	New API method: /api/v1/search Returns accounts, statuses, hashtags arrays	2017-03-22 02:32:27 +01:00
Eugen Rochko	8803ca9efe	Improved landing page	2017-03-21 19:18:37 +01:00
Eugen Rochko	6b1db5c2b2	Add landing strip	2017-03-20 03:36:29 +01:00
Eugen Rochko	56d998cbdb	Export follow/block lists as CSV	2017-03-19 20:29:41 +01:00
Eugen Rochko	2816b1bf8e	Federate header images, fix open-uri http->https redirection error	2017-03-18 22:51:20 +01:00
shel	38dceb3bf7	Promote Apps (#670 ) "Various apps are available" is now a hyperlink	2017-03-17 16:16:39 +01:00
Eugen Rochko	6be7bde243	Fix #525 - Add instance information API	2017-03-15 23:12:48 +01:00
Eugen	e245115f47	Merge branch 'master' into mastodon-site-api	2017-03-15 22:55:22 +01:00
Eugen Rochko	02349b3269	Obfuscate filenames better, double rate limits	2017-03-14 15:59:21 +01:00
Eugen Rochko	1fb3e8988b	Revert earlier fix due to new bug reports	2017-03-06 02:25:41 +01:00
Eugen Rochko	ebc01bf0f6	Make the paperclip filename interpolator smarter about the :original style If an :original gets converted into another format, it would get saved as original_filename anyway, so generating the extension is pointless and yields bad results for when you change the style definition later. This way, old gifs will still have correct URLs	2017-03-05 23:03:49 +01:00
Eugen Rochko	85fce04d1b	Detect videos with no sound, handle them like gifv	2017-03-05 22:55:24 +01:00
Eugen Rochko	5f4e402204	Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies Redirect /:username to /users/:username Redirect /:username/:id to /users/:username/updates/:id Updated API documentation and sponsors	2017-03-05 17:27:17 +01:00
Eugen Rochko	caf5b8e975	Fix #431 - convert gif to webm during upload. Web UI treats them like it did before. In the API, attachments now can be either image, video or gifv. Gifv is to be treated like images in terms of behaviour, but are videos by file type.	2017-03-04 23:02:24 +01:00
Eugen Rochko	6b81d10030	Add digest e-mails	2017-03-04 00:00:48 +01:00
Kit Redgrave	442fdbfc53	Mute button progress so far. WIP, doesn't entirely work correctly.	2017-03-01 22:31:21 -06:00
Kibigo	620f70e42c	Adds site metadata access to the API	2017-02-27 04:06:25 -08:00
Eugen Rochko	175a9b9caa	Fix #104 - Style OAuth authorized applications page Add ability to search accounts by display name	2017-02-27 00:15:00 +01:00
Eugen Rochko	9d4cad6307	Improve glow	2017-02-23 02:14:35 +01:00
Eugen Rochko	8132cf8153	Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments Make replies default to privacy settings of the status being replied to	2017-02-17 01:30:24 +01:00
Eugen Rochko	d0f087db2d	Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report	2017-02-17 00:42:52 +01:00
Eugen Rochko	24ba7c9762	Adding index overview for reports in admin UI	2017-02-16 02:28:10 +01:00
Eugen Rochko	ff49649130	Expose Link headers via CORS	2017-02-15 23:26:17 +01:00
Eugen Rochko	5426f06ac2	Fix admin UI for accounts somewhat	2017-02-15 00:22:58 +01:00
Eugen Rochko	3b81baaaaf	Adding POST /api/v1/reports API, and a UI for submitting reports	2017-02-14 20:59:26 +01:00
Eugen Rochko	63886bdc59	Fix #587 - Display TOTP secret next to QR code	2017-02-13 20:56:03 +01:00
Eugen Rochko	138d21aea8	Update service timeout setting from 15s to 90s	2017-02-13 20:42:02 +01:00
Eugen Rochko	0518492158	Stop trying to shoehorn all Salmon updates into the poor database-connected StreamEntry model. Simply render Salmon slaps as they are needed	2017-02-12 01:19:14 +01:00
Eugen Rochko	d2619e0b53	Site title is now a setting	2017-02-10 22:37:11 +01:00
shel	2d6f603c2b	Add link to other instances text Text for link to other instances	2017-02-10 13:08:47 -05:00
Eugen	9d5fb49cd8	Merge pull request #603 from evanminto/activitypub-account Expose ActivityStreams 2.0 representation of accounts	2017-02-07 02:08:40 +01:00
Eugen Rochko	347a153b3d	Add API modifiers to limit returned toots from public/hashtag timelines to only those from local users; Add link to "extended information" to getting started in the UI; Add defaults for posting privacy; Change how publish button looks depending on posting privacy chosen	2017-02-06 23:16:20 +01:00
Evan Minto	94e213c6c1	Reuse existing controller and route	2017-02-06 01:19:26 -08:00
Eugen Rochko	77e13c2bc9	Removing failed push notification API, make context loads use cache	2017-02-05 17:51:44 +01:00
Eugen Rochko	19b9e1e2c3	Preheat status cache	2017-02-05 17:24:18 +01:00
Evan Minto	8bd8ea7c04	Remove unnecessary leftover code	2017-02-04 14:49:24 -08:00
Evan Minto	e2fbf8bc74	Add an account endpoint for ActivityPub and link to it on HTML profile pages	2017-02-04 14:46:23 -08:00
Eugen Rochko	ccb8ac8573	Make the streaming API also handle websockets (because trying to get the browser EventSource interface to work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.	2017-02-04 00:34:31 +01:00
Eugen Rochko	d9ca46b464	Cleaning up format of broadcast real-time messages, removing redis-backed "mentions" timeline as redundant (given notifications)	2017-02-02 00:03:31 +01:00
Eugen Rochko	1da0ce5c7c	Looks like log level :debug is required for activerecord times to be tracked	2017-02-01 12:13:16 +01:00
Eugen Rochko	65402d9c09	Fix activerecord logging in production	2017-02-01 11:34:50 +01:00
Eugen Rochko	c2fbd144cf	Add "open in web" link to detailed public status pages	2017-01-30 23:01:37 +01:00
Eugen Rochko	a2a85e8549	Add capistrano to development environment	2017-01-30 20:03:17 +01:00
Eugen Rochko	3f075c7794	API for apps to register for push notifications	2017-01-29 01:30:32 +01:00
Eugen Rochko	23b997ae55	Split 2FA login into two prompts	2017-01-28 20:43:38 +01:00
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
Eugen Rochko	76e970c856	Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit	2017-01-27 20:35:16 +01:00
Eugen Rochko	ba192f12e3	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
Eugen Rochko	f6a5977f0b	Fix key names in statsd	2017-01-26 19:46:52 +01:00
Eugen Rochko	d567f21d4f	Improve StatsD instrumentation	2017-01-26 19:08:05 +01:00
Eugen Rochko	7329fbd8a4	Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors	2017-01-26 18:48:56 +01:00
Eugen Rochko	cc5c1e5feb	Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks	2017-01-26 14:52:07 +01:00
Effy Elden	07b9a10d4d	Add redirect for /admin => /admin/settings	2017-01-26 18:59:35 +11:00
Eugen Rochko	999cde94a6	Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations	2017-01-25 01:29:16 +01:00
Eugen Rochko	f392030ab8	Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses	2017-01-23 21:09:27 +01:00
Eugen	956da43e19	Fix error	2017-01-22 23:07:31 +01:00
Eugen Rochko	61aee0006e	Override Rack::Request to use the same trusted proxy settings as Rails	2017-01-22 21:01:28 +01:00
Eugen Rochko	67befe5463	Allow to specify trusted proxies through env	2017-01-22 20:35:49 +01:00
Eugen Rochko	e028406db4	Fix code style	2017-01-21 22:19:13 +01:00
Eugen Rochko	d72dd38c13	Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master	2017-01-21 22:15:22 +01:00
Eugen Rochko	3a4b5961be	Method to fetch a single notification	2017-01-21 22:14:13 +01:00
Effy Elden	5fef55c11a	Set remote dev environments to use letter_opener_web, add default .env.vagrant variables	2017-01-21 20:22:49 +11:00
Eugen Rochko	f0de621e76	Fix #463 - Fetch and display previews of URLs using OpenGraph tags	2017-01-20 01:00:14 +01:00
Eugen Rochko	f051c2e813	Fix statsd null backend not being initialized properly	2017-01-19 09:37:07 +01:00
Eugen Rochko	306eb6e9c9	Add optional StatsD performance tracking	2017-01-18 23:44:29 +01:00
Eugen Rochko	fcb5a85cdd	Add sounds for notifications. Boop by @jk@mastodon.social	2017-01-17 20:09:03 +01:00
Effy Elden	ab4f5f5da5	Add Heroku deployment support	2017-01-17 22:00:03 +11:00
Eugen	16f9490d33	Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Fix S3 default settings	2017-01-15 14:29:47 +01:00
Eugen Rochko	e9737c2235	Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version	2017-01-15 14:01:33 +01:00
Effy Elden	a097dd489b	Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'	2017-01-15 20:58:46 +11:00
Effy Elden	e45fed58cb	Add a textual 'Back to Mastodon' link in footer of settings pages	2017-01-15 11:03:35 +11:00
Eugen Rochko	c01dd089ff	Adding about/more page with extended information that can be set up by an admin	2017-01-13 20:16:38 +01:00
Eugen Rochko	e25170f960	Add extended about page stub	2017-01-13 03:24:41 +01:00
Eugen Rochko	b11fdc3ae3	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage	2017-01-12 20:46:24 +01:00
Eugen	4292cf60ae	Fix env variable name	2017-01-10 22:01:13 +01:00
Eugen Rochko	75f80bef10	Persist UI settings, add missing localizations for German	2017-01-09 14:00:55 +01:00
Eugen Rochko	2e71bb031b	Fix Paperclip timeout setting. Fix bug introduced in #437	2017-01-08 19:12:54 +01:00
Eugen Rochko	7ddec6e7c3	Add read timeout to paperclip when it's downloading remote images	2017-01-07 15:43:56 +01:00
Jessica Stokes	bb033c1d37	"Reblog" -> "boost" in more places A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI	2017-01-04 18:00:50 -08:00
Eugen Rochko	2b0b7ff1b8	Fix #385 - /web now loads a page	2017-01-04 15:35:36 +01:00
Eugen Rochko	8f47f6a7ec	Adding remote follow button	2017-01-01 19:54:34 +01:00
Eugen Rochko	a302e56f9a	Add API for retrieving favourites	2016-12-29 20:33:26 +01:00
Eugen Rochko	49834a6e7f	Add API for retrieving blocked accounts	2016-12-29 20:12:32 +01:00
Eugen Rochko	d7dc84439c	Add ability to use remote follow function on other sites	2016-12-29 16:54:54 +01:00
Eugen Rochko	eca6110fc4	Add preferences for follow request notification e-mails	2016-12-26 22:04:16 +01:00
Eugen Rochko	2146ac91a0	Follow requests send e-mail notifications, but are excluded from notifications API Better initial state for unlisted/nsfw toggles	2016-12-26 21:52:03 +01:00
Eugen Rochko	3689c119f0	Replacing follow requests in the settings area with in-UI column	2016-12-26 21:33:51 +01:00
Eugen Rochko	004382e4d0	Adding follow requests API	2016-12-26 19:30:45 +01:00
Eugen Rochko	b302b9202b	Add page for authorizing/rejecting follow requests	2016-12-23 00:04:52 +01:00
Eugen Rochko	3c841c7306	Adjust wording	2016-12-22 23:24:46 +01:00
Eugen Rochko	05b13c38b5	Re-enable Webfinger for locked accounts but don't handle "follow" events coming in via Salmon. Currently no way to prevent remote follows, but they will only receive public and unlisted posts	2016-12-22 23:17:57 +01:00
Eugen Rochko	b891a81008	Follow call on locked account creates follow request instead Reflect "requested" relationship in API and UI Reflect inability of private posts to be reblogged in the UI Disable Webfinger for locked accounts	2016-12-22 23:03:57 +01:00
Eugen Rochko	2d2154ba75	Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users	2016-12-22 21:34:19 +01:00
Eugen Rochko	6d71044c85	Don't use rack timeout in any but production environments	2016-12-21 19:10:40 +01:00
Eugen Rochko	e09d3a2c66	Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen	2016-12-21 00:13:13 +01:00
Eugen	6b67b55cee	Merge pull request #356 from victorhck/master added two missings spanish translations	2016-12-18 21:22:46 +01:00
Eugen Rochko	5ae1b39ec9	Adjusting public display of statuses to look similar to logged-in UI, fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive content behind a spoiler on public pages	2016-12-18 19:47:11 +01:00
Eugen Rochko	aed25932b5	Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails	2016-12-18 15:20:39 +01:00
Eugen Rochko	6de079a5af	Removing external hub completely, fix #333 fixing digit-only hashtags, removing web app capability from non-webapp pages	2016-12-18 12:24:37 +01:00
victorhck	f5c8d64b6d	added to missings spanish translations	2016-12-14 18:43:00 +01:00
Eugen Rochko	76ec907993	Improved admin UI	2016-12-13 13:42:10 +01:00
Eugen Rochko	0c491ea928	Fix translations	2016-12-09 11:52:09 +01:00
Stanislav Makar	d2ab41aea4	Declare Ukrainian Closes: #345	2016-12-08 18:57:58 +02:00
Vladyslav	2c6c912076	Fix some translation errors.	2016-12-07 21:13:57 +02:00
Vladyslav	d85c566960	Final steps for Ukrainian translation	2016-12-07 20:39:22 +02:00
Eugen Rochko	8b93f45f3d	Fix paperclip config	2016-12-07 17:19:29 +01:00
Eugen Rochko	f114bc7bb7	Update Paperclip config to allow plugging in Minio instead of AWS	2016-12-07 16:59:18 +01:00
Eugen Rochko	f978b06dd1	Add suspend account functionality to admin UI	2016-12-06 18:22:59 +01:00
Eugen Rochko	1357c1cb3d	Add single user mode	2016-12-06 17:19:26 +01:00
Eugen	a910cdd54d	Merge pull request #338 from stamak/uk.yml Add Ukrainian localization file uk.yml	2016-12-05 12:30:07 +01:00
Stanislav Makar	0e18bbe3e2	Add Ukrainian localization file uk.yml Closes: #337	2016-12-05 07:40:45 +02:00
Eugen Rochko	b362de2232	Adding configurable e-mail blacklist	2016-12-04 19:07:02 +01:00
Eugen Rochko	9d9f796130	Adding more to admin accounts UI	2016-12-04 18:10:40 +01:00
Eugen Rochko	f763e844e8	Do not use expiring links after all	2016-12-04 13:02:43 +01:00
Eugen Rochko	80c44ed9c1	Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also make it private (aka only accessible via expiring links to prevent hotlinking)	2016-12-04 12:28:10 +01:00
Eugen Rochko	290ffb63cd	Fix cloudfront config	2016-12-03 22:12:22 +01:00
Eugen Rochko	d3bd10dfe4	Add Cloudfront support	2016-12-03 22:08:15 +01:00
Stanislav Makar	ea91286aaa	Add Ukrainian localization file doorkeeper.uk.yml Closes: #334	2016-12-03 09:46:26 +02:00
Andrea Faulds	1c1102008f	Fix line endings for Portuguese locale	2016-12-01 17:27:47 +00:00
Eugen Rochko	1d0321fc45	Fix pt translations, improve pre-cache queries, removing will_paginate from accounts/tags because it's a terribly inefficient way to paginate large sets of data	2016-12-01 16:26:25 +01:00
unsmell	66e55d60e1	Create pt localisation files in /config/locales/	2016-11-30 23:04:53 -01:00
Eugen Rochko	6ff93845d5	Add basic OEmbed provider API, fix #247	2016-11-30 23:01:03 +01:00
Eugen Rochko	14bd46946d	Per-status control for unlisted mode, also federation for unlisted mode Fix #233, fix #268	2016-11-30 21:34:59 +01:00
Eugen Rochko	356d3874eb	Normalize localizations, add stub for admin/accounts	2016-11-30 15:32:26 +01:00
Eugen Rochko	5973ca3d11	Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars	2016-11-29 14:20:15 +01:00
Eugen Rochko	cc70f28f19	Adding rack timeout of 30sec, PuSH jobs moved to push queue so they can be processed separately	2016-11-29 02:07:14 +01:00
Eugen Rochko	c0555f2db6	Don't rate-limit PuSH endpoints	2016-11-29 00:44:11 +01:00
Eugen Rochko	4e351baf88	Fix URLs in inline-rendered XML	2016-11-29 00:26:01 +01:00
Eugen	41ef277da3	Fix URLs in ApplicationController.renderer	2016-11-28 21:21:05 +01:00
Eugen Rochko	27fc49d745	Add simple admin overview of PuSH subscriptions	2016-11-28 18:45:13 +01:00
Eugen Rochko	66ab0d0d56	Enabling portuguese and hungarian translations, which are awfully incomplete	2016-11-28 13:55:03 +01:00
Eugen Rochko	2d2c81765b	Adding embedded PuSH server	2016-11-28 13:36:47 +01:00
Eugen	26287b6e7d	Merge pull request #275 from kodacs/master Hungarian translation for Mastodon.	2016-11-26 18:33:48 +01:00
Eugen Rochko	6c82dfcf5f	Fix CDN_HOST variable requirement	2016-11-26 15:27:05 +01:00
Eugen Rochko	dda9ac9222	Fix reset date format when rate limited	2016-11-25 18:20:47 +01:00
kodacs	b503a5e05e	#275 fix missing i18n item	2016-11-25 14:56:28 +01:00
kodacs	7bd559158b	fixing yamls for #275	2016-11-25 13:57:37 +01:00
kodacs	6586408c69	fix #275	2016-11-25 13:35:08 +01:00
nicolas	959e4b8198	Merge branch 'master' into french-translation	2016-11-25 13:33:00 +01:00
nicolas	9bb885805c	Update simple_form.fr.yml	2016-11-25 13:30:52 +01:00
Eugen Rochko	1ff0d5aea6	Normalized locale files	2016-11-25 13:15:07 +01:00
Eugen	1c9e21a507	Merge pull request #273 from nclm/french-translation French localisation update	2016-11-25 13:14:30 +01:00
Eugen Rochko	71401659b8	Fix #65 - Options to block notifications from people you don't follow/who don't follow you	2016-11-25 13:13:16 +01:00
kodacs	eb3a12bba6	Server side HU translation + Toot fix.	2016-11-25 12:43:23 +01:00
nicolas	d0122045f4	Update simple_form.fr.yml	2016-11-25 09:25:31 +01:00
nicolas	4cc6684881	Update fr.yml	2016-11-25 09:25:29 +01:00
Eugen Rochko	8efa081f21	Remove Neo4J	2016-11-24 23:46:27 +01:00
Eugen Rochko	8e34bed7cc	Mini Profiler not working well, remove it	2016-11-24 19:59:11 +01:00
Eugen Rochko	4f1d863615	Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users	2016-11-24 18:17:58 +01:00
nicolas	23677bc51e	Merge branch 'master' into french-translation	2016-11-23 15:43:27 +01:00
nicolas	1e95fbb10b	Update doorkeeper.fr.yml e	2016-11-23 14:47:41 +01:00
nicolas	94f96a6e85	Update doorkeeper.fr.yml	2016-11-23 14:45:31 +01:00
Eugen Rochko	fc90d38893	Moving some counter queries out of subqueries in the API	2016-11-22 22:59:54 +01:00
Eugen Rochko	4a422650bb	Fix broken locales	2016-11-22 11:34:36 +01:00
nicolas	82cb34916a	Update fr.yml	2016-11-22 10:39:15 +01:00
nicolas	ba4c03de71	Update simple_form.fr.yml silenced mode + edits	2016-11-22 10:32:43 +01:00
nicolas	89dab7c534	Merging code updates (Unlisted Mode)	2016-11-22 10:25:17 +01:00
Eugen Rochko	1788164352	Local accounts can control "silenced" attribute which removes them from public timeline	2016-11-21 23:06:41 +01:00
nicolas	64cfbbcc55	Adding French locale	2016-11-21 22:46:59 +01:00
nicolas	46d9076e99	Importing doorkeeper.fr.yml From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml	2016-11-21 22:39:20 +01:00
nicolas	12e9f789ab	Importing devise.fr.yml From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013	2016-11-21 22:34:50 +01:00
Eugen Rochko	7944ed6fe5	Adding option to specify asset server, filter followers query by local accounts during Fan Out On Write to load less stuff into memory	2016-11-21 22:04:10 +01:00
nicolas	a3afea7b9d	First version for simple_form.fr.yml	2016-11-21 21:30:13 +01:00
nicolas	fc87243c39	First version for fr.yml	2016-11-21 21:25:27 +01:00
nicolas	05823c325c	Create devise.fr.yml	2016-11-21 20:59:41 +01:00
nicolas	753115ff57	Create doorkeeper.fr.yml	2016-11-21 20:59:13 +01:00
nicolas	8504110d45	Create simple_form.fr.yml	2016-11-21 20:58:43 +01:00
nicolas	e9980a9b8b	Create fr.yml	2016-11-21 20:57:28 +01:00
Eugen Rochko	db58235930	Fixes for the Spanish translation	2016-11-21 11:05:11 +01:00
Eugen Rochko	38dd85daab	Adding notifications column	2016-11-20 19:39:58 +01:00
Eugen Rochko	da2ef4d676	Adding unified streamable notifications	2016-11-20 19:39:58 +01:00
Victorhck	c12125e6b5	improvements in text made by Ekaitz	2016-11-20 00:52:06 +01:00
Victorhck	0b48973733	fix typos, and suggestions made by Ekaitz	2016-11-20 00:50:45 +01:00
Eugen Rochko	8977fde8ed	Fix up Spanish translations	2016-11-19 22:05:26 +01:00
Victorhck	d68750d7dc	Finished spanish translation config files	2016-11-19 18:40:03 +01:00
Eugen	93e47c7135	Fix wrong language declaration	2016-11-19 18:31:36 +01:00
Eugen	5cda7f6bbb	Fix wrong language declaration	2016-11-19 18:31:21 +01:00
victorhck	a6ed09441c	finished spanish translation config files	2016-11-19 17:45:45 +01:00
Eugen Rochko	c7a1b78536	Activating Spanish i18n	2016-11-19 00:10:47 +01:00
Victorhck	367b05d733	Spanish translation for devise.es.yml	2016-11-18 23:57:03 +01:00
Victorhck	a05fe70c24	finished spanish translation for es.yml	2016-11-18 23:04:26 +01:00
victorhck	084668c170	started sp translations config locales	2016-11-18 20:39:40 +01:00
Eugen Rochko	85d1b74ac3	Adding german localization	2016-11-18 15:53:46 +01:00
Eugen Rochko	116ab27e08	i18n for devise mailer too	2016-11-16 18:25:21 +01:00
Eugen Rochko	2c766bd4b4	Add user locale setting	2016-11-16 17:56:31 +01:00
Eugen Rochko	546c4718e7	Localizations for most server-side strings	2016-11-16 00:55:33 +01:00
Eugen Rochko	3ce6ac0ce2	Adding some localizations	2016-11-15 23:02:57 +01:00
Eugen Rochko	fdc17bea58	Fix rubocop issues, introduce usage of frozen literal to improve performance	2016-11-15 16:56:29 +01:00
Eugen Rochko	d42ed78aa4	Fix #110 - Make web UI use browser history, change links in e-mails to link to that	2016-11-13 14:02:34 +01:00
Eugen Rochko	09218d4c01	Use full-text search for autosuggestions	2016-11-12 14:36:10 +01:00
Eugen Rochko	ff229aa978	Fix #141 - Add "Server: Mastodon" header to responses	2016-11-10 23:34:33 +01:00
Eugen Rochko	448ab18a20	Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint	2016-11-09 18:06:01 +01:00
Eugen Rochko	b13e7dda1f	API pagination for all collections using Link header	2016-11-09 17:48:44 +01:00
Eugen Rochko	9aecc0f48a	Move timelines API from statuses to its own controller, add a check for resources that require a user context vs those that don't (such as public timeline) /api/v1/statuses/public -> /api/v1/timelines/public /api/v1/statuses/home -> /api/v1/timelines/home /api/v1/statuses/mentions -> /api/v1/timelines/mentions /api/v1/statuses/tag/:tag -> /api/v1/timelines/tag/:tag	2016-11-08 23:29:08 +01:00
Eugen Rochko	86574ea524	Adding Emoji One	2016-11-08 21:46:29 +01:00
Eugen Rochko	2f21f4cc01	Fix region setting for AWS gem	2016-11-08 18:55:46 +01:00
Eugen Rochko	dbe00a4156	Improved configuration from ENV, cleaned up timeline filter methods to be more readable, add extra logging to process feed service	2016-11-07 23:20:52 +01:00
Eugen Rochko	b835f4aa1c	Fix insecure S3 URLs	2016-11-06 20:59:06 +01:00
Eugen Rochko	d14967e1c8	Fix URL configuration when S3 is enabled	2016-11-06 20:43:16 +01:00
Eugen Rochko	45230c56ab	Improve S3 config	2016-11-06 18:55:20 +01:00
Eugen Rochko	3ab193bc3f	Adding optional S3, fail-mastodon	2016-11-06 18:35:46 +01:00
Eugen Rochko	48b9619439	Adding hashtags	2016-11-05 17:13:14 +01:00
Eugen Rochko	6471a548fe	Add pghero for analyzing postgres performance in production	2016-11-04 18:35:04 +01:00
Eugen Rochko	829d189f44	Add tests for recently added API end points	2016-11-03 18:53:37 +01:00
Eugen Rochko	e4671adc25	Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status	2016-11-03 14:50:22 +01:00
Eugen Rochko	e7723ab662	Add puma preloading, decrease DB pool size to size of threads per worker	2016-11-02 16:38:54 +01:00
Eugen Rochko	53fb7b1aa8	Replace in-memory cache store with redis store, should decrease memory footprint of each running process by 128mb	2016-11-02 13:30:52 +01:00
Eugen Rochko	a59d10d3df	Fix missing default headers	2016-11-02 13:12:18 +01:00
Eugen Rochko	9467b900a2	Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY, add permissive CORS to API controllers	2016-11-02 12:58:15 +01:00
Eugen Rochko	dd03118098	Fix follow icon changing plus to minus, add terms page stub	2016-11-01 18:05:55 +01:00
Eugen Rochko	e0a197650a	Adding common followers API, fixing fallback query again	2016-10-29 01:29:19 +02:00
Eugen Rochko	720d1f8f3d	Restrict access to oauth/applications to admins only	2016-10-23 12:08:52 +02:00
Eugen Rochko	a9e40a3d80	Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting to the API	2016-10-22 19:39:44 +02:00
Eugen Rochko	43df35213e	Improving all forms	2016-10-18 16:37:15 +02:00
Eugen Rochko	d5e086a47b	Adding application/jrd+json webfinger resource	2016-10-18 02:54:49 +02:00
Eugen Rochko	dd02fc0ec4	More debugging	2016-10-18 01:22:28 +02:00
Eugen Rochko	6611e3a2ef	More debugging	2016-10-18 00:59:18 +02:00
Eugen Rochko	4baca34a45	Do not compress JS (perhaps it removes source maps, needed for debugging)	2016-10-18 00:48:40 +02:00
Eugen Rochko	c9a7e6e1e3	Enable source maps	2016-10-18 00:36:01 +02:00
Eugen Rochko	e21a3fe0cd	Adding sync of follow relationships to Neo4J, accounts/suggestions API	2016-10-14 23:10:07 +02:00
Eugen Rochko	7a6d95f70c	E-mail preferences page	2016-10-14 02:28:49 +02:00
Eugen Rochko	1f650d327d	Adding public timeline	2016-10-07 16:00:11 +02:00
Eugen Rochko	3554d638b3	Fix #72 - add follow/unfollow button to public profiles	2016-10-06 21:27:58 +02:00
Waldir Pimenta	4f654eb822	use consistent capitalization for subject lines	2016-10-06 11:16:59 +01:00
Yann Vaillant	038a407b9e	Update default devise wording to include reference to Mastodon Fix #68	2016-10-06 07:45:07 +02:00
Eugen Rochko	fe77921e47	Catching more exceptions that slipped through, removing AR logging from production as it's very verbose and not very useful	2016-10-05 13:26:44 +02:00
Eugen Rochko	7b9a4af311	API for blocking and unblocking	2016-10-03 18:17:06 +02:00
Eugen Rochko	fc198a8b4c	Adding e-mail confirmations	2016-10-03 16:51:00 +02:00
Eugen Rochko	d74da1a89a	Small fixes	2016-10-02 23:46:25 +02:00
Eugen Rochko	f06f295890	Fix doorkeeper skip_authorization	2016-10-02 22:55:09 +02:00
Eugen Rochko	6d7290f47c	Add API for getting info about authenticated user: /api/v1/accounts/verify_credentials	2016-10-02 16:14:21 +02:00
Eugen Rochko	4909bbf415	Add logging for outgoing http requests	2016-10-02 14:58:06 +02:00
Eugen Rochko	492224b93f	Allow non-https redirect URIs for OAuth apps (AndStatus seems to require this)	2016-09-30 22:40:31 +02:00
Eugen Rochko	e63aebff7a	Adding landing page	2016-09-27 23:12:33 +02:00
Eugen Rochko	4f9b7432dd	Fix #52 - Add API versioning (v1)	2016-09-27 16:59:08 +02:00
Eugen Rochko	7e14eefc81	Replace logo, fix #57 - delete/unreblog/unfavourite API, fix #45 - app registration API	2016-09-26 23:56:53 +02:00
Eugen Rochko	3b56350121	Fix #6 - Rate limit GET reqs to 300/5min, POST to 100/5min	2016-09-24 13:53:54 +02:00
Eugen Rochko	e46abc71ca	Fix notifications in UI, added new API for fetching account relationships	2016-09-21 22:07:18 +02:00
Eugen Rochko	bd5ad304ba	Adding media controller, 1 webm/compose form allowed, previews generated	2016-09-17 17:47:26 +02:00
Eugen Rochko	5b0cef9781	Setting up preliminary "detailed" routes in the UI, new API end-point for fetching status context	2016-09-16 00:21:51 +02:00
Eugen Rochko	85d89b472d	Optimized n+1 queries in accounts Atom and HTML views Added stack trace for SQL queries in development Removed badly thought out accounts/lookup API	2016-09-08 20:36:01 +02:00
Eugen Rochko	509c18eb13	Fix local follows, 404 in logs	2016-09-08 02:40:51 +02:00
Eugen Rochko	0f4bc56719	Improving production logs, removing n+1 on media attachments in atom, adding attachments display to static views	2016-09-08 01:24:26 +02:00
Eugen Rochko	eec0dc46a6	PostStatusService can attach media to status, ProcessFeedService likewise	2016-09-05 18:39:53 +02:00
Eugen Rochko	ae1fac0062	Add API to upload media attachments	2016-09-05 17:46:36 +02:00
Eugen Rochko	413e700fe0	Enhancing test suite but I think the problem might have been caching setting	2016-09-05 01:26:08 +02:00
Eugen Rochko	1022d682dc	Normalized data in Redux, fix for asset URLs when rendered outside request	2016-09-04 14:04:26 +02:00
Eugen Rochko	92afd29650	The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests Adding better errors for the API controllers, posting a simple status works from the frontend now	2016-08-26 19:12:19 +02:00
Eugen Rochko	44e57f64dd	Improving statuses, adding a composer drawer, which doesn't work yet	2016-08-25 19:52:55 +02:00
Eugen Rochko	bc0692d75b	Removing mini-profiler that doesn't work, formatting timelines a bit better	2016-08-24 19:23:37 +02:00
Eugen Rochko	49520d6e62	Adding React.js, Redux, revamping dashboard	2016-08-24 17:56:44 +02:00
Eugen Rochko	68c93f8b85	Final fix for ActionCable origin issues	2016-08-18 18:51:50 +02:00
Eugen Rochko	8985f8e66c	Fixing more configuration issues with ActionCable	2016-08-18 18:39:35 +02:00
Eugen Rochko	5a8c149f6b	Fix ActionCable origin checking	2016-08-18 18:08:25 +02:00
Eugen Rochko	8459acd123	Fix for force SSL issue with websockets	2016-08-18 17:48:57 +02:00
Eugen Rochko	6426819b6f	Fix tests	2016-08-18 17:22:44 +02:00
Eugen Rochko	6deb9f966e	Live timelines using ActionCable	2016-08-18 15:49:51 +02:00
Eugen Rochko	10ba09f546	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
Eugen Rochko	6c480c8429	Oops, typo	2016-03-26 13:52:40 +01:00
Eugen Rochko	85b00d19b8	Moving Salmon notifications to background processing, fixing mini-profiler behaviour with Turbolinks enabled, optimizing Rabl for production	2016-03-26 13:42:10 +01:00
Eugen Rochko	5764d52b04	Fix Sidekiq pooling issues. Remove API docs from homepage, replace with a basic home timeline	2016-03-25 16:10:14 +01:00
Eugen Rochko	bb98ee489d	Up the number of pooled DB connections to cover both Sidekiq and Puma workers	2016-03-25 15:10:34 +01:00
Eugen Rochko	318886287b	Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query	2016-03-25 15:09:40 +01:00
Eugen Rochko	36f3da3cde	Adjust down the number of Sidekiq threads to 5 (default of 25 is way too high)	2016-03-25 14:20:31 +01:00
Eugen Rochko	e24bfbde1a	Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding admin status to users	2016-03-25 14:12:24 +01:00
Eugen Rochko	42dcb0d4cb	Adding Sidekiq for background processing (firstly just of mailers)	2016-03-25 02:50:48 +01:00
Eugen Rochko	f14f462eaf	Adding Turbolinks, adding status posting form on homepage	2016-03-21 18:26:47 +01:00
Eugen Rochko	9d55529318	Fix text color in dashboard inputs, sanitize remote status content in UI, simplify FanOutOnWriteService, add /api/accounts/lookup method	2016-03-21 17:02:16 +01:00
Eugen Rochko	253ab26520	Adding more tests for helpers	2016-03-20 13:50:22 +01:00
Eugen Rochko	b640f35621	Writing out more tests, fixed some bugs	2016-03-20 13:03:06 +01:00
Eugen Rochko	e2b846f630	Adding letter opener for development and Rack::Attack for future rate limiting implementations	2016-03-19 14:57:30 +01:00
Eugen Rochko	71ae4dd3d2	Adding public following and followers pages, fix #3	2016-03-19 14:02:30 +01:00
Eugen Rochko	9cb690c706	Access tokens no longer expire, case-insensitive local username validation, as well as case-insensitive Webfinger look-up	2016-03-16 18:29:52 +01:00
Eugen Rochko	48d66a2055	Fixing the docker container setup (with assets compilation &co)	2016-03-16 12:57:01 +01:00
Eugen Rochko	2c374cd97c	Adding e-mail configuration	2016-03-16 12:13:40 +01:00
Eugen Rochko	b17202ca0f	Adding a docker-compose template for running Mastodon easily	2016-03-14 21:39:39 +01:00
Eugen Rochko	6fec8afc3f	Bind oauth applications to users	2016-03-14 17:49:13 +01:00
Eugen Rochko	3441361568	Adding simple_form, adding profile settings, header image	2016-03-12 20:47:22 +01:00
Eugen Rochko	1aa477ac2f	Customized more doorkeeper views, only logged in users can create oauth apps	2016-03-12 19:46:06 +01:00
Eugen Rochko	aab9f57e36	Adding config for puma, dashboard layout, fixing some queries	2016-03-12 16:21:53 +01:00
Eugen Rochko	447cfef62d	Improving feed queries, switching API to doorkeeper authentication	2016-03-11 16:47:36 +01:00
Eugen Rochko	b919f39b31	Customizing doorkeeper views for authorizing app	2016-03-11 01:58:55 +01:00
Eugen Rochko	6c4c84b161	Distrubute statuses as a fan-out-on-write system, with optional precomputing	2016-03-08 20:20:45 +01:00
Eugen Rochko	fe57f6330f	API methods for retrieving home and mentions timelines	2016-03-07 13:25:26 +01:00
Eugen Rochko	f099bc6091	Adding API for favouriting a status	2016-03-07 12:58:42 +01:00
Eugen Rochko	ab6696e855	Adding doorkeeper, adding a REST API POST /api/statuses Params: status (text contents), in_reply_to_id (optional) GET /api/statuses/:id POST /api/statuses/:id/reblog GET /api/accounts/:id GET /api/accounts/:id/following GET /api/accounts/:id/followers POST /api/accounts/:id/follow POST /api/accounts/:id/unfollow POST /api/follows Params: uri (e.g. user@domain) OAuth authentication is currently disabled, but the API can be used with HTTP Auth.	2016-03-07 12:42:33 +01:00
Eugen Rochko	c605b828b5	Adding routes to follow, unfollow, favourite and reblog (locally known models)	2016-03-06 12:51:55 +01:00
Eugen Rochko	6045b6cb18	Customizing devise views and controllers	2016-03-05 22:43:05 +01:00
Eugen Rochko	7e93da3f8d	Removing grape and adding devise	2016-03-05 13:12:24 +01:00
Eugen Rochko	23d08c6749	Changing the use of config constants to the Rails configuration object	2016-02-29 20:06:39 +01:00
Eugen Rochko	0e8f59c16f	Refactoring Grape API methods into normal controllers & other things	2016-02-29 19:42:08 +01:00
Eugen Rochko	ee73d35eea	Incoming Salmon requests can be turned into follows and unfollows	2016-02-23 22:17:07 +01:00
Eugen Rochko	fa33750105	Adding reblogs, favourites, improving atom generation	2016-02-23 19:17:37 +01:00
Eugen Rochko	3b0bc18db9	Improved Atom rendering templates, added README	2016-02-23 13:08:01 +01:00
Eugen Rochko	2bc48e9064	Individual atom entries	2016-02-22 19:11:07 +01:00
Eugen Rochko	1dad72bf13	Fixes and general progress	2016-02-22 18:10:30 +01:00
Eugen Rochko	709c6685a9	Made some progress	2016-02-22 16:00:20 +01:00
Eugen Rochko	9c4856bdb1	Initial commit	2016-02-20 22:53:20 +01:00

... 30 31 32 33 34 ...

2072 Commits