1
0
mirror of https://github.com/mastodon/mastodon synced 2024-11-24 15:16:19 +09:00
mastodon/app
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
..
controllers Fix #5351 - Redirection with page params after copy emoji (#5387) 2017-10-14 14:40:10 +02:00
helpers Add moderation note (#5240) 2017-10-07 20:26:43 +02:00
javascript Updated Catalan strings (#5323) 2017-10-14 14:40:35 +02:00
lib Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) 2017-10-13 16:44:43 +02:00
mailers Supply @instance variable in password reset instructions / password change mailer (#5215) 2017-10-04 13:25:24 +02:00
models Optimize Status#permitted_for 500x (account timeline) (#5373) 2017-10-13 16:53:43 +02:00
policies Add status destroy authorization to policy (#3453) 2017-05-30 22:56:31 +02:00
presenters Compact status_ids in StatusRelationshipsPresenter (#5073) 2017-09-24 11:18:32 +02:00
serializers Fix #5178 - Use object URI only in Announce, instead of embedding (#5266) 2017-10-08 14:41:59 +02:00
services Close connection when succeeded posting (#5390) 2017-10-14 14:38:57 +02:00
validators Implement EmailBlackList (#5109) 2017-10-04 15:16:10 +02:00
views Fix #5351 - Redirection with page params after copy emoji (#5387) 2017-10-14 14:40:10 +02:00
workers Close connection when succeeded posting (#5390) 2017-10-14 14:38:57 +02:00