Olivier Humbert
082bef3027
French translation update ( #1271 )
...
* Update confirmation_instructions.fr.html.erb
consistency across the French translation
* Update
consistency across the French translation
* Update fr.yml
a bunch of consistency across the French translation + a few typos
* Update doorkeeper.fr.yml
consistency across the French translation (punctuation)
2017-04-09 14:55:58 +02:00
Matt Jankowski
e5282e4ec0
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
2017-04-09 14:47:25 +02:00
Eugen
9acdb166e8
Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled ( #1278 )
...
* Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up
2017-04-08 22:20:08 +02:00
41f8fde83e
Update french translation ( #1148 )
...
Add french translation for emails sent
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update
a few fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-08 13:11:16 +02:00
Matt Jankowski
ca44c13455
Use Setting.site_title value for og:site_name
occurrences ( #1194 )
...
* Add helper method to return Setting.site_title
* Use site_title helper in application layout
* Use site_title value for og:site_name
2017-04-08 12:15:40 +02:00
Joël Quenneville
d4c94fa004
DRY up reblog vs original status check
...
Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored.
2017-04-07 14:18:30 -04:00
Eugen
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
Jantso Porali
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
Eugen Rochko
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
Eugen
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
Eugen
6d6a429af8
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ( #1124 )
...
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
Eugen Rochko
5f54981846
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
Eugen Rochko
68f829e11c
Add basic logging of who resolved report
2017-04-03 19:35:00 +02:00
Eugen Rochko
71458dc6df
When taking action on a report (silence/suspend), it dismisses all other
...
reports for that user automatically
2017-04-03 19:19:54 +02:00
Eugen Rochko
b7c1b12367
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
Eugen Rochko
2d07cb5771
Catching rack timeout from rails doesn't work
2017-04-02 21:12:18 +02:00
Eugen Rochko
5b12624847
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
Eugen Rochko
433cb198fa
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
Eugen Rochko
bde5c0eaf9
Fix some views still not using counter caches
2017-03-31 14:02:07 +02:00
Eugen Rochko
5e26295e06
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
Eugen Rochko
e8875c6046
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
Eugen Rochko
de22c202f5
Add counter caches for a large performance increase on API requests
2017-03-30 15:06:59 +02:00
Eugen Rochko
1c6b02f936
Fix #690 - Webfinger should handle new shortform profile URLs now (nice)
2017-03-28 11:25:43 +02:00
Eugen Rochko
f864fee116
Fix up some localizations
2017-03-26 13:22:38 +02:00
Eugen Rochko
99ca63a543
Fix public profile pagination links
2017-03-25 19:16:17 +01:00
Eugen Rochko
9bf4c34919
Fix #675 - return created_at in notifications API
2017-03-24 03:55:45 +01:00
Eugen Rochko
d6ed2eb512
Prettier account and stream entry URLs
2017-03-22 19:55:14 +01:00
Eugen Rochko
88f32708c3
Web UI support for the new omnisearch
2017-03-22 04:09:28 +01:00
Eugen Rochko
05cf086766
New API method: /api/v1/search
...
Returns accounts, statuses, hashtags arrays
2017-03-22 02:32:27 +01:00
Eugen Rochko
98571b0ce4
Don't list "direct" under default post privacy settings
2017-03-21 19:45:25 +01:00
Eugen Rochko
8803ca9efe
Improved landing page
2017-03-21 19:18:37 +01:00
Eugen Rochko
6b1db5c2b2
Add landing strip
2017-03-20 03:36:29 +01:00
Eugen Rochko
56d998cbdb
Export follow/block lists as CSV
2017-03-19 20:29:41 +01:00
Eugen Rochko
ac406a31b0
Start page links a bit more readable
2017-03-17 20:49:34 +01:00
shel
38dceb3bf7
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
Eugen Rochko
6be7bde243
Fix #525 - Add instance information API
2017-03-15 23:12:48 +01:00
Eugen
e245115f47
Merge branch 'master' into mastodon-site-api
2017-03-15 22:55:22 +01:00
Eugen Rochko
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
Eugen Rochko
6b81d10030
Add digest e-mails
2017-03-04 00:00:48 +01:00
Kit Redgrave
442fdbfc53
Mute button progress so far. WIP, doesn't entirely work correctly.
2017-03-01 22:31:21 -06:00
Eugen Rochko
d180aaa2a7
Fix #186 - Add RTL support to the compose form textarea and statuses output
2017-02-28 01:52:31 +01:00
Kibigo
620f70e42c
Adds site metadata access to the API
2017-02-27 04:06:25 -08:00
Eugen Rochko
175a9b9caa
Fix #104 - Style OAuth authorized applications page
...
Add ability to search accounts by display name
2017-02-27 00:15:00 +01:00
Eugen Rochko
f2931af61e
Quick fix for avatars with the same URL not being perceived as updated and in need of re-download
2017-02-17 01:50:01 +01:00
Eugen Rochko
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
Eugen Rochko
24ba7c9762
Adding index overview for reports in admin UI
2017-02-16 02:28:10 +01:00
Eugen Rochko
5426f06ac2
Fix admin UI for accounts somewhat
2017-02-15 00:22:58 +01:00
Eugen Rochko
3b81baaaaf
Adding POST /api/v1/reports API, and a UI for submitting reports
2017-02-14 20:59:26 +01:00
Eugen Rochko
63886bdc59
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
Eugen Rochko
2d8a4c4390
Add "next" link to Atom feeds
2017-02-13 15:38:45 +01:00
Eugen Rochko
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
Eugen Rochko
d551e43a9b
Improve public tag page
2017-02-10 23:21:01 +01:00
Eugen Rochko
d2619e0b53
Site title is now a setting
2017-02-10 22:37:11 +01:00
shel
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
Eugen
9d5fb49cd8
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
Evan Minto
28cbb6dc21
Add AS2 format to RABL files
2017-02-06 17:00:55 -08:00
Eugen Rochko
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
Evan Minto
53234e5947
Add trailing newline
2017-02-06 12:15:47 -08:00
Evan Minto
3fa5d05997
Simplify RABL
2017-02-06 11:39:08 -08:00
Evan Minto
94e213c6c1
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
Eugen Rochko
87830f99e7
Fix #552 - Replace image links with image icons in status text in the UI
2017-02-05 15:25:55 +01:00
Eugen Rochko
21972bb398
No replies filter on home timeline no longer hides self-replies
2017-02-05 02:02:46 +01:00
Evan Minto
e2fbf8bc74
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
hoodie
d4d3a10c25
untested!! spoiler hotfix for replies
...
untested, my vagrant is bugged again, submitted at gargron's request
2017-02-04 17:33:46 -05:00
Eugen Rochko
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
Eugen Rochko
c2fbd144cf
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
Eugen Rochko
23b997ae55
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
Eugen Rochko
f4bc9620a9
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
Eugen Rochko
ba192f12e3
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
Eugen Rochko
eb62778bec
Fix #537 - opengraph description should display spoiler text when present
2017-01-26 03:45:14 +01:00
Eugen Rochko
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
blackle
bf0f6eb62d
Implement a click-to-view spoiler system
2017-01-23 21:07:40 -05:00
Eugen Rochko
6d98a73180
Domain blocks now have varying severity - auto-suspend vs auto-silence
2017-01-23 17:38:38 +01:00
Eugen Rochko
e22a56183a
Improve error page layouting. 500 page has to stay static because it's
...
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
Eugen Rochko
b4a4eb73ae
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages
2017-01-21 22:20:01 +01:00
Eugen Rochko
f0de621e76
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
Eugen Rochko
cde0476ca2
Fix #487
2017-01-17 20:11:16 +01:00
Eugen Rochko
cc1eccc8bc
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
Eugen Rochko
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
Eugen Rochko
ab165547fd
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
2017-01-15 13:23:47 +01:00
Effy Elden
e45fed58cb
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
Effy Elden
3f84816b24
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:27:54 +11:00
Effy Elden
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
2017-01-15 09:12:11 +11:00
Effy Elden
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
2017-01-15 09:10:44 +11:00
Effy Elden
65122798b2
Fix typo in rel
2017-01-15 09:04:14 +11:00
Effy Elden
d6bc0e8db4
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
2017-01-15 08:58:50 +11:00
Eugen Rochko
7cde08e30b
Improve extended about page layout
2017-01-13 20:27:02 +01:00
Eugen Rochko
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
Eugen Rochko
e25170f960
Add extended about page stub
2017-01-13 03:24:41 +01:00
Eugen Rochko
ca50ceeaf0
Add settings for contact information
2017-01-12 20:54:14 +01:00
Eugen Rochko
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
Eugen Rochko
4a2ee43e80
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
2017-01-12 03:54:50 +01:00
Effy Elden
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
Eugen
67a31454ad
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
blackle
917cf0bf5d
simplify emojification on public pages with .emojify class
2017-01-09 22:41:47 -05:00
Eugen Rochko
205ba00017
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
Eugen Rochko
75f80bef10
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
Eugen Rochko
23ebf60b95
Improve initialState loading
2017-01-09 12:37:53 +01:00
Eugen Rochko
1bfbce7b45
Clean up h-card mess of divs
2017-01-06 20:24:51 +01:00
Eugen Rochko
72c3a41bef
Fix h-card classes and remote follow button appearing when it shouldn't
2017-01-06 20:15:24 +01:00