]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoMerge pull request #196 from glitch-soc/fix-imports
David Yip [Tue, 24 Oct 2017 04:34:43 +0000 (23:34 -0500)]
Merge pull request #196 from glitch-soc/fix-imports

Added app/javascript for imports

8 years agoAdded app/javascript for imports
kibigo! [Tue, 24 Oct 2017 03:22:48 +0000 (20:22 -0700)]
Added app/javascript for imports

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Mon, 23 Oct 2017 03:57:41 +0000 (22:57 -0500)]
Merge remote-tracking branch 'origin/master' into gs-master

8 years agoi18n: Update Polish Translation (#5494)
Marcin Mikołajczak [Sat, 21 Oct 2017 23:34:40 +0000 (01:34 +0200)]
i18n: Update Polish Translation (#5494)

8 years agoCompose buttons bar redesign + generalize dropdown (#194)
Ondřej Hruška [Sat, 21 Oct 2017 18:24:53 +0000 (20:24 +0200)]
Compose buttons bar redesign + generalize dropdown (#194)

* Generalize compose dropdown for re-use

* wip stuffs

* new tootbox look and removed old doodle button files

* use the house icon for ...

8 years agohide mentions of muted accounts (in home col) (#190)
beatrix [Fri, 20 Oct 2017 14:49:54 +0000 (10:49 -0400)]
hide mentions of muted accounts (in home col) (#190)

* hide mentions of muted accounts (in home col)

also cleans up some old crap

* add test

8 years agoMerge pull request #191 from glitch-soc/garglamel-yaml
beatrix [Thu, 19 Oct 2017 23:29:52 +0000 (19:29 -0400)]
Merge pull request #191 from glitch-soc/garglamel-yaml

ƔAML update

8 years agoUpdates to bio metadata script
kibigo! [Thu, 19 Oct 2017 23:11:53 +0000 (16:11 -0700)]
Updates to bio metadata script

8 years agoMerge pull request #189 from glitch-soc/scrollable-compose-area
beatrix [Thu, 19 Oct 2017 16:28:47 +0000 (12:28 -0400)]
Merge pull request #189 from glitch-soc/scrollable-compose-area

 Make the compose area optionally scrollable

8 years agoRemove unnecessary translateZ(0) when doing scale() (#5473)
Nolan Lawson [Thu, 19 Oct 2017 16:27:55 +0000 (09:27 -0700)]
Remove unnecessary translateZ(0) when doing scale() (#5473)

8 years agoMake the compose area optionally scrollable.
David Yip [Thu, 19 Oct 2017 15:59:50 +0000 (10:59 -0500)]
Make the compose area optionally scrollable.

On desktop, the compose text box grows to accommodate the content.  On
mobile, the text box does not grow to accommodate text context, but does
grow to accommodate images.  It is possible in both cases to overflow
the available area, which makes accessing other UI elements (e.g.
visibility setttings) difficult.

This commit makes the compose area optionally scrollable, which allows
those UI elements to remain available even if they go off-screen.

8 years agoremove-duplicated-jest-config (#5465)
masarakki [Thu, 19 Oct 2017 11:51:38 +0000 (20:51 +0900)]
remove-duplicated-jest-config (#5465)

8 years agoMerge pull request #185 from glitch-soc/fix-null-status
David Yip [Wed, 18 Oct 2017 22:01:31 +0000 (17:01 -0500)]
Merge pull request #185 from glitch-soc/fix-null-status

workaround for null status

8 years agoMerge pull request #188 from glitch-soc/merge-upstream-2-0-0
beatrix [Wed, 18 Oct 2017 21:57:42 +0000 (17:57 -0400)]
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0

Merge with upstream v2.0.0

8 years agoformatting fix for eslint
Ondřej Hruška [Wed, 18 Oct 2017 21:44:06 +0000 (23:44 +0200)]
formatting fix for eslint

8 years agoRemove unused filesAttached property.
David Yip [Wed, 18 Oct 2017 18:20:45 +0000 (13:20 -0500)]
Remove unused filesAttached property.

8 years agoUpdate stylesheet imports in glitch components.
David Yip [Wed, 18 Oct 2017 16:52:34 +0000 (11:52 -0500)]
Update stylesheet imports in glitch components.

Commit 6e5471947438fc5883e72b8184663564ffadee28 moved the Mastodon
variables and mixins deeper in the directory hierarchy; this commit
brings the glitch components in line with that change.

8 years agoMerge tag 'v2.0.0' into gs-master
David Yip [Wed, 18 Oct 2017 16:52:04 +0000 (11:52 -0500)]
Merge tag 'v2.0.0' into gs-master

8 years agoSuppress type error(not a function) on calling fastSeek (#5452)
Sho Kusano [Wed, 18 Oct 2017 15:13:51 +0000 (00:13 +0900)]
Suppress type error(not a function) on calling fastSeek (#5452)

8 years agoBump version to 2.0.0 🐘
Eugen Rochko [Wed, 18 Oct 2017 11:53:56 +0000 (13:53 +0200)]
Bump version to 2.0.0 🐘

8 years agoFix pt-BR translation strings related to advanced search. (#5449)
Renato "Lond" Cerqueira [Wed, 18 Oct 2017 11:53:17 +0000 (09:53 -0200)]
Fix pt-BR translation strings related to advanced search. (#5449)

8 years agoRevert #5438 for FR (#5450)
Technowix [Wed, 18 Oct 2017 11:51:30 +0000 (13:51 +0200)]
Revert #5438 for FR (#5450)

As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.

8 years agoSome typos and supplementation in sentence structures (#5441)
Håkan Eriksson [Wed, 18 Oct 2017 11:50:52 +0000 (13:50 +0200)]
Some typos and supplementation in sentence structures (#5441)

* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

* Swedish - Typos and supplementation in sentence structure

* Update simple_form.sv.yml

* Update sv.yml

* Update sv.yml

Rearranged the alphabetical order.

8 years agoRun `i18n-tasks checked-normalized` in Travis CI (#5443)
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:57:02 +0000 (18:57 +0900)]
Run `i18n-tasks checked-normalized` in Travis CI (#5443)

8 years agoEnable coverage for Jest (#5442)
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:39:36 +0000 (18:39 +0900)]
Enable coverage for Jest (#5442)

8 years agofr.json typo (realtive time) (#5447)
JohnD28 [Wed, 18 Oct 2017 07:47:14 +0000 (09:47 +0200)]
fr.json typo (realtive time) (#5447)

Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie

8 years agoBump version to 2.0.0rc4
Eugen Rochko [Tue, 17 Oct 2017 21:16:35 +0000 (23:16 +0200)]
Bump version to 2.0.0rc4

8 years agoDutch: A few strings I found last minute (#5440)
Jeroen [Tue, 17 Oct 2017 21:15:40 +0000 (23:15 +0200)]
Dutch: A few strings I found last minute (#5440)

* Dutch: A few strings I found last minute

* Update simple_form.nl.yml

8 years agoMake theme directory and Rename application.scss (#5336)
YaQ [Tue, 17 Oct 2017 20:20:07 +0000 (05:20 +0900)]
Make theme directory and Rename application.scss (#5336)

* Rename application.scss

* Move to 'default' directory

* Follow review

Move directory, and Rename "mastodon".

* Revert rename

* undo removal of newline

8 years agoWhen unreblog arrives over streaming API, just delete in UI (#5439)
Eugen Rochko [Tue, 17 Oct 2017 20:17:02 +0000 (22:17 +0200)]
When unreblog arrives over streaming API, just delete in UI (#5439)

8 years agoi18n better wording (OC/CA/FR) + string added in FR (#5438)
JeanGauthier [Tue, 17 Oct 2017 19:49:39 +0000 (21:49 +0200)]
i18n better wording (OC/CA/FR) + string added in FR (#5438)

* Update oc.json

* Update fr.json

* Update ca.json

* Update fr.json

* Update simple_form.fr.yml

* Update ca.json

* Update fr.json

* Update oc.json

* Update oc.json

* Update fr.json

8 years agoFix scrolling of dropdown when offscreen (#5434)
Nolan Lawson [Tue, 17 Oct 2017 18:38:16 +0000 (11:38 -0700)]
Fix scrolling of dropdown when offscreen (#5434)

8 years agoFix unwanted content warning gap in CSS (#5436)
Eugen Rochko [Tue, 17 Oct 2017 18:07:44 +0000 (20:07 +0200)]
Fix unwanted content warning gap in CSS (#5436)

Fix #5356

8 years agoWhen status is fetched instead of delivered, do not stream it (#5437)
Eugen Rochko [Tue, 17 Oct 2017 18:05:21 +0000 (20:05 +0200)]
When status is fetched instead of delivered, do not stream it (#5437)

8 years agoDon't capture scheme-less URLs in the status (#5435)
unarist [Tue, 17 Oct 2017 16:32:25 +0000 (01:32 +0900)]
Don't capture scheme-less URLs in the status (#5435)

Specifically, this fixes status length calculation to be same as JS side.

BTW, since this pattern used in not only preview card fetching, we
should extract it (with twitter-regex?) and write tests I think.

8 years agoi18n update (#5427) in OC/CA/FR/ES (#5431)
JeanGauthier [Tue, 17 Oct 2017 11:03:28 +0000 (13:03 +0200)]
i18n update (#5427) in OC/CA/FR/ES (#5431)

* Update oc.json

* Update ca.json

* Update fr.json

* Update es.json

8 years agoFix React warning about tabIndex on status with CW (#5432)
unarist [Tue, 17 Oct 2017 11:03:12 +0000 (20:03 +0900)]
Fix React warning about tabIndex on status with CW (#5432)

8 years agoUpdate German translation (#5425)
Jakob Kramer [Tue, 17 Oct 2017 10:02:47 +0000 (12:02 +0200)]
Update German translation (#5425)

8 years agoAdd Japanese translations (#5427)
Yamagishi Kazutoshi [Tue, 17 Oct 2017 09:47:05 +0000 (18:47 +0900)]
Add Japanese translations (#5427)

* yarn manage:translations

* Add Japanese translation for #5410

* Add Japanese translation for #5393

8 years agoNormalize locale files (#5429)
Yamagishi Kazutoshi [Tue, 17 Oct 2017 09:45:59 +0000 (18:45 +0900)]
Normalize locale files (#5429)

8 years agouse-DB_NAME-in-development (#5430)
masarakki [Tue, 17 Oct 2017 09:45:37 +0000 (18:45 +0900)]
use-DB_NAME-in-development (#5430)

8 years agoClean up reblog tracking keys, related improvements (#5428)
aschmitz [Tue, 17 Oct 2017 09:45:06 +0000 (04:45 -0500)]
Clean up reblog tracking keys, related improvements (#5428)

* Clean up reblog-tracking sets from FeedManager

Builds on #5419, with a few minor optimizations and cleanup of sets
after they are no longer needed.

* Update tests, fix multiply-reblogged case

Previously, we would have lost the fact that a given status was
reblogged if the displayed reblog of it was removed, now we don't.

Also added tests to make sure FeedManager#trim cleans up our reblog
tracking keys, fixed up FeedCleanupScheduler to use the right loop,
and fixed the test for it.

8 years agoSwedish translation (#5406)
Håkan Eriksson [Tue, 17 Oct 2017 04:41:36 +0000 (06:41 +0200)]
Swedish translation (#5406)

* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

8 years agoSmall update Dutch (nl) strings (#5424)
Jeroen [Mon, 16 Oct 2017 23:00:23 +0000 (01:00 +0200)]
Small update Dutch (nl) strings (#5424)

* Update Dutch strings

* Update Dutch

8 years agoFix dual toot button wrong behavior after compose re-design
Ondřej Hruška [Mon, 16 Oct 2017 21:32:13 +0000 (23:32 +0200)]
Fix dual toot button wrong behavior after compose re-design

8 years agoworkaround for null status
Ondřej Hruška [Mon, 16 Oct 2017 21:09:39 +0000 (23:09 +0200)]
workaround for null status

8 years agoMerge pull request #184 from tootsuite/master
beatrix [Mon, 16 Oct 2017 21:05:42 +0000 (17:05 -0400)]
Merge pull request #184 from tootsuite/master

Fix reduced motion breaking public galleries (#5423)

8 years agoMerge pull request #182 from glitch-soc/wide-tootbox-panel
David Yip [Mon, 16 Oct 2017 20:49:22 +0000 (15:49 -0500)]
Merge pull request #182 from glitch-soc/wide-tootbox-panel

Full-width tootbox panel to make room for buttons

8 years agoMerge pull request #181 from glitch-soc/upstream-merge-again
David Yip [Mon, 16 Oct 2017 20:46:12 +0000 (15:46 -0500)]
Merge pull request #181 from glitch-soc/upstream-merge-again

Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}

8 years agosatisfy eslint and jest
Ondřej Hruška [Mon, 16 Oct 2017 20:24:44 +0000 (22:24 +0200)]
satisfy eslint and jest

8 years agorem a comment
Ondřej Hruška [Mon, 16 Oct 2017 20:12:38 +0000 (22:12 +0200)]
rem a comment

8 years agodouble-decker tootbox
Ondřej Hruška [Mon, 16 Oct 2017 20:10:14 +0000 (22:10 +0200)]
double-decker tootbox

8 years agoMerge remote-tracking branch 'upstream/master' into upstream-merge-again
Ondřej Hruška [Mon, 16 Oct 2017 19:13:47 +0000 (21:13 +0200)]
Merge remote-tracking branch 'upstream/master' into upstream-merge-again

8 years agofix some lint errors
Ondřej Hruška [Mon, 16 Oct 2017 19:13:34 +0000 (21:13 +0200)]
fix some lint errors

8 years agoFix reduced motion breaking public galleries (#5423)
Nolan Lawson [Mon, 16 Oct 2017 19:08:01 +0000 (12:08 -0700)]
Fix reduced motion breaking public galleries (#5423)

8 years agoKeep references to all reblogs of a status on home feed (#5419)
Eugen Rochko [Mon, 16 Oct 2017 18:44:31 +0000 (20:44 +0200)]
Keep references to all reblogs of a status on home feed (#5419)

* Keep references to all reblogs of a status on home feed

When inserting reblog: Add to set of reblogs of this status on
the feed, if original status was present in the feed, add it to
that set as well.

When removing a reblog: Remove it from that set. Take random
remaining item from the set. If one exists, re-insert it into feed,
otherwise do not re-insert anything.

Fix #4210

* When original is removed, toss out reblog references

8 years agoFix typo in a db:rollback script (#5422)
Daigo 3 Dango [Mon, 16 Oct 2017 18:29:49 +0000 (08:29 -1000)]
Fix typo in a db:rollback script (#5422)

Reported at
https://don.inux39.me/@inux39/1406082
https://don.inux39.me/@inux39/1406134

8 years agoMerge remote-tracking branch 'upstream/master' into upstream-merge-again
David Yip [Mon, 16 Oct 2017 14:54:16 +0000 (09:54 -0500)]
Merge remote-tracking branch 'upstream/master' into upstream-merge-again

8 years agoBump version to 2.0.0rc3
Eugen Rochko [Mon, 16 Oct 2017 14:29:00 +0000 (16:29 +0200)]
Bump version to 2.0.0rc3

8 years agoMerge remote-tracking branch 'upstream/master' into gs-master
David Yip [Mon, 16 Oct 2017 14:27:01 +0000 (09:27 -0500)]
Merge remote-tracking branch 'upstream/master' into gs-master

8 years agoMerge remote-tracking branch 'upstream/master' into gs-master
David Yip [Mon, 16 Oct 2017 14:23:59 +0000 (09:23 -0500)]
Merge remote-tracking branch 'upstream/master' into gs-master

8 years agoEnsure that feed renegeration restores non-zero items (#5409)
Eugen Rochko [Mon, 16 Oct 2017 14:08:51 +0000 (16:08 +0200)]
Ensure that feed renegeration restores non-zero items (#5409)

Fix #5398

Ordering the home timeline query by account_id meant that the first
100 items belonged to a single account. There was also no reason to
reverse-iterate over the statuses. Assuming the user accesses the
feed halfway-through, it's better to have recent statuses already
available at the top. Therefore working from newer->older is ideal.

If the algorithm ends up filtering all items out during last-mile
filtering, repeat again a page further. The algorithm terminates
when either at least one item has been added, or if the database
query returns nothing (end of data reached)

8 years agoFilter out duplicate IDs in timelines reducer (#5417)
Eugen Rochko [Mon, 16 Oct 2017 13:59:30 +0000 (15:59 +0200)]
Filter out duplicate IDs in timelines reducer (#5417)

Possibly the cause of #5379, #5377

8 years agoFix un-reblogged status being at wrong position in the home timeline (#5418)
unarist [Mon, 16 Oct 2017 13:58:23 +0000 (22:58 +0900)]
Fix un-reblogged status being at wrong position in the home timeline (#5418)

We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed.

However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses.

So this reverts that change...reblogged status inserted at corresponding position to its id.

8 years agoAdd up-to-date korean translation on client (#5402)
voidSatisfaction [Mon, 16 Oct 2017 12:39:28 +0000 (21:39 +0900)]
Add up-to-date korean translation on client  (#5402)

* chore: add Korean translation for client

* fix: change unlisted and embed Korean words

8 years agoFix #5082 - disable retweet link for followers only toot (#5397)
KY [Mon, 16 Oct 2017 12:10:12 +0000 (20:10 +0800)]
Fix #5082 - disable retweet link for followers only toot (#5397)

* Fix #5082 - disable retweet link for followers only toot

* Hide reblog count when it is a direct message

8 years agoi18n: Update Polish translation (#5416)
Marcin Mikołajczak [Mon, 16 Oct 2017 12:09:51 +0000 (14:09 +0200)]
i18n: Update Polish translation (#5416)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoi18n ultim hour «More» dropdown title + reduce motion (#5415)
JeanGauthier [Mon, 16 Oct 2017 12:09:26 +0000 (14:09 +0200)]
i18n ultim hour «More» dropdown title + reduce motion (#5415)

* Correction fem. form

* More dropdown title

* More dropdown title

* More dropdown title

* Add option to reduce motion (#5393)

8 years agoEnable ESLint rules import/* (#5414)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 09:12:09 +0000 (18:12 +0900)]
Enable ESLint rules import/* (#5414)

* Enable ESLint rules import/*

* fix

8 years agoAdd option to reduce motion (#5393)
Nolan Lawson [Mon, 16 Oct 2017 07:36:15 +0000 (00:36 -0700)]
Add option to reduce motion (#5393)

* Add option to reduce motion

* Use HOC to wrap all Motion calls

* fix case-sensitive issue

* Avoid updating too frequently

* Get rid of unnecessary change to _simple_status.html.haml

8 years agoFix offline-plugin warning in dev mode (#5411)
Nolan Lawson [Mon, 16 Oct 2017 07:33:50 +0000 (00:33 -0700)]
Fix offline-plugin warning in dev mode (#5411)

8 years agoReplace JavaScript Testing Framework from Mocha to Jest (#5412)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 07:33:08 +0000 (16:33 +0900)]
Replace JavaScript Testing Framework from Mocha to Jest (#5412)

8 years agoi18n "More" dropdown title (#5410)
Nolan Lawson [Mon, 16 Oct 2017 07:31:47 +0000 (00:31 -0700)]
i18n "More" dropdown title (#5410)

8 years agoRefactor and simplify icon_button.js (#5413)
Nolan Lawson [Mon, 16 Oct 2017 07:30:09 +0000 (00:30 -0700)]
Refactor and simplify icon_button.js (#5413)

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Mon, 16 Oct 2017 06:29:02 +0000 (01:29 -0500)]
Merge remote-tracking branch 'origin/master' into gs-master

8 years agoMerge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
David Yip [Mon, 16 Oct 2017 05:49:05 +0000 (00:49 -0500)]
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification

Avatar unification, mk.II

8 years ago1.6 changed files for unified avatar styling -- updated to restore unity
Matthew Walsh [Sun, 18 Jun 2017 22:09:03 +0000 (15:09 -0700)]
1.6 changed files for unified avatar styling -- updated to restore unity

8 years agoMerge pull request #173 from glitch-soc/zerowidthmoji
David Yip [Mon, 16 Oct 2017 01:04:19 +0000 (20:04 -0500)]
Merge pull request #173 from glitch-soc/zerowidthmoji

use zerowidth spaces with emojis

8 years agoClear timer when unmounting RelativeTimestamp components (#5408)
Eugen Rochko [Mon, 16 Oct 2017 01:03:36 +0000 (03:03 +0200)]
Clear timer when unmounting RelativeTimestamp components (#5408)

Possibly the cause of #5379, #5377

8 years agoAdd up-to-date korean translation on serverside (#5400)
voidSatisfaction [Sun, 15 Oct 2017 21:08:30 +0000 (06:08 +0900)]
Add up-to-date korean translation on serverside (#5400)

* chore: add korean translation on ko.yml

* feat: add simple form korean translation up-to-date

8 years agol10n Occitan: finishing touches (#5404)
JeanGauthier [Sun, 15 Oct 2017 21:07:32 +0000 (23:07 +0200)]
l10n Occitan: finishing touches (#5404)

* Update oc.json

* Update oc.yml

8 years agoUpdate French translation (#5401)
Yannick A [Sun, 15 Oct 2017 12:21:05 +0000 (14:21 +0200)]
Update French translation (#5401)

8 years agoAdjust public hashtag pages (#5357)
Lynx Kotoura [Sat, 14 Oct 2017 12:48:12 +0000 (21:48 +0900)]
Adjust public hashtag pages (#5357)

8 years agoUse atomUri in Undo activity of Announce (#5376)
unarist [Sat, 14 Oct 2017 12:42:09 +0000 (21:42 +0900)]
Use atomUri in Undo activity of Announce (#5376)

This allows deletion of reblogs which delivered before with OStatus URI.

8 years agoreplace newlines in desktop notif with spaces instead of removing them (#5361)
Ondřej Hruška [Sat, 14 Oct 2017 12:41:12 +0000 (14:41 +0200)]
replace newlines in desktop notif with spaces instead of removing them (#5361)

8 years agoUpdated Catalan strings (#5323)
spla [Sat, 14 Oct 2017 12:40:35 +0000 (14:40 +0200)]
Updated Catalan strings (#5323)

* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings

8 years agoFix #5351 - Redirection with page params after copy emoji (#5387)
KY [Sat, 14 Oct 2017 12:40:10 +0000 (20:40 +0800)]
Fix #5351 - Redirection with page params after copy emoji (#5387)

* Fix #5351 - Redirection with page params after copy emoji

* Add page params to copy emoji link

8 years agoClose connection when succeeded posting (#5390)
abcang [Sat, 14 Oct 2017 12:38:57 +0000 (21:38 +0900)]
Close connection when succeeded posting (#5390)

* Close connection when succeeded posting

* Update webmock

8 years agoUpdate French translation (#5384)
Yannick A [Sat, 14 Oct 2017 12:30:19 +0000 (14:30 +0200)]
Update French translation (#5384)

Update French translation

8 years agol10n: update Persian translation for 2.0 (#5391)
Masoud Abkenar [Sat, 14 Oct 2017 12:28:19 +0000 (14:28 +0200)]
l10n: update Persian translation for 2.0 (#5391)

8 years agoDoodle improvements 2 (#176)
Ondřej Hruška [Sat, 14 Oct 2017 10:24:35 +0000 (12:24 +0200)]
Doodle improvements 2 (#176)

* Fix some doodle bugs and added Background color functionality

* added protections against accidental doodle erase, screen size changing

* resolve react warning about 'selected' on <option>

8 years agoUpdate German translation (#5389)
Jakob Kramer [Sat, 14 Oct 2017 10:00:23 +0000 (12:00 +0200)]
Update German translation (#5389)

8 years agoCorrect some misspellings (#5381)
Mathias B [Sat, 14 Oct 2017 01:34:59 +0000 (03:34 +0200)]
Correct some misspellings (#5381)

* Correct some misspellings

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'

8 years agoDoodle palette, options, fill tool (#172)
Ondřej Hruška [Fri, 13 Oct 2017 22:58:38 +0000 (00:58 +0200)]
Doodle palette, options, fill tool (#172)

8 years agouse zerowidth spaces for emojis
Ondřej Hruška [Fri, 13 Oct 2017 22:48:53 +0000 (00:48 +0200)]
use zerowidth spaces for emojis

8 years agoMerge pull request #168 from glitch-soc/doodles
David Yip [Fri, 13 Oct 2017 16:48:53 +0000 (11:48 -0500)]
Merge pull request #168 from glitch-soc/doodles

Initial doodle support

8 years agoFixed a bug where the canvas would get transparent bg upon erase
Ondřej Hruška [Fri, 13 Oct 2017 16:13:00 +0000 (18:13 +0200)]
Fixed a bug where the canvas would get transparent bg upon erase

8 years agoInitial doodle support
Ondřej Hruška [Fri, 13 Oct 2017 16:01:14 +0000 (18:01 +0200)]
Initial doodle support

8 years agoDutch strings: small change (#5375)
Jeroen [Fri, 13 Oct 2017 16:03:56 +0000 (18:03 +0200)]
Dutch strings: small change (#5375)

* Dutch strings: small change

* And this too.

8 years agoOptimize Status#permitted_for 500x (account timeline) (#5373)
unarist [Fri, 13 Oct 2017 14:53:44 +0000 (23:53 +0900)]
Optimize Status#permitted_for 500x (account timeline) (#5373)

The main change of this PR is removing `order by visibility` hack.

This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses.

I have also changed JOIN to IN + subquery, which slightly faster in most cases.

This page took 0.089678 seconds and 3 git commands to generate.