about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-01-05add key to lists divcwm
2018-01-05change how list ColumnLink keys are determinedcwm
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Small translation fixes for Serbian (and sr@Latn too) (#6188)Branko Kokanovic
2018-01-05Fix email confirmation link not updating email (#6187)Patrick Figel
A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.
2018-01-04Fix overflowing audit logs (#6184)Lynx Kotoura
2018-01-04Use disable_ddl_transaction! to prevent warnings on migration (#6183)unarist
Migration is wrapped by transaction, so manual `commit_db_transaction` without transaction restarting causes "there is no transaction in progress" warnings. We should use `disable_ddl_transaction!` instead, if we can omit transaction completely.
2018-01-04Bump version to 2.1.1 (#6164)Eugen Rochko
2018-01-04Fallback default thumbnail in instance status API (#6177)Yamagishi Kazutoshi
2018-01-04i18n: Update Polish translation (#6176)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04Send one Delete of Actor in ActivityPub when account is suspended (#6172)Eugen Rochko
2018-01-04Make sure private toots remain private and do not end up in HTTP caches (#6175)ThibG
2018-01-04Improve Traditional Chinese translation (#6166)muan
* Improve Traditional Chinese translations * Sort alphabetically
2018-01-04Fix FetchAtomService not finding alternatives if there's a Link header (#6170)Eugen Rochko
without them, such as is the case with GNU social Fixes the ability to find GNU social accounts via URL in search and when using remote follow function
2018-01-04Rearrange items in Getting Started navigation (#6126)Akihiko Odaki
Though the subsections are representing features such as navigation and settings, they are categorized by the ways how they are implemented (internal navigation or external links.) They are irrelevant and some arrangements were confusing because of that. (It is nonsense that instance information is in settings subsection, for example.) This fixes the issue by rearranging.
2018-01-04Fix nil error in log_target_from_history helper (#6173)Eugen Rochko
2018-01-04Fix OpenSSL dependency in ostatus2 (#6174)Eugen Rochko
2018-01-04Cache JSON of immutable ActivityPub representations (#6171)Eugen Rochko
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-03l10n OC language (#6169)Quenty31
* new strings: hashtag+unlisted, mute, block * Add confirmation step for email changes * Add more instance stats APIs
2018-01-03Don't normalize URLs in toots (#6134)ThibG
* Don't normalize URLs in toots URL normalization is ill-defined and may cause certain links to break. * Change specs since we are not normalizing user-provided URLs
2018-01-03Allow to dereference Follow object for ActivityPub (#5772)Akihiko Odaki
* Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity
2018-01-03i18n: Update Polish translation (#6168)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-03Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 ↵Yamagishi Kazutoshi
(#6167) * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-03Allow HTTP caching of json view of public statuses (#6115)ThibG
* Allow HTTP caching of json view of public statuses HTML views are not cached as they can contain private statuses as well * Disable session cookies for ActivityPub json rendering of public toots
2018-01-03Set background to the navigation of Getting Started column (#6163)Akihiko Odaki
The background of the navigation matters because its scrollbar is transparent.
2018-01-03[!] Sanitize incoming classlist properly (#6162)puckipedia
* Sanitize classlist properly * Actually properly sanitize every class after the first * Improve Formatter spec to check for multiple classes and non-space whitespace
2018-01-03Update moved-to property when it's removed too (#6160)Eugen Rochko
* Fix #6140 - Update moved-to property when it's removed too * Remove trailing whitespace
2018-01-03Don't leave behind husk of remotely-deleted profile (#6159)Eugen Rochko
There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.
2018-01-02Fix newlines-to-spaces functionality (#6158)Noiob
yay for regexes, amirite
2018-01-02Add confirmation step for email changes (#6071)Patrick Figel
* Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes
2018-01-02Display a warning when composing unlisted toots with something looking like ↵ThibG
a hashtag (#6132)
2018-01-02Fix stats expiring too quickly because of variable mistake (#6155)Eugen Rochko
2018-01-02Rename key to path in actions and reducers for settings (#6105)Akihiko Odaki
2018-01-02delete X-UA-Compatible (#6068)Otakan
* delete X-UA-Compatible * undo * restore
2018-01-02Adding Serbian latin translations (#6146)Branko Kokanovic
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02More ../ -> ~.David Yip
2018-01-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02Use const instead of let for constant (#6106)Akihiko Odaki
2018-01-02Show mastodon on modal (#6129)Akihiko Odaki
2017-12-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-31Adding Serbian translation (#6133)Branko Kokanovic
* Adding Serbian translation * i18n-tasks normalize
2017-12-30Merge pull request #291 from glitch-soc/merge-upstreamDavid Yip
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
2017-12-30Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30Switch to tootsuite's elephant friend for the drawerDavid Yip
This version has a transparent background, which works better with the wave.
2017-12-30Use ~ notation in components for image referencesDavid Yip
This uses (more or less) absolute references to external assets, which allows imported stylesheets (like components.scss) to work from other locations that may not have the expected path structure (e.g. the win95 theme).
2017-12-30Translate Korean (#6131)Jeong Arm
Relates to #6125, #6099
2017-12-30keep the same filters and page when doing custom emojo stuff (fixes #6112) ↵beatrix
(#6114)
2017-12-29Add more instance stats APIs (#6125)Eugen Rochko
* Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps