]>
cat aescling's git repositories - mastodon.git/log
kibigo! [Wed, 10 Jan 2018 00:26:14 +0000 (16:26 -0800)]
Renamed glitch async chunks
beatrix [Mon, 8 Jan 2018 18:08:11 +0000 (13:08 -0500)]
Merge pull request #308 from KnzkDev/fix/list-editor
Fix list editor design
ncls7615 [Mon, 8 Jan 2018 17:50:24 +0000 (02:50 +0900)]
fix list editor scss
David Yip [Mon, 8 Jan 2018 15:48:42 +0000 (09:48 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Mon, 8 Jan 2018 15:43:57 +0000 (09:43 -0600)]
When pulling out max_toot_chars, handle nulls
flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences. This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access. All values exported from that module must
therefore expect that case; previously, the max chars value didn't.
Addresses #306.
Jenkins [Mon, 8 Jan 2018 10:17:15 +0000 (10:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Eugen Rochko [Mon, 8 Jan 2018 09:57:52 +0000 (10:57 +0100)]
Revert #5772 (#6221)
Jenkins [Mon, 8 Jan 2018 04:17:11 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Eugen Rochko [Mon, 8 Jan 2018 04:00:23 +0000 (05:00 +0100)]
Fix bad URL schemes being accepted (#6219)
* Fix actors accepting invalid URI schemes or different host between URI and URL
* Fix statuses accepting invalid URI scheme or different host to actor
* Adjust tests to new requirements
* Improve readability of mismatching_origin?/invalid_origin? methods
Eugen Rochko [Mon, 8 Jan 2018 02:50:53 +0000 (03:50 +0100)]
Do not display elephant friend in single-column layout (#6222)
puckipedia [Sun, 7 Jan 2018 23:21:14 +0000 (00:21 +0100)]
Move Article from supported to converted types (#6218)
David Yip [Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Sun, 7 Jan 2018 19:30:17 +0000 (13:30 -0600)]
Use error pack when rendering error pages. Fixes #305.
Jenkins [Sun, 7 Jan 2018 15:17:13 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Yamagishi Kazutoshi [Sun, 7 Jan 2018 14:19:23 +0000 (23:19 +0900)]
Fix force_ssl conditional (#6201)
Yamagishi Kazutoshi [Sun, 7 Jan 2018 14:12:59 +0000 (23:12 +0900)]
Fix unintended cache (#6214)
SerCom_KC [Sun, 7 Jan 2018 08:32:50 +0000 (16:32 +0800)]
Update Simplified Chinese translations (#6215)
* i18n: (zh-CN) Add translations of #6125
* i18n: (zh-CN) Add translations of #6132
* i18n: (zh-CN) Add translations of #6099
* i18n: (zh-CN) Add translations of #6071
* i18n: (zh-CN) Improve translations
David Yip [Sun, 7 Jan 2018 06:32:24 +0000 (00:32 -0600)]
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
Yamagishi Kazutoshi [Sun, 7 Jan 2018 05:53:27 +0000 (14:53 +0900)]
Fix unintended cache
Jenkins [Sun, 7 Jan 2018 02:17:10 +0000 (02:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jeong Arm [Sun, 7 Jan 2018 02:13:42 +0000 (11:13 +0900)]
Translate Korean (#6212)
kibigo! [Sat, 6 Jan 2018 23:34:01 +0000 (15:34 -0800)]
Fixes to search dropdown
beatrix [Sat, 6 Jan 2018 21:49:53 +0000 (16:49 -0500)]
fix typo in vanilla names.yml
Ondřej Hruška [Sat, 6 Jan 2018 18:58:04 +0000 (19:58 +0100)]
fixed ctrl enter
Ondřej Hruška [Sat, 6 Jan 2018 18:55:53 +0000 (19:55 +0100)]
Fix the always-threaded bug
beatrix-bitrot [Sat, 6 Jan 2018 18:49:03 +0000 (18:49 +0000)]
tighten csp
beatrix [Sat, 6 Jan 2018 17:06:17 +0000 (12:06 -0500)]
Merge pull request #303 from KnzkDev/ja-for-thread-mode
Update ja.js for #296
ncls7615 [Sat, 6 Jan 2018 16:51:49 +0000 (01:51 +0900)]
Update ja.js
beatrix [Sat, 6 Jan 2018 16:28:36 +0000 (11:28 -0500)]
Merge pull request #296 from glitch-soc/thread-mode
Threaded mode~
beatrix [Sat, 6 Jan 2018 16:25:59 +0000 (11:25 -0500)]
Merge pull request #302 from KnzkDev/fix/search-popout
Fix search popout
beatrix [Sat, 6 Jan 2018 15:30:49 +0000 (10:30 -0500)]
appease eslint
ncls7615 [Sat, 6 Jan 2018 12:50:11 +0000 (21:50 +0900)]
Fix search popout
David Yip [Sat, 6 Jan 2018 09:01:11 +0000 (03:01 -0600)]
Read max_toot_chars from root object. Fixes #297.
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
kibigo! [Sat, 6 Jan 2018 05:40:02 +0000 (21:40 -0800)]
my global .gitignore excluded this file ;_;
kibigo! [Sat, 6 Jan 2018 02:23:06 +0000 (18:23 -0800)]
Threaded mode~
kibigo! [Sat, 6 Jan 2018 05:02:53 +0000 (21:02 -0800)]
Fixed improper dropdown func binding for #293 + toot button spacing
kibigo! [Sat, 6 Jan 2018 04:04:13 +0000 (20:04 -0800)]
Styling and autosuggest fixes for #293
kibigo! [Sat, 6 Jan 2018 02:30:06 +0000 (18:30 -0800)]
Fixes composer mounting issue with #293
David Yip [Fri, 5 Jan 2018 23:31:56 +0000 (17:31 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
beatrix [Fri, 5 Jan 2018 23:29:57 +0000 (18:29 -0500)]
Merge pull request #290 from chriswmartin/web-push-updates
Web push updates
beatrix [Fri, 5 Jan 2018 23:29:40 +0000 (18:29 -0500)]
Merge pull request #295 from chriswmartin/getting-started-key-fix
unique ColumnLink keys in getting_started
beatrix [Fri, 5 Jan 2018 23:29:08 +0000 (18:29 -0500)]
Merge pull request #293 from glitch-soc/compose-refactor
Compose refactor
Jenkins [Fri, 5 Jan 2018 22:17:12 +0000 (22:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
ThibG [Fri, 5 Jan 2018 22:04:35 +0000 (23:04 +0100)]
Fix PuSH workers (#6200)
ThibG [Fri, 5 Jan 2018 21:42:50 +0000 (22:42 +0100)]
When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)
TheKinrar [Fri, 5 Jan 2018 21:38:33 +0000 (22:38 +0100)]
Represent numbers by strings in instance activity API (#6198)
Fixes #6197.
Naoki Kosaka [Fri, 5 Jan 2018 19:04:22 +0000 (04:04 +0900)]
Fix enforce HTTPS in production. (#6180)
beatrix [Fri, 5 Jan 2018 17:36:53 +0000 (12:36 -0500)]
Merge pull request #243 from m4sk1n/glitch-pl
i18n: 🇵🇱
cwm [Fri, 5 Jan 2018 15:00:48 +0000 (09:00 -0600)]
add key to lists div
cwm [Fri, 5 Jan 2018 14:12:34 +0000 (08:12 -0600)]
change how list ColumnLink keys are determined
Quenty31 [Fri, 5 Jan 2018 09:59:43 +0000 (10:59 +0100)]
l10n Occitan language: mailer update (#6193)
* Create email_changed.oc.html.erb
* Create email_changed.oc.text.erb
* Update email_changed.oc.html.erb
* Update email_changed.oc.html.erb
* Create reconfirmation_instructions.oc.html.erb
* Create reconfirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.text.erb
* Update reconfirmation_instructions.oc.html.erb
kibigo! [Fri, 5 Jan 2018 05:17:30 +0000 (21:17 -0800)]
WIP <Compose> Refactor; Fin~
Eugen Rochko [Fri, 5 Jan 2018 03:52:06 +0000 (04:52 +0100)]
Bump version to 2.1.2
Yamagishi Kazutoshi [Fri, 5 Jan 2018 03:43:50 +0000 (12:43 +0900)]
Fix RFC 5646 Regular Expression (#6190)
kibigo! [Wed, 3 Jan 2018 20:36:21 +0000 (12:36 -0800)]
WIP <Compose> Refactor; 1000 tiny edits
kibigo! [Sat, 30 Dec 2017 00:32:13 +0000 (16:32 -0800)]
WIP <Compose> Refactor; <ActionsModal>; dropdowns
kibigo! [Fri, 29 Dec 2017 22:55:06 +0000 (14:55 -0800)]
WIP <Compose> Refactor; SCSS ed.
kibigo! [Wed, 27 Dec 2017 22:28:41 +0000 (14:28 -0800)]
WIP <Compose> Refactor; <OnboardingModal> ed.
kibigo! [Wed, 27 Dec 2017 00:54:28 +0000 (16:54 -0800)]
WIP <Compose> Refactor; <Drawer> ed.
kibigo! [Sun, 24 Dec 2017 06:16:45 +0000 (22:16 -0800)]
WIPgit status <Compose> Refactor; <Composer> ed.
Jenkins [Thu, 4 Jan 2018 23:17:11 +0000 (23:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Branko Kokanovic [Thu, 4 Jan 2018 23:16:06 +0000 (23:16 +0000)]
Small translation fixes for Serbian (and sr@Latn too) (#6188)
Patrick Figel [Thu, 4 Jan 2018 23:15:35 +0000 (00:15 +0100)]
Fix email confirmation link not updating email (#6187)
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.
Lynx Kotoura [Thu, 4 Jan 2018 18:38:46 +0000 (03:38 +0900)]
Fix overflowing audit logs (#6184)
unarist [Thu, 4 Jan 2018 18:38:29 +0000 (03:38 +0900)]
Use disable_ddl_transaction! to prevent warnings on migration (#6183)
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.
Eugen Rochko [Thu, 4 Jan 2018 15:40:26 +0000 (16:40 +0100)]
Bump version to 2.1.1 (#6164)
Yamagishi Kazutoshi [Thu, 4 Jan 2018 14:36:55 +0000 (23:36 +0900)]
Fallback default thumbnail in instance status API (#6177)
Marcin Mikołajczak [Thu, 4 Jan 2018 14:15:29 +0000 (15:15 +0100)]
i18n: Update Polish translation (#6176)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Marcin Mikołajczak [Thu, 4 Jan 2018 13:42:58 +0000 (14:42 +0100)]
i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Eugen Rochko [Thu, 4 Jan 2018 13:40:49 +0000 (14:40 +0100)]
Send one Delete of Actor in ActivityPub when account is suspended (#6172)
ThibG [Thu, 4 Jan 2018 13:39:38 +0000 (14:39 +0100)]
Make sure private toots remain private and do not end up in HTTP caches (#6175)
muan [Thu, 4 Jan 2018 04:00:50 +0000 (12:00 +0800)]
Improve Traditional Chinese translation (#6166)
* Improve Traditional Chinese translations
* Sort alphabetically
Eugen Rochko [Thu, 4 Jan 2018 03:56:04 +0000 (04:56 +0100)]
Fix FetchAtomService not finding alternatives if there's a Link header (#6170)
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
Akihiko Odaki [Thu, 4 Jan 2018 01:56:54 +0000 (10:56 +0900)]
Rearrange items in Getting Started navigation (#6126)
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.
Eugen Rochko [Thu, 4 Jan 2018 01:56:23 +0000 (02:56 +0100)]
Fix nil error in log_target_from_history helper (#6173)
Eugen Rochko [Thu, 4 Jan 2018 01:56:00 +0000 (02:56 +0100)]
Fix OpenSSL dependency in ostatus2 (#6174)
Eugen Rochko [Thu, 4 Jan 2018 00:21:38 +0000 (01:21 +0100)]
Cache JSON of immutable ActivityPub representations (#6171)
Jenkins [Wed, 3 Jan 2018 20:17:13 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Quenty31 [Wed, 3 Jan 2018 20:05:54 +0000 (21:05 +0100)]
l10n OC language (#6169)
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
ThibG [Wed, 3 Jan 2018 19:51:33 +0000 (20:51 +0100)]
Don't normalize URLs in toots (#6134)
* 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
Akihiko Odaki [Wed, 3 Jan 2018 17:08:57 +0000 (02:08 +0900)]
Allow to dereference Follow object for ActivityPub (#5772)
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
Marcin Mikołajczak [Wed, 3 Jan 2018 13:45:24 +0000 (14:45 +0100)]
i18n: Update Polish translation (#6168)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Yamagishi Kazutoshi [Wed, 3 Jan 2018 12:00:39 +0000 (21:00 +0900)]
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#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
Jenkins [Wed, 3 Jan 2018 04:17:11 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
ThibG [Wed, 3 Jan 2018 03:57:57 +0000 (04:57 +0100)]
Allow HTTP caching of json view of public statuses (#6115)
* 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
Akihiko Odaki [Wed, 3 Jan 2018 03:39:14 +0000 (12:39 +0900)]
Set background to the navigation of Getting Started column (#6163)
The background of the navigation matters because its scrollbar is
transparent.
puckipedia [Wed, 3 Jan 2018 02:54:08 +0000 (03:54 +0100)]
[!] Sanitize incoming classlist properly (#6162)
* Sanitize classlist properly
* Actually properly sanitize every class after the first
* Improve Formatter spec to check for multiple classes and non-space whitespace
Eugen Rochko [Tue, 2 Jan 2018 23:38:20 +0000 (00:38 +0100)]
Update moved-to property when it's removed too (#6160)
* Fix #6140 - Update moved-to property when it's removed too
* Remove trailing whitespace
Eugen Rochko [Tue, 2 Jan 2018 23:38:02 +0000 (00:38 +0100)]
Don't leave behind husk of remotely-deleted profile (#6159)
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.
Noiob [Tue, 2 Jan 2018 18:35:24 +0000 (19:35 +0100)]
Fix newlines-to-spaces functionality (#6158)
yay for regexes, amirite
Patrick Figel [Tue, 2 Jan 2018 15:55:00 +0000 (16:55 +0100)]
Add confirmation step for email changes (#6071)
* 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
ThibG [Tue, 2 Jan 2018 13:24:52 +0000 (14:24 +0100)]
Display a warning when composing unlisted toots with something looking like a hashtag (#6132)
Eugen Rochko [Tue, 2 Jan 2018 13:02:53 +0000 (14:02 +0100)]
Fix stats expiring too quickly because of variable mistake (#6155)
Akihiko Odaki [Tue, 2 Jan 2018 12:50:54 +0000 (21:50 +0900)]
Rename key to path in actions and reducers for settings (#6105)
Otakan [Tue, 2 Jan 2018 12:38:12 +0000 (21:38 +0900)]
delete X-UA-Compatible (#6068)
* delete X-UA-Compatible
* undo
* restore
Branko Kokanovic [Tue, 2 Jan 2018 11:39:12 +0000 (11:39 +0000)]
Adding Serbian latin translations (#6146)
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
David Yip [Tue, 2 Jan 2018 06:26:44 +0000 (00:26 -0600)]
More ../ -> ~.
David Yip [Tue, 2 Jan 2018 06:11:41 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
Akihiko Odaki [Tue, 2 Jan 2018 04:28:49 +0000 (13:28 +0900)]
Use const instead of let for constant (#6106)
Akihiko Odaki [Tue, 2 Jan 2018 04:07:56 +0000 (13:07 +0900)]
Show mastodon on modal (#6129)