fef478781d
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
ad5ddd5e95
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
e3a3422a65
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
bf7cefa516
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
29ffe1cad3
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
837030db98
updated blocking translation
2017-04-05 14:53:35 +02:00
deb001bba8
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d3bf0307db
updated translation for about page
2017-04-05 14:47:42 +02:00
20b53e6add
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
3ec221d3b7
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
473e4f7813
udpdated display_name translation
2017-04-05 09:52:31 +02:00
b845ef395d
updated reblog translation
2017-04-05 09:51:35 +02:00
667ffafef8
Fix spec
2017-04-05 03:31:26 +02:00
086a88f3bb
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
e76dd52b08
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
c12214963e
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
aa8dacbc8a
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
ce524cbb49
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
117b22e905
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
57466d542b
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
350958babf
Fix typos on french translations
2017-04-04 19:09:54 +02:00
9a5d6e9715
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
e9a6da6bc7
[ #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
5f54981846
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
db4a41cf58
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
dc89fc17cc
updated translation
2017-04-04 08:29:53 +02:00
ce1ca28594
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
0700521ef3
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
98a93aa07e
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
ec8029a955
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
7dd5ba42a3
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
b7c1b12367
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
5cb011b66b
Add Norwegian locale
2017-04-03 16:32:03 +02:00
65d667dc6c
another typo. fuck me
2017-04-03 14:56:13 +02:00
d3fde60297
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
85a8b62ca2
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
97803600ed
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
bfa99981e5
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
6501ffdadc
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
b0f4c9b91f
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
f9b4f30de6
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
87854745e9
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
c97fc5c1f4
Improve french translation
2017-04-03 11:04:00 +02:00
fbcba65f81
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
61894582b8
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
71cf9d0608
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
5e45982ed9
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
b829460b4a
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
65e6a00817
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
48cb2dccd2
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
2017-04-02 22:22:44 +02:00
5b12624847
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
cb1989cbd8
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
03d676faa8
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
9e26af264e
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
f9f6098e22
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
2c881e6717
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
5e26295e06
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
e8875c6046
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
f864fee116
Fix up some localizations
2017-03-26 13:22:38 +02:00
d5d5afff9c
🌐 add simplified chinese language
2017-03-26 14:13:18 +08:00
fc9bbdfd34
🚧 chinese translation WIP
2017-03-24 19:03:14 +08:00
349c6cfa2b
🌐 add chinese language file
2017-03-24 18:53:41 +08:00
c46843c65c
🔧 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
d6ed2eb512
Prettier account and stream entry URLs
2017-03-22 19:55:14 +01:00
05cf086766
New API method: /api/v1/search
...
Returns accounts, statuses, hashtags arrays
2017-03-22 02:32:27 +01:00
8803ca9efe
Improved landing page
2017-03-21 19:18:37 +01:00
6b1db5c2b2
Add landing strip
2017-03-20 03:36:29 +01:00
56d998cbdb
Export follow/block lists as CSV
2017-03-19 20:29:41 +01:00
2816b1bf8e
Federate header images, fix open-uri http->https redirection error
2017-03-18 22:51:20 +01:00
38dceb3bf7
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
6be7bde243
Fix #525 - Add instance information API
2017-03-15 23:12:48 +01:00
e245115f47
Merge branch 'master' into mastodon-site-api
2017-03-15 22:55:22 +01:00
02349b3269
Obfuscate filenames better, double rate limits
2017-03-14 15:59:21 +01:00
1fb3e8988b
Revert earlier fix due to new bug reports
2017-03-06 02:25:41 +01:00
ebc01bf0f6
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
85fce04d1b
Detect videos with no sound, handle them like gifv
2017-03-05 22:55:24 +01:00
5f4e402204
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
caf5b8e975
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
6b81d10030
Add digest e-mails
2017-03-04 00:00:48 +01:00
442fdbfc53
Mute button progress so far. WIP, doesn't entirely work correctly.
2017-03-01 22:31:21 -06:00
620f70e42c
Adds site metadata access to the API
2017-02-27 04:06:25 -08:00
175a9b9caa
Fix #104 - Style OAuth authorized applications page
...
Add ability to search accounts by display name
2017-02-27 00:15:00 +01:00
9d4cad6307
Improve glow
2017-02-23 02:14:35 +01:00
8132cf8153
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
d0f087db2d
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
24ba7c9762
Adding index overview for reports in admin UI
2017-02-16 02:28:10 +01:00
ff49649130
Expose Link headers via CORS
2017-02-15 23:26:17 +01:00
5426f06ac2
Fix admin UI for accounts somewhat
2017-02-15 00:22:58 +01:00
3b81baaaaf
Adding POST /api/v1/reports API, and a UI for submitting reports
2017-02-14 20:59:26 +01:00
63886bdc59
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
138d21aea8
Update service timeout setting from 15s to 90s
2017-02-13 20:42:02 +01:00
0518492158
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
d2619e0b53
Site title is now a setting
2017-02-10 22:37:11 +01:00
2d6f603c2b
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
9d5fb49cd8
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
347a153b3d
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
94e213c6c1
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
77e13c2bc9
Removing failed push notification API, make context loads use cache
2017-02-05 17:51:44 +01:00
19b9e1e2c3
Preheat status cache
2017-02-05 17:24:18 +01:00
8bd8ea7c04
Remove unnecessary leftover code
2017-02-04 14:49:24 -08:00
e2fbf8bc74
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
ccb8ac8573
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
d9ca46b464
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
1da0ce5c7c
Looks like log level :debug is required for activerecord times to be tracked
2017-02-01 12:13:16 +01:00
65402d9c09
Fix activerecord logging in production
2017-02-01 11:34:50 +01:00
c2fbd144cf
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
a2a85e8549
Add capistrano to development environment
2017-01-30 20:03:17 +01:00
3f075c7794
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
23b997ae55
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
f4bc9620a9
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
76e970c856
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
ba192f12e3
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
f6a5977f0b
Fix key names in statsd
2017-01-26 19:46:52 +01:00
d567f21d4f
Improve StatsD instrumentation
2017-01-26 19:08:05 +01:00
7329fbd8a4
Fix up timeout, improve contrast on "show more", add responsive style
...
for extremely wide monitors
2017-01-26 18:48:56 +01:00
cc5c1e5feb
Removed accidental n+1 query from notifications, updated some deps,
...
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
07b9a10d4d
Add redirect for /admin => /admin/settings
2017-01-26 18:59:35 +11:00
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
f392030ab8
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
956da43e19
Fix error
2017-01-22 23:07:31 +01:00
61aee0006e
Override Rack::Request to use the same trusted proxy settings as Rails
2017-01-22 21:01:28 +01:00
67befe5463
Allow to specify trusted proxies through env
2017-01-22 20:35:49 +01:00
e028406db4
Fix code style
2017-01-21 22:19:13 +01:00
d72dd38c13
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
2017-01-21 22:15:22 +01:00
3a4b5961be
Method to fetch a single notification
2017-01-21 22:14:13 +01:00
5fef55c11a
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
2017-01-21 20:22:49 +11:00
f0de621e76
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
f051c2e813
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
306eb6e9c9
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
fcb5a85cdd
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
ab4f5f5da5
Add Heroku deployment support
2017-01-17 22:00:03 +11:00
16f9490d33
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
2017-01-15 14:29:47 +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
a097dd489b
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
2017-01-15 20:58:46 +11: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
e25170f960
Add extended about page stub
2017-01-13 03:24:41 +01:00
b11fdc3ae3
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
4292cf60ae
Fix env variable name
2017-01-10 22:01:13 +01:00
75f80bef10
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
2e71bb031b
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
7ddec6e7c3
Add read timeout to paperclip when it's downloading remote images
2017-01-07 15:43:56 +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
2b0b7ff1b8
Fix #385 - /web now loads a page
2017-01-04 15:35:36 +01:00
8f47f6a7ec
Adding remote follow button
2017-01-01 19:54:34 +01:00
a302e56f9a
Add API for retrieving favourites
2016-12-29 20:33:26 +01:00
49834a6e7f
Add API for retrieving blocked accounts
2016-12-29 20:12:32 +01:00
Shel R
Chad Pytel
Eugen
Jantso Porali
André Lewin
Clément D
Thibaut (Eychics)
Pete Keen
Neville Park
Korbinian
Christopher Kolstad
Angristan
Valentin Lorentz
Damien Erambert
leopku
Kit Redgrave
Kibigo
Evan Minto
Effy Elden
Jessica Stokes