about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-02i18n: updated Polish translation (#2727)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02Add option to disable two factor auth in admin accounts panel. (#2584)Kaylee
* Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
2017-05-02Add admin area view partials for each record type (#2700)Matt Jankowski
2017-05-02Creation of activerecord for OC (#2721)Quent-in
* Creation of activerecord for OC * Update activerecord.oc.yml
2017-05-02Norwegian translation for email notifications (#2673)Audun Larsen
* Create confirmation_instructions.no.html.erb * Create confirmation_instructions.no.text.erb * Create password_change.no.html.erb * Create password_change.no.text.erb * Create reset_password_instructions.no.html.erb * Create reset_password_instructions.no.text.erb * Translates html welcome email * Translates welcome email * Translates html password changed email * Translates password changed email * Translates html reset password email * Translates reset password email * Fixes typo in translation * Fixes typo in translation
2017-05-02Darkens colour on stream entries meta. (#2616)Ash Furrow
2017-05-02i18n: Updated Polish translation (#2686)m4sk1n
#807
2017-05-02Reset textarea height when press submit key (#2681)Yamagishi Kazutoshi
* Reset textarea height when press submit key * dry * DON'T NEED props
2017-05-02Language: update pt-BR (#2687)Eduardo Elias
2017-05-02Fix to completely hide NSFW-tagged images (#2724)hakoai
2017-05-02Fix subscription expiration condition (#2715)Yamagishi Kazutoshi
* Fix subscription expiration condition * dry and add spec
2017-05-02Make it possible to check Subscription that has expired (#2712)Yamagishi Kazutoshi
2017-05-02Add Hebrew interface translation. (#2573)Ira
* follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...
2017-05-01grammar fixes (#2695)Drew Gates
“such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.
2017-05-02fix(boost-icon): Align center for Firefox (#2690)Stephen Burgess
2017-05-02annotate models (#2697)yhirano
* add annotate to Gemfile * rails g annotate:install * configure annotate_models * add schema info to models * fix rubocop to add frozen_string_literal
2017-05-02Coverage for remote follows (#2694)Matt Jankowski
* Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts
2017-05-01Error responses cleanup (#2692)Matt Jankowski
* Use respond_with_error for forbidden errors * Wrap up common error code into single method
2017-05-01Italian translation (#2654)Giuseppe Pignataro
* Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml
2017-05-01fix(scrolling): Center for large screen w/o breaking horiz scroll (#2682)Stephen Burgess
2017-05-01fix(dropdowns): Allow for dropdowns to fill full column (#2684)Stephen Burgess
* fix(dropdowns): Allow for dropdowns to fill full column When the text inside a dropdown is longer than it is for English, the text is truncated which can result in a less-than-usable experience for languages such as German with longer words. This commit addresses the following: * Allow the dropdown to expand to the entire width of the column based on the length of the text in the dropdown * Align active dropdown arrow in relation to the trigger rather than the dropdown * Show the right hand side of the dropdown which was previously hidden (could not see border radius) * Ensure the three places dropdowns of status, account, and emoji appear well in Chrome, Firefox, Safari * fix(emoji-dropdown): Restore emoji dropdown caret
2017-05-01Filter on allowed user language preferences (#2361)Matt Jankowski
* Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference
2017-05-01Fix Rubocop offences (#2630)yhirano
* disable Bundler/OrderedGems * fix rubocop Lint/UselessAssignment * fix rubocop Style/BlockDelimiters * fix rubocop Style/AlignHash * fix rubocop Style/AlignParameters, Style/EachWithObject * fix rubocop Style/SpaceInLambdaLiteral
2017-05-01Detect extension for preview card (#2679)Yamagishi Kazutoshi
* Detect extension for preview card * next
2017-04-30Reports spec for media attachments, clean up method (#2660)Matt Jankowski
* Add coverage for Report#media_attachments * Direct query on media attachment
2017-04-30Add postgres/redis folder to .dockerignore (#2659)mecab
2017-04-30Updating Indonesian locale (#2644)Alvina Putri
* update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key
2017-04-30Additional key checks for browser compatibility (#2539)Noëlle Anthony
Not all browsers recognize e.key === 'Escape'; some use 'Esc' and some only respond to the keyCode.
2017-04-30Center web app on larger windows sizes (#2021)Hugo Gameiro
* center web app for larger screen sizes * move center app to components.scss * center app on larger window sizes * center .columns-area
2017-04-30Fix character_counter.jsx (#2653)AA4ch1
This commit fixes #2576
2017-04-30Norwegian locale: Translates missing 2FA strings (#2655)Audun Larsen
* Adds missing strings to Norwegian locale * Translates missing strings. * Changes "tofaktorautentisering" to "to-faktor autentisering" According to the Norwegian National Security Authority this is the correct way to spell it. https://www.nsm.stat.no/blogg/veiledning-i-to-faktor-autentisering/
2017-04-30Minor fixes in the French translation (#2607)Sylvhem
* Changement de « muets » en « silencés » Utiliser le mot « muet » donne la fausse impression que ces comptes ne diffusent juste rien. Utiliser le mot « silencé » met l’accent sur le fait que ceci résulte d’une action de l’utilisateur·rice. By using tho word "muet" (mute), we give the false impression that this accounts don't publish anything. Using the "silencé" (muted) put emphasis on the fact that this is the result of one of the user's action. * Remplacement de « ' » par « ’ » En français, l’apostrophe utilisée est une apostrophe courbe « ’ » (U+2019) et non pas une apostrophe droite « ' » (U+0027). La plupart des chaînes utilisaient une apostrophe droite. Ce commit harmonise le type d’apostrophe utilisé en remplaçant toutes les apostrophes droites par des apostrophes courbes. In French, the apostrophe used is the curly one (U+2019) and not the vertical one (U+0027). Almost all the strings used a vertical apostrophe. This commit harmonize the kind of apostrophe used in the French localization by replacing all the vertical apostrophes by curly apostrophes. * Remplacement de « ... » par « … » Certaines chaînes utilisaient trois points d’affilié afin de représenter les points de suspension au lieu d’utiliser le caractère dédié « … » (U+2026). Ce commit harmonise la façon de représenter des points en remplaçant toutes les séries de trois points par le caractère dédié. Some chains used a series of three dots to show the ellipsis instead of using the dedicated character "…" (U+2026). This commit harmonize how the ellipsis is shown in the French localization by replacing all the series of three dots by the dedicated character. * Ajout d’un point final Il manque un point à la fin de la dernière phrase de la chaîne « compose_form.privacy_disclaimer ». Ce commit le rajoute. The last sentence of the "compose_form.privacy_disclaimer" string is missing a final dot. This commit will add it. * Retrait d’un « s » final à « Mastodon » Suite à la remarque de @wxcafe, retrait du « s » final à « Mastodon ». Following @wxcafe comment, this commit remove the final "s" in the word "Mastodon".
2017-04-30Update ar.jsx (#2647)ButterflyOfFire
* Update ar.jsx Updating some (ar) translation. * Update ar.yml Pushing some missing translation strings on ar.yml
2017-04-30Minor changes to Norwegian locale (#2652)Audun Larsen
2017-04-30Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)Akihiko Odaki
This reverts commit 5135d609b774b177d3d3894b176a822d86b73d3c.
2017-04-30Add target=_blank to user note (#2622)Yamagishi Kazutoshi
* Add target=_blank to user note Open new window when click link from user profile in remote instance. * fix rubocop
2017-04-30Extract user tracking into concern (#2600)Matt Jankowski
2017-04-30allow localhost to bypass the ratelimit (#2554)Tristan Mahé
2017-04-30Use PostgreSQL inheritance for blocks and mutes (#2520)Akihiko Odaki
2017-04-30More coverage yes more even more (#2627)Matt Jankowski
* Add coverage for admin/confirmations controller * Coverage for statuses controller show action * Add coverage for admin/domain_blocks controller * Add coverage for settings/profiles#update
2017-04-30Downgrade rubocop 0.48.1 => 0.46.0 (#2628)yhirano
* downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/**/* from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop
2017-04-29Bump version to 1.3.2 (#2623)Eugen Rochko
2017-04-29fix(video): Position of play icon (#2608)Stephen Burgess
* fix(video): Position of play icon #2601 * fix(overlay-button): Positioning * fix(expand): Bottom align expand icon * feat(video): Fit landscape videos into preview area
2017-04-29Update index.js (#2612)YOU
2017-04-29Expand uploaded thumbnail (#2611)alpaca-tc
2017-04-29Remove uneeded `ORDER BY` query (#2615)alpaca-tc
2017-04-29Set unknown attachment type when adding domain blocks (#2605)Patrick Figel
Follow-up to #2599. When a domain block with `reject_media` is added or `rake mastodon:media:remove_remote` is invoked, mastodon deletes the locally cached attachments and avatars but does not reflect that change in the database, causing the `file` fields to still have values. This change persists the deletion in the database and sets the attachment type to unknown. This also introduces a one-off rake task that sets all attachments without a local file to the "unknown" type. The upgrade notes for the next release should contain a post-upgrade step with `rake mastodon:media:set_unknown`.
2017-04-29Add tests to the Feed model (#2594)Joël Quenneville
This adds a test for the `Feed#get` method. While the data transformations in `Feed#get` may seem redundant, they are important to maintain the order from Redis. The tests I wrote will fail if someone tries to refactor away this "redundancy" (as I tried to do in the first iteration of this change).
2017-04-29Set correct attachment type for rejected media (#2599)Patrick Figel
In #2110, a new attachment type "unknown" was introduced for attachments that were rejected due to a domain being blocked using reject_media. However, the "type" field was never set to "unknown" because a default value of "0" (image) is set for that column, causing the `type.blank?` expression to always equal false. This version uses type_changed? instead, causing the type to be set to "unknown" unless a type has been explicitly set. This introduces a small change in behaviour causing the type to be set to unknown before paperclip calls `before_post_process`. Presumably this behaviour is more appropriate than the current one because the attachment type has not been determined by that point. Included are new tests for `ProcessFeedService` and `UpdateRemoteProfileService` which now check that remote media is downloaded for non-blocked domains and is rejected for others.
2017-04-28Fix broken view spec for about/links (#2591)Matt Jankowski