mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-30 23:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5014 commits 5 branches 147 tags 265 MiB
Commit graph

5014 commits

This branch
This branch
All branches
Author SHA1 Message Date
KY
f72936b4e6 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
 2017-10-16 14:10:12 +02:00
Marcin Mikołajczak
3c530d95f6 i18n: Update Polish translation (#5416) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-16 14:09:51 +02:00
JeanGauthier
1e7b3bf625 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)
 2017-10-16 14:09:26 +02:00
Yamagishi Kazutoshi
bf0ee1a25c Enable ESLint rules import/* (#5414) 
* Enable ESLint rules import/*

* fix
 2017-10-16 11:12:09 +02:00
Nolan Lawson
fa0be3f834 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
 2017-10-16 09:36:15 +02:00
Nolan Lawson
981e20b03a Fix offline-plugin warning in dev mode (#5411) 2017-10-16 09:33:50 +02:00
Yamagishi Kazutoshi
d5b767c374 Replace JavaScript Testing Framework from Mocha to Jest (#5412) 2017-10-16 09:33:08 +02:00
Nolan Lawson
93b54b8d4b i18n "More" dropdown title (#5410) 2017-10-16 09:31:47 +02:00
Nolan Lawson
e7ab9bf8b4 Refactor and simplify icon_button.js (#5413) 2017-10-16 09:30:09 +02:00
David Yip
6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master 2017-10-16 01:29:02 -05:00
David Yip
f72ad67a39 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification 
Avatar unification, mk.II
 2017-10-16 00:49:05 -05:00
Matthew Walsh
56094cb4bd 1.6 changed files for unified avatar styling -- updated to restore unity 2017-10-15 21:14:21 -07:00
David Yip
22df18e902 Merge pull request #173 from glitch-soc/zerowidthmoji 
use zerowidth spaces with emojis
 2017-10-15 20:04:19 -05:00
Eugen Rochko
894da3dcca Clear timer when unmounting RelativeTimestamp components (#5408) 
Possibly the cause of #5379, #5377
 2017-10-16 03:03:36 +02:00
voidSatisfaction
3e2f793948 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
 2017-10-15 23:08:30 +02:00
JeanGauthier
8eb7d30a6c l10n Occitan: finishing touches (#5404) 
* Update oc.json

* Update oc.yml
 2017-10-15 23:07:32 +02:00
Yannick A
7fe1428cc4 Update French translation (#5401) 2017-10-15 21:21:05 +09:00
Lynx Kotoura
b3b4b5a2eb Adjust public hashtag pages (#5357) 2017-10-14 14:48:12 +02:00
unarist
8125fdc19f Use atomUri in Undo activity of Announce (#5376) 
This allows deletion of reblogs which delivered before with OStatus URI.
 2017-10-14 14:42:09 +02:00
Ondřej Hruška
ae716a12e1 replace newlines in desktop notif with spaces instead of removing them (#5361) 2017-10-14 14:41:12 +02:00
spla
f63a40e7c2 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
 2017-10-14 14:40:35 +02:00
KY
1bdd694a0a 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
 2017-10-14 14:40:10 +02:00
abcang
2eab41cd1a Close connection when succeeded posting (#5390) 
* Close connection when succeeded posting

* Update webmock
 2017-10-14 14:38:57 +02:00
Yannick A
c6f76db2e1 Update French translation (#5384) 
Update French translation
 2017-10-14 14:30:19 +02:00
Masoud Abkenar
2c704ca9c6 l10n: update Persian translation for 2.0 (#5391) 2017-10-14 14:28:19 +02:00
Ondřej Hruška
cdc22d23b9 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>
 2017-10-14 12:24:35 +02:00
Jakob Kramer
eb96aa86a4 Update German translation (#5389) 2017-10-14 19:00:23 +09:00
Mathias B
c1a2707ecf Correct some misspellings (#5381) 
* Correct some misspellings 

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

* Forgot some shit

Buurps'
 2017-10-14 03:34:59 +02:00
Ondřej Hruška
531dadad86 Doodle palette, options, fill tool (#172) 2017-10-14 00:58:38 +02:00
Ondřej Hruška
723890b6fa
use zerowidth spaces for emojis 2017-10-14 00:48:53 +02:00
David Yip
daa04c39b6 Merge pull request #168 from glitch-soc/doodles 
Initial doodle support
 2017-10-13 11:48:53 -05:00
Ondřej Hruška
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase 2017-10-13 18:13:00 +02:00
Ondřej Hruška
33e806217f
Initial doodle support 2017-10-13 18:07:01 +02:00
Jeroen
c35132a738 Dutch strings: small change (#5375) 
* Dutch strings: small change

* And this too.
 2017-10-13 18:03:56 +02:00
unarist
a1c54220e8 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.
 2017-10-13 16:53:43 +02:00
Eugen Rochko
df7dbc41ae Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) 
This error occurred at least in development environment
 2017-10-13 16:44:43 +02:00
Eugen Rochko
b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368) 
- For some reason, :if option on before_action did not work. It got
  executed every time, returned false, and the action run anyway,
  which led to the current_sign_in_at and sign_in_count being
  updated on every request
- Return "do not filter" early in FeedManager#filter_from_home? if
  the status is authored by receiver. Usually this method is not
  called for own statuses at all, but it is called when Feed#get
  uses the database
- Return early if #reload_stale_associations! has nothing to load
  to save a database query with WHERE 1=0
 2017-10-13 16:44:29 +02:00
Eugen Rochko
48f7a58799 Do not try to guess why home timeline is empty in web UI (#5370) 
* Do not try to guess why home timeline is empty in web UI

* Fix style issue
 2017-10-13 16:44:16 +02:00
Eugen Rochko
388d093beb When unfollowing, remove from home in web UI immediately (#5369) 
Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true!
 2017-10-13 16:44:02 +02:00
ThibG
95fe20b78a Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372) 
Remote ActivityPub users that have never been known as OStatus users
(whether or not they support it) will not have a “remote_url” attribute
set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN,
the current check did rely on “remote_url” to verify the user's domain.
 2017-10-13 12:58:13 +02:00
Eugen Rochko
3283868e28 Improve spec of Feed and UserTrackingConcern (#5367) 2017-10-13 11:00:11 +02:00
Yamagishi Kazutoshi
dc91fd482a Set InstancePresenter to Auth::RegistrationsController#create (#5366) 2017-10-13 09:35:07 +02:00
Lex Alexander
b8bae96647 Retoot count increases without reason (#5363) 
* Retoot count increases without reason

-The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice.
-This calls it when the transaction is finished by using after_create_commit.
-Fixes #4916.

* Added test case for after_create_commit callback for checking reblog count.

* Rewrote test to keep original, but added one for only the after_create_commit callback.
 2017-10-13 02:52:09 +02:00
ThibG
d37305c628 Reduce discrepancies between server and client-side character count (#5360) 2017-10-12 23:26:34 +02:00
Anna e só
ad917cda10 l10n: PT-BR translation updated (#5362) 
* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed
 2017-10-13 06:16:43 +09:00
Jeroen
f398ad1994 Updating more Dutch strings for 2.0 (#5359) 2017-10-12 21:33:37 +02:00
Ondřej Hruška
df626fdd43
Fix the notification bug with newlines 2017-10-12 21:28:17 +02:00
David Yip
6a2b1ba91e Another tabs-vs-spaces fix, but with ~feeling~ 2017-10-12 09:36:26 -05:00
Alda Marteau-Hardi
3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350) 2017-10-12 16:31:14 +02:00
David Yip
fe1c20cfb9 Fix tabs-vs-spaces issue pointed out by eslint. 2017-10-12 09:23:06 -05:00