Commit Graph

77 Commits

Author SHA1 Message Date
999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
2017-01-25 01:29:16 +01:00
e9737c2235 Fix tests, add applications to eager loading/cache for statuses, fix
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15 14:01:33 +01:00
e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages 2017-01-15 11:03:35 +11:00
c01dd089ff Adding about/more page with extended information that can be set up by an admin 2017-01-13 20:16:38 +01:00
75f80bef10 Persist UI settings, add missing localizations for German 2017-01-09 14:00:55 +01:00
bb033c1d37 "Reblog" -> "boost" in more places
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
2017-01-04 18:00:50 -08:00
8f47f6a7ec Adding remote follow button 2017-01-01 19:54:34 +01:00
d7dc84439c Add ability to use remote follow function on other sites 2016-12-29 16:54:54 +01:00
eca6110fc4 Add preferences for follow request notification e-mails 2016-12-26 22:04:16 +01:00
2146ac91a0 Follow requests send e-mail notifications, but are excluded from notifications API
Better initial state for unlisted/nsfw toggles
2016-12-26 21:52:03 +01:00
3689c119f0 Replacing follow requests in the settings area with in-UI column 2016-12-26 21:33:51 +01:00
b302b9202b Add page for authorizing/rejecting follow requests 2016-12-23 00:04:52 +01:00
3c841c7306 Adjust wording 2016-12-22 23:24:46 +01:00
05b13c38b5 Re-enable Webfinger for locked accounts but don't handle "follow" events
coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
2016-12-22 23:17:57 +01:00
b891a81008 Follow call on locked account creates follow request instead
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
2016-12-22 23:03:57 +01:00
e09d3a2c66 Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen 2016-12-21 00:13:13 +01:00
6b67b55cee Merge pull request #356 from victorhck/master
added two missings spanish  translations
2016-12-18 21:22:46 +01:00
5ae1b39ec9 Adjusting public display of statuses to look similar to logged-in UI,
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
2016-12-18 19:47:11 +01:00
f5c8d64b6d added to missings spanish translations 2016-12-14 18:43:00 +01:00
0c491ea928 Fix translations 2016-12-09 11:52:09 +01:00
2c6c912076 Fix some translation errors. 2016-12-07 21:13:57 +02:00
d85c566960 Final steps for Ukrainian translation 2016-12-07 20:39:22 +02:00
a910cdd54d Merge pull request #338 from stamak/uk.yml
Add Ukrainian localization file uk.yml
2016-12-05 12:30:07 +01:00
0e18bbe3e2 Add Ukrainian localization file uk.yml
Closes: #337
2016-12-05 07:40:45 +02:00
b362de2232 Adding configurable e-mail blacklist 2016-12-04 19:07:02 +01:00
ea91286aaa Add Ukrainian localization file doorkeeper.uk.yml
Closes: #334
2016-12-03 09:46:26 +02:00
1c1102008f Fix line endings for Portuguese locale 2016-12-01 17:27:47 +00:00
1d0321fc45 Fix pt translations, improve pre-cache queries, removing will_paginate
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
2016-12-01 16:26:25 +01:00
66e55d60e1 Create pt localisation files in /config/locales/ 2016-11-30 23:04:53 -01:00
14bd46946d Per-status control for unlisted mode, also federation for unlisted mode
Fix #233, fix #268
2016-11-30 21:34:59 +01:00
356d3874eb Normalize localizations, add stub for admin/accounts 2016-11-30 15:32:26 +01:00
26287b6e7d Merge pull request #275 from kodacs/master
Hungarian translation for Mastodon.
2016-11-26 18:33:48 +01:00
7bd559158b fixing yamls for #275 2016-11-25 13:57:37 +01:00
6586408c69 fix #275 2016-11-25 13:35:08 +01:00
959e4b8198 Merge branch 'master' into french-translation 2016-11-25 13:33:00 +01:00
9bb885805c Update simple_form.fr.yml 2016-11-25 13:30:52 +01:00
1ff0d5aea6 Normalized locale files 2016-11-25 13:15:07 +01:00
1c9e21a507 Merge pull request #273 from nclm/french-translation
French localisation update
2016-11-25 13:14:30 +01:00
71401659b8 Fix #65 - Options to block notifications from people you don't follow/who don't follow you 2016-11-25 13:13:16 +01:00
eb3a12bba6 Server side HU translation + Toot fix. 2016-11-25 12:43:23 +01:00
d0122045f4 Update simple_form.fr.yml 2016-11-25 09:25:31 +01:00
4cc6684881 Update fr.yml 2016-11-25 09:25:29 +01:00
1e95fbb10b Update doorkeeper.fr.yml
e
2016-11-23 14:47:41 +01:00
94f96a6e85 Update doorkeeper.fr.yml 2016-11-23 14:45:31 +01:00
4a422650bb Fix broken locales 2016-11-22 11:34:36 +01:00
82cb34916a Update fr.yml 2016-11-22 10:39:15 +01:00
ba4c03de71 Update simple_form.fr.yml
silenced mode + edits
2016-11-22 10:32:43 +01:00
89dab7c534 Merging code updates (Unlisted Mode) 2016-11-22 10:25:17 +01:00
1788164352 Local accounts can control "silenced" attribute which removes them from public timeline 2016-11-21 23:06:41 +01:00
46d9076e99 Importing doorkeeper.fr.yml
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
2016-11-21 22:39:20 +01:00