9a30c564b6
Remove unused AtomBuilderHelper ( #1364 )
...
This was used in the views/atom/user_stream.xml.ruby file, which no longer is
used.
2017-04-11 19:31:22 +02:00
e7d77f4e13
Allow user to disable the boost confirm dialog in preferences
2017-04-11 10:10:16 -04:00
e68cde9255
Bypass boost confirm modal if alt is pressed
2017-04-11 08:34:14 -04:00
7a4cb10e6b
Adjust css for user detail page ( #1463 )
...
- details a background for contrast
- add 5px padding to the top of the `details-counters` children to line them up with the bio to the right (Which has a 5px padding on the top)
2017-04-11 14:20:18 +02:00
3f5290bdb2
Add boost confirm modal
2017-04-10 22:35:55 -04:00
fcec9fcd99
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
2017-04-11 01:11:41 +02:00
e0977567e7
When avatar/header are GIF, generate static versions ( #1428 )
...
* When avatar/header are GIF, generate static versions.
Account API returns "avatar"/"avatar_static", "header"/"header_static"
Static version is the same as original for other cases
Web UI de-animates avatars in toots, lists of users
Fix #441 , fix #596 , prerequisite for #1064
* Fix JS test
* Add rake task to generate static avatars/headers from GIF ones, add test
2017-04-11 00:38:58 +02:00
43143fb22e
Remove order prior to .find_in_batches ( #1470 )
...
The `Status` class has a default order on it, so when this query gets built and
gets all the way to `find_in_batches` there is an order already there.
When `find_in_batches` is run it discards any existing order on the query, and
emits a warning to the logs if there is one there.
This change removes the order prior calling `find_in_batches`, which will stop
the logged warning from occurring as well.
2017-04-11 00:38:34 +02:00
2be9b85ed6
Add username as a title for mentions ( #1385 )
...
Add a title attribute on mention links for both notifications
and mentions in statuses.
Related to #1350
2017-04-11 00:35:35 +02:00
68f3ce7d0c
API param to exclude notification types from response ( #1341 )
...
* Add exclude_types param to /api/v1/notifications
* Exclude notification types in web UI through exclude_types in the API
2017-04-10 23:45:29 +02:00
874a240a58
Clean up generation of account webfinger string ( #1477 )
...
* Consolidate webfinger string creation under Account#to_webfinger_s
* Introduce Account#local_username_and_domain for consolidation
2017-04-10 22:58:06 +02:00
fa5165e874
Add more specific class names to notification divs ( #1120 )
2017-04-10 22:41:52 +02:00
b07990c94f
Keep newlines in xml ( #1397 )
2017-04-10 21:32:45 +02:00
17ce0b4141
Fix #1097 When onClick is falsy, do not make status content clickable ( #1434 )
2017-04-10 21:31:26 +02:00
adee97cb6e
Allow typing a toot while an image uploads ( #1429 )
...
This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! ✨
2017-04-10 21:30:58 +02:00
37c9ee5a10
Fix issue with missing emojify class in views ( #1455 )
...
* Add missing emojify class to landing strip
* Add missing emojify class to simple_status partial
2017-04-10 21:27:52 +02:00
8d0a4b7200
Admin base controller ( #1465 )
...
* Add Admin::BaseController to wrap admin area
Extracts the setting of the `admin` layout and verifying that users are admins
to a common base class for the admin/ controllers.
* Add basic coverage for admin/reports and admin/settings controllers
2017-04-10 21:27:03 +02:00
9fe4ae3372
Adjust background of emoji panel ( #1461 )
...
Addresses #1451 which notes the emoji picker is too light. I agree, so I submit this adjustment.
Changes:
Changed the background to a darkened version of another system color
2017-04-10 20:56:14 +02:00
6907c06ce3
Improve scrolling behaviour ( #1415 )
...
* Replace column margin with padding
This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird.
* Move clear column button styling to css
2017-04-10 16:27:30 +02:00
306bdff915
Fix icon and emoji sizes ( #1403 )
...
Fixes icons and emoji size issues described in #1233 .
2017-04-10 13:02:09 +02:00
ac50bab158
Add Russian translation (ru) ( #1023 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
2017-04-10 12:52:06 +02:00
4def9924d7
Fix for Import issue from URL ( #1416 )
2017-04-10 12:49:34 +02:00
e331f52be2
Add search to emoji picker ( #1395 )
2017-04-10 09:58:09 +02:00
5c57f15503
Do not store last visited URL from API controllers ( #1330 )
...
Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}
2017-04-09 22:21:52 +02:00
d30a82a22f
Fix #1339 - better Atom titles ( #1343 )
2017-04-09 20:55:54 +02:00
47a3702db4
Fix /api/v1/accounts/update_credentials tests ( #1357 )
2017-04-09 20:23:14 +02:00
eb6c3fdca9
update portuguese translation ( #1280 )
...
added the missing fields and improved the translation
2017-04-09 18:49:26 +02:00
e326eb53dd
Get handle from atom feed's author/email field instead of guessing from URL ( #1344 )
...
The goal of this change is to enhance Mastodon's handling of remote domains
for which the APIs reside on a different host (see issue #1032 ).
Indeed, when a remote user unknown to Mastodon is mentionned, only its profile
URL (e.g. https://social.example.org/users/User ) is known, and Mastodon has to
build a @username@domain handle for it. To do so, Mastodon fetches the user's
atom feed (e.g., https://social.example.org/users/User.atom ) and uses its
content to get the username part of the handle, and the URL's host part to
build the domain (e.g., @User@social.example.org). This handle is then used
for a Webfinger request.
In the case where example.org serves the Webfinger info for @User@example.org
and all feeds and APIs are hosted at social.example.org, Mastodon will still
build @User@social.example.org and fail at resolving the account's details
through Webfinger.
This patch changes this behaviour by using the author's email address from
the atom feed to build the handle. In Mastodon-generated atom feeds, the
email address is always the handle it expects for federation.
2017-04-09 18:43:48 +02:00
9252133084
Use HTTP Accept-Language to detect locale ( #1166 )
...
* Use HTTP Accept-Language to detect locale
* Fix gem order to comply with codeclimate
* Sort gem to comply with rubocop
* I18n.default_locale fallback when there is no accept-language header
2017-04-09 18:40:24 +02:00
6e0b4032b3
Allow users to update their Account in the API ( #1179 )
...
* Allow users to update their Account in the API
It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.
Signed-off-by: David Celis <me@davidcel.is>
* Add /api/v1/accounts/update_credentials to the API docs
Signed-off-by: David Celis <me@davidcel.is>
2017-04-09 18:33:40 +02:00
3b3671c797
Helper cleanup ( #1348 )
...
* Remove unused helper files
* Add coverage for application helper
* Add coverage for StreamEntriesHelper #display_name
2017-04-09 17:11:37 +02:00
288bbf6ffb
Update fr.jsx ( #1329 )
...
* Update fr.jsx
* Remove duplicate translation
2017-04-09 14:58:08 +02:00
d473a092e3
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
dd12af9fd9
add empty notifications french translation ( #1111 )
2017-04-09 14:54:02 +02:00
41b79ae693
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
b92480bc01
Fixes #1311 margin shouldn't stay fixed ( #1312 )
2017-04-09 14:45:26 +02:00
641e809eaf
Search cleanup ( #1333 )
...
* Clean up SQL output in Tag and Account search methods
* Add basic coverage for Tag.search_for
* Add coverage for Account.search_for
* Add coverage for Account.advanced_search_for
2017-04-09 14:45:01 +02:00
ff75c89585
Fix nonworking clear notices button ( #1316 )
2017-04-09 11:35:23 +02:00
3047a8da74
Make public timelines API not require user context/app credentials ( #1291 )
...
* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API
* Apply pagination fix to more APIs
2017-04-08 23:39:31 +02:00
b532134503
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
ae422d872c
Improve responsiveness of registration form and closed banner ( #1265 )
2017-04-08 18:31:50 +02:00
72a526010d
Improve about page responsiveness ( #1252 )
2017-04-08 15:28:23 +02:00
697e4da6cb
Fix #1141 , fix #1126 - Avatar/profile info fetching ( #1215 )
...
* Fix #1141 , fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags
* Improve code quality, remove line unrelated to fix
2017-04-08 13:26:03 +02:00
a9863c1708
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
41aa5b0d58
Add titles to more icons, and change clear notifications icon. ( #1101 )
2017-04-08 13:07:55 +02:00
e885aeed92
Updated German translation ( #1248 )
...
Fixed various spelling and grammar mistakes.
Used more gender-neutral language.
2017-04-08 13:04:58 +02:00
f34314fd52
Add some missing strings to prevent some React warning in the console ( #1230 )
2017-04-08 12:16:16 +02:00
0d9a420c1a
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
cc6ec445b8
Merge pull request #1224 from chrisheninger/patch-1
...
Add SVG version of logo to repo
2017-04-08 11:37:37 +02:00
0b8bd5a9ce
Merge pull request #1218 from R0ckweb/patch-2
...
Fix #1141 on remote follow
2017-04-08 11:37:13 +02:00
eb68ecc9d7
Merge pull request #1216 from tootsuite/fix-default-locale-regression
...
Fix #1165 - Default locale no longer breaks form submissions
2017-04-08 11:36:43 +02:00
22eff0449f
Merge pull request #1213 from tootsuite/fix-accounts-initial-case
...
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 11:36:35 +02:00
b399356fa5
Merge branch 'master' into fix-default-locale-regression
2017-04-07 20:50:21 -07:00
a1ab8bff51
Merge branch 'master' into patch-2
2017-04-07 20:48:27 -07:00
68e2f357c0
Add SVG version of logo to repo
2017-04-07 20:40:18 -07:00
3b9a56d4b3
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
17c734b017
Merge branch 'master' into patch-4
2017-04-07 22:02:26 -04:00
33b00dd70f
#1141 on remote follow
...
The async action is send before persist, account.id not yet generated
Pull queue receive 'nil' so no profile update.
2017-04-08 03:24:35 +02:00
07f42f0824
Fix #1165 - before_action was called before protect_from_forgery
2017-04-08 02:30:50 +02:00
81b7c81200
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 01:07:42 +02:00
c3f2975fa4
Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
...
Add specs for PostStatusService
2017-04-07 22:30:28 +02:00
1a82d2bde6
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
8a67fb5eca
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
2f1bd3462e
Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
...
Fix nil#object_type error
2017-04-07 13:08:51 +02:00
7215446774
Merge branch 'master' into fix-object-type-nil-exception
2017-04-07 13:07:36 +02:00
ef7240169a
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
eaa0b8e669
Fix nil#object_type error
2017-04-07 13:05:34 +02:00
fb0ce9d38d
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
9bb84337a7
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
a1c63cb01d
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
1781fcaea4
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
24c77e57b2
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
7411863663
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
0db2a0c7c4
Fix wrong pubsub channel on public timelines
2017-04-06 04:03:23 +02:00
f10668da16
Merge pull request #1013 from blackle/master
...
Catch more errors in process_follows so it doesn't fail
2017-04-06 02:35:34 +02:00
fb6459d303
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
...
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
70f485a9e7
Catch more errors in process_follows so it doesn't fail
2017-04-05 20:04:13 -04:00
cd68e54a7d
Split SalmonWorker into smaller parts, move profile updating into another job
2017-04-05 21:43:10 +02:00
783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
5189ce9cd1
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
54329947ab
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
b9ddfff8f6
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
d67e1fe44d
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
ea10ddedaa
Update components.scss
...
Use nicer scrollbars in MS edge
2017-04-05 12:10:25 -04:00
8f38353c4d
Only render public payload once in FanOutOnWrite
2017-04-05 14:26:17 +02:00
3cc7378924
Replace ActionCable broadcast call with simple redis publish
2017-04-05 13:28:46 +02:00
cae7d221c7
Merge pull request #919 from JantsoP/master
...
More updates to Finnish language
2017-04-05 10:27:12 +02:00
39e5ecb61d
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
...
ApplicationWorker for shared worker behavior
2017-04-05 10:23:52 +02:00
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
6a33b51fd2
updated translation
...
Updated some translations after seeing them in service. Should be better now
2017-04-05 09:56:10 +02:00
522410589e
Eliminate unnecessary queries and query clauses with none and all
2017-04-05 06:02:58 +00:00
192f855952
We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
2017-04-04 21:14:37 -07:00
9b8f587c8d
Moved to the worker
2017-04-04 20:51:44 -07:00
bea03b4553
Moving in the inline render
2017-04-04 20:51:18 -07:00
dd66bce930
I don't actually think we need that.
2017-04-04 20:48:22 -07:00
7d887cea4b
Moving the queue_at into the worker
2017-04-04 20:39:14 -07:00
9e58c2b0e3
This method isn't used anymore
2017-04-04 20:38:07 -07:00
4f2985cddc
Replacing the broadcast method with the one defined in the feed manager
2017-04-04 20:36:03 -07:00
de1bb4bd56
By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection
2017-04-04 20:23:40 -07:00
744456cb55
Merge branch 'master' into add_more_tests_to_models
2017-04-05 03:27:38 +02:00
bb582ac177
Merge pull request #839 from SirCmpwn/profile-readability
...
Improve readability of text on profiles
2017-04-05 03:23:16 +02:00
27e4759c00
Improve readability of text on profiles
2017-04-04 21:13:23 -04:00
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
a8468cc6cc
Merge pull request #898 from SirCmpwn/remote-follow-improvements
...
Remote follow improvements
2017-04-05 02:54:03 +02:00
6a8bb89f80
Merge pull request #858 from krainboltgreene/patch-6
...
Use active record shorthand
2017-04-05 02:53:39 +02:00
932b0b2f1f
Remote follow improvements
...
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
2017-04-04 20:52:31 -04:00
d2b7daf6bb
Remove PuSH subscriptions when delivery is answered with a 4xx error
2017-04-05 02:34:33 +02:00
06424fd912
fix rubocop issues
2017-04-05 00:47:17 +02:00
9f80b2dd4e
add more tests to models
2017-04-05 00:29:56 +02:00
f6463e595f
Added Esperanto translation inside the javascripts folder
2017-04-04 20:54:42 +02:00
fa2a1af90a
Spawn FeedInsertWorker to deliver status into personal feed
2017-04-04 19:21:37 +02:00
8dace45447
Use active record shorthand
2017-04-04 09:04:07 -07: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
c3db103305
updated line 28 about GitHub
2017-04-04 15:07:15 +02:00
79828478c6
Merge pull request #804 from fhalna/development
...
Accessibility Fix.
2017-04-04 14:52:27 +02:00
e60c473917
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
9123aca6df
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
1484df2db5
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
fbf64105a5
Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
...
do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
2017-04-04 13:01:14 +02:00
c7e14e496b
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
fc2b031506
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
5110975df4
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
7a56845060
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
24793cdbaa
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
8eca42b265
Separate background jobs into different queues. ATTENTION: new queue "pull"
...
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
8796f7a125
Add check for visibility.nil? even though it can't ever be, to check for race conditions
2017-04-03 22:54:46 +02:00
4833f53a37
accessibility fix
...
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
c9ffa7ab1d
Add basic logging of who resolved report
2017-04-03 19:35:00 +02:00
ceaafb22d3
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
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
3e38b3989f
GitHub should be capitalized
2017-04-03 11:44:11 -04:00
f0be0d36c9
fixed typo
2017-04-03 14:16:03 +02:00
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
bb8d80f1b0
add finnish translation
...
add finnish translation
2017-04-03 13:34:26 +02:00
4949cc46d8
add finnish translation
...
add finnish translation
2017-04-03 13:33:43 +02:00
a3e82c4fa5
add finnish language
...
add finnish language
2017-04-03 13:32:10 +02:00
a2224bb6ac
Merge pull request #764 from ticky/tweak-quick-start-area
...
Fix the position of the Mastodon mascot in the UI
2017-04-03 12:59:16 +02:00
7227a992fc
Create Finnish translation for Mastodon
...
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
61333ed232
add mute option in status dropdown
2017-04-03 10:44:08 +02:00
f7bc9938a8
Fix the position of the Mastodon mascot in the UI
...
The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour!
It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
2017-04-03 13:16:14 +10:00
8ba7d4ed82
Merge branch 'master' into master
2017-04-03 01:07:53 +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
e6a6c102f6
Add forgotten comma
2017-04-02 23:39:41 +02:00
5f0e912d87
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
6ac05fc74b
Update French Translation
2017-04-02 23:18:01 +02:00
e3509e02c0
Merge pull request #740 from 0x70b1a5/master
...
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02: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
4bfabbd5e2
Avoid re-loading already loaded relationships. Also fixes issue where wrong
...
button would be displayed in account lists for unloaded relationships
2017-04-02 22:02:38 +02:00
eb85833dc7
Keep track of which timelines are connected live to avoid redundant
...
refreshes on navigation
2017-04-02 21:44:06 +02:00
1ee4c6415c
Catching rack timeout from rails doesn't work
2017-04-02 21:12:18 +02:00
bba468bcca
single-quotes
2017-04-02 14:55:13 -04:00
034cfeb1ac
remove black border on buttons
2017-04-02 14:54:24 -04:00
00e99e58db
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
6e4703703a
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
2017-04-02 17:04:31 +02:00
2d8a0caf98
Fix word-break in account profiles
...
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
2017-04-02 16:54:24 +02:00
f04816f005
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +02:00
4db2e2f4eb
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
572cf64791
Fix feed regeneration bug
2017-04-02 15:46:31 +02:00
347830262f
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
2017-04-02 12:36:26 +02:00
22fb48ca13
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
e407ed24a6
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
8befce32f3
improve video button visibililty
2017-04-01 21:02:30 -04:00
431bfcaad6
Fix broken reference
2017-04-01 22:29:20 +02:00
d1f8bd2673
Paperclip will complain on its own if this variable is missing
2017-04-01 22:16:26 +02:00
b794690bfe
Made modal system more generic
2017-04-01 22:11:28 +02:00
9f0d00567b
Fix word-break in profile's note on profile page and profile component
2017-04-01 20:17:28 +02:00
348e817d53
Improve mobile tabs a little
2017-04-01 15:17:35 +02:00
3c6e9ee33c
Fix reworked search
2017-03-31 22:45:56 +02:00
a895f0d448
Rework search
2017-03-31 21:11:09 +02:00
57e3d4c58b
Merge branch 'master' into patch-2
2017-03-31 10:34:14 -04:00
7931d5886c
Fix web UI profile clickable area overlapping with follow button area
2017-03-31 14:23:44 +02:00
355b9278d5
Fix some views still not using counter caches
2017-03-31 14:02:07 +02:00
be9accbacc
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
9169326960
:active and :focus states same as :hover for buttons
2017-03-31 12:08:51 +02:00
bbc3a36c82
Fix drag & drop overlay flickering
2017-03-31 11:48:25 +02:00
244da78105
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
96e58cf289
Add counter caches for a large performance increase on API requests
2017-03-30 15:06:59 +02:00
cdbfbbc691
Improve emojis - use SVGs where possible
2017-03-29 22:27:24 +02:00
8c97719fbc
Hide drag & drop area on drop event regardless of success
2017-03-28 14:17:24 +02:00
4ef48bcc42
Fix #408 - link @ names in bios
2017-03-28 14:16:08 +02:00
a4ce8b09fb
Fix #690 - Webfinger should handle new shortform profile URLs now (nice)
2017-03-28 11:25:43 +02:00
728174500e
Clarify post privacy warning
...
I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users.
2017-03-26 12:49:14 -04:00
02e2336daa
Add tooltip to privacy dropdown
2017-03-26 13:30:57 +02:00
74fb333eb7
Fix up some localizations
2017-03-26 13:22:38 +02:00
d50aa74690
Fix style issue
2017-03-26 13:13:41 +02:00
66ba47a1f3
Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn
2017-03-26 13:10:04 +02:00
2a8906d56a
Compose form layout fixes
2017-03-26 13:08:15 +02:00
58c9d97d07
🌐 add simplified chinese language
2017-03-26 14:13:18 +08:00
8ab274f67a
Change to using variables
...
Thanks garg
2017-03-25 20:42:49 -04:00
1503068ba0
Increase color contrast
...
Privacy descriptions were very difficult to reason. This is the minimal level of color contrast to be WCAG AA compliant.
2017-03-25 20:02:36 -04:00
7800909a0d
Clarify privacy options
...
Descriptions of differences between scope are more clear
2017-03-25 19:59:38 -04:00
d30fa5c52d
Fix up visual indicators for compose form privacy
2017-03-25 20:24:30 +01:00
d5c71b1403
Improve sign up page on small screens
2017-03-25 20:13:34 +01:00
e03f11e6a0
When replying to status with content warning, prefill content warning
2017-03-25 19:30:56 +01:00
830f5c846e
Temporary spacing fix
2017-03-25 19:27:31 +01:00
54b4f60906
Privacy dropdown i18n
2017-03-25 19:22:24 +01:00
Matt Jankowski