about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-03-02Update omniauth-saml to 1.10 (#6587)Patrick Figel
Fixes CVE-2017-11428
2018-03-02i18n: Update Japanese translations (#6581)mayaeh
* yarn manage:translations * Update Japanese translations.
2018-03-01Fixes #6584 (#6585)Thomas Leister
2018-03-01Bump version to 2.3.0rc1Eugen Rochko
2018-03-01Add contact_account and languages to instance API (#6574)Eugen Rochko
2018-03-01i18n: Update Polish translation (#6578)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-01Add only_media param to public and hashtag timelines API (#6576)Eugen Rochko
2018-03-01Add "Toots/Toots with replies/Media" tab below profile header (#6572)Eugen Rochko
* Add "Toots/Toots with replies/Media" tab below profile header * Add focal point display to account gallery timeline * Fix visual glitch of standalone GIFV
2018-03-01Fix margin on top action button, fix width of counters on frontpage (#6573)Eugen Rochko
2018-03-01Ensure that boolean params in the API are parsed for truthiness (#6575)Eugen Rochko
Use Rails smart boolean cast to account for values such as "f", "0", "false", etc. Previously, if a param was present in the request, it would count as true.
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
2018-02-28Fix #5708: Reject->Follow will remove the follow if it exists (#6571)Eugen Rochko
2018-02-28Federated reports (#6570)Eugen Rochko
* Fix #2176: Federated reports * UI for federated reports * Add spec for ActivityPub Flag handler * Add spec for ReportService
2018-02-27remove Uglifier call from production.rb (#6568)beatrix
2018-02-27Specify AGPLv3+ (#6546)TrashMacNugget
* Specify AGPLv3+ Since the documentation doesn't specify you can use Mastodon as AGPLv3 or any later version. * Use newest version of SPDX AGPLv3+ identifier
2018-02-26Some images can cause `convert` to fail, which crashes this whole task (#6565)Paul Woolcock
* Some images can cause `convert` to fail, which crashes this whole task * Add more specific exception
2018-02-26Merge pull request #372 from KnzkDev/fix/ja-translationDavid Yip
Add missing Japanese translate
2018-02-26Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-02-26Grid layout for tag pages (#6545)Lynx Kotoura
* Use grid layout for the landing page * Use grid layout for tag pages * Set 2 columns width as explicit percentage for tag pages
2018-02-26Add Liberapay link to README.md (#6563)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-26remove-uglifier (#6561)masarakki
2018-02-26Better grid layout for the landing page (#6543)Lynx Kotoura
* Use grid layout for the landing page * Fix column settings Set the ratio explicitly * Improve information board
2018-02-26Improve public account cards (#6559)Eugen Rochko
- Add follow/unfollow/remote follow buttons - Format the bio properly - Always show username@domain, even for local accounts
2018-02-26i18n normalize dataimncls
2018-02-26Fix prev/next links on public profile page (#6497)Ian McCowan
* Fix prev/next links on public profile page * Don't make pagination urls if no available statuses * Fix empty check method * Put left chevron before prev page link * Add scope for pagination "starting at" a given id * Status pagination try 2: s/prev/older and s/next/newer "older" on left, "newer" on right Use new scope for "newer" link Extract magic 20 page size to constant Remove max_id from feed pagination as it's not respected * Reinstate max_id for accounts atom stream * normalize
2018-02-26Add missing Japanese translateimncls
2018-02-26Ensure the app does not even start if OTP_SECRET is not set (#6557)Eugen Rochko
* Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them
2018-02-26Fix #6536 (#6558)Eugen Rochko
2018-02-25Merge pull request #370 from KnzkDev/fix/border-radiusDavid Yip
Fix border-radius of owner avatar in /about/more
2018-02-25Fix border-radius of owner avatar in /about/moreyuzulabo
2018-02-24Raise Mastodon::HostValidationError when host for HTTP request is private ↵Akihiko Odaki
(#6410)
2018-02-24Do not use function name to track components (#6542)Akihiko Odaki
UglifyJS2 is allowed to mangle function names, and function names can also be duplicate if they are from different scopes. Therefore function names are not reliable as identifiers. Functions as keys for Map object is a cheaper and more reliable alternative.
2018-02-25i18n: Update Japanese translations (#6550)mayaeh
* Update Japanese translations. * Add quotation marks.
2018-02-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-24Do not push status to feed if its reblog is already inserted (#6488)Akihiko Odaki
A complemental change for precompute_feed_service_spec.rb also fixes its random failure which is caused by the Snowlake randomization of the order of an original status and its reblog.
2018-02-23Merge pull request #369 from KnzkDev/merge-upstreamDavid Yip
Merge with upstream @ e668180044560e28bdc5eef94744c210013efcda
2018-02-24Update SCSSimncls
2018-02-24Update columns.scssimncls
2018-02-24Update containers.scssimncls
2018-02-24Update index.scssimncls
2018-02-24Fix data export page errorimncls
2018-02-24Update about.scssimncls
2018-02-23Use absolute URL for focus reticleimncls
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
2018-02-23New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML ↵Ghislain Loaec
strategies) (#6540)
2018-02-22Update pam documentation (#6518)Alexander
* document pam email extraction * remove superfluous newline
2018-02-22i18n: Update Polish translation (#6539)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-22New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)Ghislain Loaec
2018-02-22Fix nil error in focal_point? (#6537)Eugen Rochko
2018-02-22Fix container regression (#6531)Eugen Rochko
* Update public.html.haml * Update auth.html.haml * Update modal.html.haml