1781fcaea4
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
06e3d9bdd8
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
5c414eeb45
updated blocking translation
2017-04-05 14:53:35 +02:00
16d14e854b
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d49612327a
updated translation for about page
2017-04-05 14:47:42 +02:00
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
c33a8ce307
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
7ea7713997
udpdated display_name translation
2017-04-05 09:52:31 +02:00
b97a8236fb
updated reblog translation
2017-04-05 09:51:35 +02:00
d9f1e07c6c
Fix spec
2017-04-05 03:31:26 +02:00
05de364fbc
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
cc82f3adff
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
45c3772ddb
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
27b758f328
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
2f7da4167f
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
ba8744d0a7
Fix typos on french translations
2017-04-04 19:09:54 +02:00
6afd3a6eab
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
f28fcf9080
[ #817 ] Add email whitelist
...
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.
Fixes #817
2017-04-04 11:20:15 -04:00
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
c23ef9a706
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
ce9bb73e96
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
b8324b3aed
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
c1f52eaff1
Add Norwegian locale
2017-04-03 16:32:03 +02:00
e74a4efa20
another typo. fuck me
2017-04-03 14:56:13 +02:00
54db5aa06c
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
bed61b7cc4
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
aa77d63da9
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
1c84f62d6d
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
cbff9a2e15
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
5045c23636
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
7606beb4dd
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
38bf31d425
Improve french translation
2017-04-03 11:04:00 +02:00
7d5921dd5c
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
720922cd13
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
066b904205
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
b7554089cb
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
6162adec16
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
53e0834cf4
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
0335a52e28
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
2017-04-02 22:22:44 +02:00
00e99e58db
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
180edd4baa
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
9ba1d01fe4
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
cfc96a619c
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
ef1c4de714
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
b256d43b14
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
be9accbacc
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
244da78105
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
74fb333eb7
Fix up some localizations
2017-03-26 13:22:38 +02:00
58c9d97d07
🌐 add simplified chinese language
2017-03-26 14:13:18 +08:00
e4205b09d1
🚧 chinese translation WIP
2017-03-24 19:03:14 +08:00
017e3b7da8
🌐 add chinese language file
2017-03-24 18:53:41 +08:00
11f8faa6ba
🔧 S3 protocol from ENV
...
add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
2017-03-23 15:44:55 +08:00
b3cb765a94
Prettier account and stream entry URLs
2017-03-22 19:55:14 +01:00
3893f75a51
New API method: /api/v1/search
...
Returns accounts, statuses, hashtags arrays
2017-03-22 02:32:27 +01:00
8785e271bf
Improved landing page
2017-03-21 19:18:37 +01:00
47c74efa85
Add landing strip
2017-03-20 03:36:29 +01:00
b339e488fe
Export follow/block lists as CSV
2017-03-19 20:29:41 +01:00
a19062b726
Federate header images, fix open-uri http->https redirection error
2017-03-18 22:51:20 +01:00
5c7b222769
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
c97f817e40
Fix #525 - Add instance information API
2017-03-15 23:12:48 +01:00
6599b27b2b
Merge branch 'master' into mastodon-site-api
2017-03-15 22:55:22 +01:00
453d65e6da
Obfuscate filenames better, double rate limits
2017-03-14 15:59:21 +01:00
250beb1971
Revert earlier fix due to new bug reports
2017-03-06 02:25:41 +01:00
65b49d95b7
Make the paperclip filename interpolator smarter about the :original style
...
If an :original gets converted into another format, it would get saved as
original_filename *anyway*, so generating the extension is pointless and
yields bad results for when you change the style definition later. This way,
old gifs will still have correct URLs
2017-03-05 23:03:49 +01:00
c911ade272
Detect videos with no sound, handle them like gifv
2017-03-05 22:55:24 +01:00
d1e1f26878
Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
...
Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors
2017-03-05 17:27:17 +01:00
4b93cf88e5
Fix #431 - convert gif to webm during upload. Web UI treats them like it did
...
before. In the API, attachments now can be either image, video or gifv. Gifv
is to be treated like images in terms of behaviour, but are videos by file
type.
2017-03-04 23:02:24 +01:00
0cb5a2a0a7
Add digest e-mails
2017-03-04 00:00:48 +01:00
4554ccd5d0
Mute button progress so far. WIP, doesn't entirely work correctly.
2017-03-01 22:31:21 -06:00
b39356835b
Adds site metadata access to the API
2017-02-27 04:06:25 -08:00
a741049a77
Fix #104 - Style OAuth authorized applications page
...
Add ability to search accounts by display name
2017-02-27 00:15:00 +01:00
75d5dc1df8
Improve glow
2017-02-23 02:14:35 +01:00
7f9d6d0160
Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
...
Make replies default to privacy settings of the status being replied to
2017-02-17 01:30:24 +01:00
0613d66df8
Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report
2017-02-17 00:42:52 +01:00
6917e53fe0
Adding index overview for reports in admin UI
2017-02-16 02:28:10 +01:00
0fe2cc37ee
Expose Link headers via CORS
2017-02-15 23:26:17 +01:00
513a78d67b
Fix admin UI for accounts somewhat
2017-02-15 00:22:58 +01:00
2cc31b3194
Adding POST /api/v1/reports API, and a UI for submitting reports
2017-02-14 20:59:26 +01:00
a83dc927d8
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
03ce24d3bf
Update service timeout setting from 15s to 90s
2017-02-13 20:42:02 +01:00
f9f8f52fe9
Stop trying to shoehorn all Salmon updates into the poor database-connected
...
StreamEntry model. Simply render Salmon slaps as they are needed
2017-02-12 01:19:14 +01:00
32580cc661
Site title is now a setting
2017-02-10 22:37:11 +01:00
3f854bd75c
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
7037774d6e
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
b1f2683ecc
Add API modifiers to limit returned toots from public/hashtag timelines
...
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
db7affbf5b
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
2f126b1225
Removing failed push notification API, make context loads use cache
2017-02-05 17:51:44 +01:00
efa4065029
Preheat status cache
2017-02-05 17:24:18 +01:00
e02bfd0aa2
Remove unnecessary leftover code
2017-02-04 14:49:24 -08:00
b56d24ed71
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
9bd2b6be86
Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
...
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
727d236fcc
Cleaning up format of broadcast real-time messages, removing
...
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
1e89e8e74d
Looks like log level :debug is required for activerecord times to be tracked
2017-02-01 12:13:16 +01:00
8f9729ec2d
Fix activerecord logging in production
2017-02-01 11:34:50 +01:00
38b7551359
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
28e528bfcb
Add capistrano to development environment
2017-01-30 20:03:17 +01:00
9327d05bf7
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
c58da52e9f
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
557de8e24c
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
0bf8c1b5d8
Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled)
...
Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit
2017-01-27 20:35:16 +01:00
9b8670c939
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
8008b60324
Fix key names in statsd
2017-01-26 19:46:52 +01:00
fd23876e75
Improve StatsD instrumentation
2017-01-26 19:08:05 +01:00
4bd0286045
Fix up timeout, improve contrast on "show more", add responsive style
...
for extremely wide monitors
2017-01-26 18:48:56 +01:00
096ff9ba38
Removed accidental n+1 query from notifications, updated some deps,
...
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
72514a07b9
Add redirect for /admin => /admin/settings
2017-01-26 18:59:35 +11:00
959e064186
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
4d39cc7bf9
Add /api/v1/notifications/clear, non-existing link cards for statuses will
...
now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses
2017-01-23 21:09:27 +01:00
f80c55b591
Fix error
2017-01-22 23:07:31 +01:00
e161d2acdc
Override Rack::Request to use the same trusted proxy settings as Rails
2017-01-22 21:01:28 +01:00
ef376b0bfd
Allow to specify trusted proxies through env
2017-01-22 20:35:49 +01:00
7344c75a27
Fix code style
2017-01-21 22:19:13 +01:00
3916a753d2
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
2017-01-21 22:15:22 +01:00
f4836b9077
Method to fetch a single notification
2017-01-21 22:14:13 +01:00
432cc1d3c1
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
2017-01-21 20:22:49 +11:00
f748a91ec7
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
31d48af0d1
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
86264a950c
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
7865ce28e5
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
a898072d76
Add Heroku deployment support
2017-01-17 22:00:03 +11:00
3471b9acb1
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
2017-01-15 14:29:47 +01:00
5d88ef90c9
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
db40fd4641
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
2017-01-15 20:58:46 +11:00
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
7e7c2bbb0f
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
001a73c6fc
Fix env variable name
2017-01-10 22:01:13 +01:00
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
f29df16eea
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
438446b397
Add read timeout to paperclip when it's downloading remote images
2017-01-07 15:43:56 +01:00
b115602bb7
"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
335914abd9
Fix #385 - /web now loads a page
2017-01-04 15:35:36 +01:00
df2f14d2dd
Adding remote follow button
2017-01-01 19:54:34 +01:00
6a20c13009
Add API for retrieving favourites
2016-12-29 20:33:26 +01:00
2bc6e7c96e
Add API for retrieving blocked accounts
2016-12-29 20:12:32 +01:00
57f6f80838
Add ability to use remote follow function on other sites
2016-12-29 16:54:54 +01:00
fde1917a54
Add preferences for follow request notification e-mails
2016-12-26 22:04:16 +01:00
cef68b9b1c
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
6a54df90c8
Replacing follow requests in the settings area with in-UI column
2016-12-26 21:33:51 +01:00
ef9e827c54
Adding follow requests API
2016-12-26 19:30:45 +01:00
302051ffcb
Add page for authorizing/rejecting follow requests
2016-12-23 00:04:52 +01:00
6931b9bf32
Adjust wording
2016-12-22 23:24:46 +01:00
77cd58545d
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
238233440f
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
09a477c782
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
2016-12-22 21:34:19 +01:00
7855a9b58b
Don't use rack timeout in any but production environments
2016-12-21 19:10:40 +01:00
090e3a245d
Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
2016-12-21 00:13:13 +01:00
4bfaca1470
Merge pull request #356 from victorhck/master
...
added two missings spanish translations
2016-12-18 21:22:46 +01:00
346aae50b0
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
6d7f3be2f6
Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
2016-12-18 15:20:39 +01:00
9d4f96f440
Removing external hub completely, fix #333 fixing digit-only hashtags,
...
removing web app capability from non-webapp pages
2016-12-18 12:24:37 +01:00
b254629157
added to missings spanish translations
2016-12-14 18:43:00 +01:00
66e08d880c
Improved admin UI
2016-12-13 13:42:10 +01:00
7fb69d5153
Fix translations
2016-12-09 11:52:09 +01:00
fffd718696
Declare Ukrainian
...
Closes : #345
2016-12-08 18:57:58 +02:00
7a08597e6e
Fix some translation errors.
2016-12-07 21:13:57 +02:00
8266ff2d69
Final steps for Ukrainian translation
2016-12-07 20:39:22 +02:00
4a167885b2
Fix paperclip config
2016-12-07 17:19:29 +01:00
311f2354cf
Update Paperclip config to allow plugging in Minio instead of AWS
2016-12-07 16:59:18 +01:00
88218c83d5
Add suspend account functionality to admin UI
2016-12-06 18:22:59 +01:00
5522606989
Add single user mode
2016-12-06 17:19:26 +01:00
83cb3eecd2
Merge pull request #338 from stamak/uk.yml
...
Add Ukrainian localization file uk.yml
2016-12-05 12:30:07 +01:00
01623e2650
Add Ukrainian localization file uk.yml
...
Closes : #337
2016-12-05 07:40:45 +02:00
e5e702a976
Adding configurable e-mail blacklist
2016-12-04 19:07:02 +01:00
68586258ca
Adding more to admin accounts UI
2016-12-04 18:10:40 +01:00
f6b99b05d3
Do not use expiring links after all
2016-12-04 13:02:43 +01:00
595f592304
Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals
...
for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking)
2016-12-04 12:28:10 +01:00
e20d57a9e6
Fix cloudfront config
2016-12-03 22:12:22 +01:00
b245dc1575
Add Cloudfront support
2016-12-03 22:08:15 +01:00
5c6faa8cc4
Add Ukrainian localization file doorkeeper.uk.yml
...
Closes : #334
2016-12-03 09:46:26 +02:00
3966353feb
Fix line endings for Portuguese locale
2016-12-01 17:27:47 +00:00
8260628fc8
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
1028ee341b
Create pt localisation files in /config/locales/
2016-11-30 23:04:53 -01:00
a8814a19dc
Add basic OEmbed provider API, fix #247
2016-11-30 23:01:03 +01:00
8d4ef0b6c3
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
2016-11-30 21:34:59 +01:00
329b2a326d
Normalize localizations, add stub for admin/accounts
2016-11-30 15:32:26 +01:00
67db2cd871
Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars
2016-11-29 14:20:15 +01:00
3c1c2b0e06
Adding rack timeout of 30sec, PuSH jobs moved to push queue so they
...
can be processed separately
2016-11-29 02:07:14 +01:00
56b9edd476
Don't rate-limit PuSH endpoints
2016-11-29 00:44:11 +01:00
79075e1303
Fix URLs in inline-rendered XML
2016-11-29 00:26:01 +01:00
4d3cd93221
Fix URLs in ApplicationController.renderer
2016-11-28 21:21:05 +01:00
f37efe8e56
Add simple admin overview of PuSH subscriptions
2016-11-28 18:45:13 +01:00
ef93efbb5b
Enabling portuguese and hungarian translations, which are awfully incomplete
2016-11-28 13:55:03 +01:00
b5ad0eb4ea
Adding embedded PuSH server
2016-11-28 13:36:47 +01:00
313ebb4962
Merge pull request #275 from kodacs/master
...
Hungarian translation for Mastodon.
2016-11-26 18:33:48 +01:00
8b32b212de
Fix CDN_HOST variable requirement
2016-11-26 15:27:05 +01:00
de5764c372
Fix reset date format when rate limited
2016-11-25 18:20:47 +01:00
e737856f59
#275 fix missing i18n item
2016-11-25 14:56:28 +01:00
2774adc6fe
fixing yamls for #275
2016-11-25 13:57:37 +01:00
9849c564de
fix #275
2016-11-25 13:35:08 +01:00
Eugen