about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-19Replace User.count -> User.confirmed.count (#2127)alpaca-tc
2017-04-19Remove unnecessary word from Japanese locale (#2143)Yamagishi Kazutoshi
2017-04-19Fix html escape characters in the URL (#2138)abcang
* fix character escaping in URL * add tests * put a comma after the last item * add HTML escape test
2017-04-19enable to scroll the setting's page sidebar (#1347)857b
* enable to scroll the setting's page sidebar add scroll:auto and use margin instead of padding for the bottom * Update admin.scss * Update admin.scss * Update admin.scss
2017-04-19Install Yarn dependencies during setup (#1169)Joël Quenneville
Previously the `bin/setup` script only installed the Ruby dependencies via Bundler. This is not sufficient to get the test suite to pass. We also need the JavaScript dependencies. This commit installs the JavaScript dependencies as part of the `bin/setup` script via Yarn. This allows for a successful bin/setup && bundle exec rake on a fresh clone of the repo.
2017-04-19capistrano: link robots.txt (#1576)Alex Dunn
Related to #1533.
2017-04-19Do not show link preview card if toot has a spoiler (#1617)Isabelle Knott
* Do not show link preview card if toot has a spoiler * == to ===
2017-04-19Moves from hamburger icon to asterisk. (#2116)Ash Furrow
2017-04-19Improve visibility of mute, block, report menu in Japanese (#2131)chrolis
2017-04-19Make configuarable s3_permissions for paperclip (#2139)tmyt
2017-04-19Update title text for "reply all" button (#2118)Misty De Meo
2017-04-19Change to switch signature version for Amazon S3 (#2124)Yamagishi Kazutoshi
2017-04-19Restful refactor of accounts/ routes (#2133)Matt Jankowski
* 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-19Update ja.yml (follow for #2118) (#2137)Kota Ouchi
* Update ja.yml (follow for #2118) * typo fix
2017-04-19update simple_form.ja.yml (follow for #1991) (#2113)Isao Sugimoto
2017-04-19update ja.yml (follow for #2106) (#2109)Isao Sugimoto
2017-04-19Update fr.yml (#2107)Michel
Just updated some values. Best regards, cyweo
2017-04-18Fix wording on admin instances view, fix typos in language detector spec (#2106)Eugen
2017-04-18Remove unused fonts (#2103)Eugen
2017-04-18Fix #1642, fix #1912 - Dictate content-type file extension (#2078)Eugen
* 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-18Add more tests for AtomSerializer (#2096)Eugen
2017-04-18missing translate ja.yml (#2100)Isao Sugimoto
2017-04-18Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)Eugen
* 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-18Language detection refactor (#2099)Matt Jankowski
* Extract detect_language to separate class * Use default locale, not just en * Add spec to confirm that whatlanguage cant identify empty string * Allow account locale to override default in language detector * PostStatusService supplies an account to detect language
2017-04-18Remove API authentication for public statuses (after review) (#1919)happycoloredbanana
2017-04-18Polish zh-cn js translation (#2090)Mingye Wang
* Polish zh-cn js translation * fixes for problems pointed out by gumblex in #2044 * more effectively differentiate between following/follower * Fix missing period (zh-cn js) Maybe squash this commit? * Fix duplicate word (zh-cn js)
2017-04-18Instances list in admin (#2095)Matt Jankowski
* 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-18Admin reports with accounts (#2092)Matt Jankowski
* 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-18Disable toot button when above 500 characters (#2088)Tomohiro Suwa
* Disable toot button when above 500 characters * Consider multibyte characters * Consider spoiler_text
2017-04-18fix admin input display (#1633)spf
2017-04-18Moving aria-label to div.column (#1769)JP DeVries
* Use landmark regions on columns Closes mastodon#1720 * Moving aria-label to div.column
2017-04-18Simplify renders in views (#2084)Matt Jankowski
* Simplify render in mailer views * Simplify render in about/more view * Simplify render in accounts follow views * Simplify render in recovery code views * Simplify render in stream entry embed * Simplify render in stream entries status partial * Simplify render in authorize follow new view
2017-04-18Update storybook file autoload (#2057)usagi-f
2017-04-18Add "Mastodon" to user agent (#2073)ik-fib
Remove non-const version string Freeze option is unnecessary
2017-04-18Translate onboarding dialog to japanese (#2062)Keiji, Yoshimi
* translate onboarding modal to japanese * fixed translation by feedback
2017-04-18Fix streaming server worker count (#2082)kuro5hin
* Make sure we start at least one streaming worker, even if there's only one CPU and we're in production mode. * Oops, let's make sure we're counting cpus right too.
2017-04-18Avoid dynamic methods due to processing speed (#2080)839
2017-04-18Fix header icons in navigation bar (#2081)Andrey Blinov
2017-04-18French translation update (#2063)Olivier Humbert
fixes
2017-04-18Add Occitan (oc) translation (#2077)Koala Yeung
* 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-18Update Russian translation (#1967)Ratmir Karabut
* 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-18Add hasMore field to account timeline (#2066)geta6
2017-04-18Merge branch 'patf-pause-gif'Eugen Rochko
2017-04-18Adjust visuals of non-autoplaying GIFVEugen Rochko
2017-04-18Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gifEugen Rochko
2017-04-18Remove unused methods (#1730)Matt Jankowski
* Remove unused method #set_counters_maps from api controller * Remove unused method #set_account_counters_maps from api controller * Remove unused method Account#followers_domains * Remove unused User.prolific scope * Add mastodon:users:admins task to list all admin emails * Use interpolated query style in Account.triadic_closures * Coverage for Account.triadic_closures
2017-04-18Merge branch 'pixiv-fix/cache_blocking'Eugen Rochko
2017-04-18Rename cache key to exclude_account_ids_for:id, adjust formattingEugen Rochko
2017-04-18Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into ↵Eugen Rochko
pixiv-fix/cache_blocking
2017-04-18Add forgotten AtomSerializer spec (#2047)Eugen
generated by cgit-pink (git 2.37.1) at 2024-11-22 21:04:23 +0000