c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
7a8c526709
Replace preload link tag to Rails helper ( #7192 )
2018-04-20 02:06:53 +02:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
ba22580c06
Add ServiceWorker caching for static assets ( #5524 )
2017-10-31 12:25:51 +01:00
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
897931099c
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
3b6e5360c3
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
aac16a82d6
Better themeing support!!
2017-09-25 19:24:32 -07:00
da3f22ee7d
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
186416830e
Add link to 'noscript' message ( #4561 )
...
* Add link to 'noscript' message
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* remove indent
2017-09-02 01:52:28 +02:00
58446d39d8
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
2017-07-30 19:28:21 +02:00
7072288bcf
Merge git://github.com/tootsuite/mastodon into tootsuite-master
2017-07-25 21:36:22 +02:00
cdaf19daeb
Improve noscript message and style ( #4315 )
2017-07-23 20:28:06 +02:00
2e766841f3
Change logo.png to logo.svg for web UI ( #4307 )
2017-07-23 11:09:42 +02:00
0b64d60988
Fix for stylesheet split
2017-07-18 11:28:52 -07:00
ecab38fd66
Web Push Notifications ( #3243 )
...
* feat: Register push subscription
* feat: Notify when mentioned
* feat: Boost, favourite, reply, follow, follow request
* feat: Notification interaction
* feat: Handle change of public key
* feat: Unsubscribe if things go wrong
* feat: Do not send normal notifications if push is enabled
* feat: Focus client if open
* refactor: Move push logic to WebPushSubscription
* feat: Better title and body
* feat: Localize messages
* chore: Fix lint errors
* feat: Settings
* refactor: Lazy load
* fix: Check if push settings exist
* feat: Device-based preferences
* refactor: Simplify logic
* refactor: Pull request feedback
* refactor: Pull request feedback
* refactor: Create /api/web/push_subscriptions endpoint
* feat: Spec PushSubscriptionController
* refactor: WebPushSubscription => Web::PushSubscription
* feat: Spec Web::PushSubscription
* feat: Display first media attachment
* feat: Support direction
* fix: Stuff broken while rebasing
* refactor: Integration with session activations
* refactor: Cleanup
* refactor: Simplify implementation
* feat: Set VAPID keys via environment
* chore: Comments
* fix: Crash when no alerts
* fix: Set VAPID keys in testing environment
* fix: Follow link
* feat: Notification actions
* fix: Delete previous subscription
* chore: Temporary logs
* refactor: Move migration to a later date
* fix: Fetch the correct session activation and misc bugs
* refactor: Move migration to a later date
* fix: Remove follow request (no notifications)
* feat: Send administrator contact to push service
* feat: Set time-to-live
* fix: Do not show sensitive images
* fix: Reducer crash in error handling
* feat: Add badge
* chore: Fix lint error
* fix: Checkbox label overlap
* fix: Check for payload support
* fix: Rename action "type" (crash in latest Chrome)
* feat: Action to expand notification
* fix: Lint errors
* fix: Unescape notification body
* fix: Do not allow boosting if the status is hidden
* feat: Add VAPID keys to the production sample environment
* fix: Strip HTML tags from status
* refactor: Better error messages
* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)
* fix: Error when target_status is nil
* fix: Handle lack of image
* fix: Delete reference to invalid subscriptions
* feat: Better error handling
* fix: Unescape HTML characters after tags are striped
* refactor: Simpify code
* fix: Modify to work with #4091
* Sort strings alphabetically
* i18n: Updated Polish translation
it annoys me that it's not fully localized :P
* refactor: Use current_session in PushSubscriptionController
* fix: Rebase mistake
* fix: Set cacheName to mastodon
* refactor: Pull request feedback
* refactor: Remove logging statements
* chore(yarn): Fix conflicts with master
* chore(yarn): Copy latest from master
* chore(yarn): Readd offline-plugin
* refactor: Use save! and update!
* refactor: Send notifications async
* fix: Allow retry when push fails
* fix: Save track for failed pushes
* fix: Minify sw.js
* fix: Remove account_id from fabricator
2017-07-13 22:15:32 +02:00
0d54e620d9
Replace OEmbed and initial state Rabl templates with serializers ( #4110 )
...
* Replace OEmbed Rabl template with serializer
* Replace initial state rabl with serializer
2017-07-08 14:51:05 +02:00
20e15ecfb3
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
2017-07-07 04:02:06 +02:00
387de88e2f
Add a setting allowing the use of system's default font in Web UI ( #4033 )
...
* add a system_font_ui setting on the server
* Plug the system_font_ui on the front-end
* add EN/FR locales for the new setting
* put Roboto after all other fonts
* remove trailing whitespace so CodeClimate is happy
* fix user_spec.rb
* correctly write user_spect this time
* slightly better way of adding the classes
* add comments to the system-font stack for clarification
* use .system-font for the class instead
* don't use multiple lines for comments
* remove trailing whitespace
* use the classnames module for consistency
* use `mastodon-font-sans-serif` instead of Roboto directly
2017-07-06 22:39:56 +02:00
4ce6597e3a
fix: Warn if JavaScript is disabled ( #3634 )
2017-06-08 00:52:56 +02:00
4547e3585a
Add preference setting for delete toot modal ( #3368 )
...
* Set delete_modal preference to true by default
* Does not show confirmation modal if delete_modal is false
* Add ja translation for preference setting page
2017-05-29 17:56:13 +02:00
cd27deb5e3
Prevent selection of unacceptable Content-Type files ( #2910 )
...
* Prevent selection of unacceptable Content-Type files
* replace hard code
* media_attachments accept content-types in initial state
2017-05-08 16:49:53 +02:00
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
2017-05-08 03:35:25 +02:00
ef2af79a48
Replace sprockets/browserify with Webpack ( #2617 )
...
* Replace browserify with webpack
* Add react-intl-translations-manager
* Do not minify in development, add offline-plugin for ServiceWorker background cache updates
* Adjust tests and dependencies
* Fix production deployments
* Fix tests
* More optimizations
* Improve travis cache for npm stuff
* Re-run travis
* Add back support for custom.scss as before
* Remove offline-plugin and babili
* Fix issue with Immutable.List().unshift(...values) not working as expected
* Make travis load schema instead of running all migrations in sequence
* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />
* Add react definitions to places that use JSX
* Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-03 02:04:16 +02:00
336fd904db
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
2017-04-18 01:25:50 +02:00
d087c95aa7
Instance helper to replace site title helper ( #2038 )
...
* Move site title helper to instance helper (name change only)
* Remove newline in <title> tag
* Add site_hostname helper method to wrap up local_domain value
* Use site_hostname helper in places that need local_domain value
2017-04-18 00:16:32 +02:00
2fb1f07888
Add gif auto-play/pause preference
...
This introduces a new per-user preference called
"Auto-play animated GIFs", which is enabled by default. When a
user disables this setting, gifs in toots become click-to-play.
Previews of animated gifs were changed to display the video play
button so that users can distinguish them from regular images.
This setting also affects account avatars in the detailed account
view, which was changed to use the same hover-to-play mechanism
that is used for animated avatars in timelines.
Fixes #1652
2017-04-17 12:14:03 +02:00
40b37104fd
Onboarding modal ( #1883 )
...
* Basic onboarding modal that's shown to users once
* Lay out pages 2 through 5, add images, style modals (#1509 )
* Lay out pages 2 through 5
Added images and laid out pages 2 through 5 in the jsx file. SCSS will
come, still working on just seeing if this works at all.
* Fix jsx errors, add images to modal pages, style modal pages
* Add animations to onboarding pager changes, improve wording and styling
* Finishing touches on the onboarding
* Add missing propTypes
* Update wording
2017-04-16 20:32:00 +02:00
53f6bf067f
Fix cross-origin integrity ( #1871 )
...
See <https://glitch.social/users/bea/updates/434 >
2017-04-15 22:48:30 +02:00
cbf0e1b1c8
Send initial state in a <script type="application/json"> tag ( #1806 )
2017-04-15 02:32:42 +02:00
c06f09dfe2
Implementing Subresource Integrity ( #1729 )
...
* Add sprockets-rails to Gemfile
* Add sprockets-rails to Gemfile.lock
* Update show.html.haml
* Update index.html.haml
* Update admin.html.haml
* Update auth.html.haml
* Update embedded.html.haml
* Update public.html.haml
2017-04-14 11:09:20 +02:00
e7d77f4e13
Allow user to disable the boost confirm dialog in preferences
2017-04-11 10:10:16 -04: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
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
1a77ccb668
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
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
c1c814e6a1
Improve initialState loading
2017-01-09 12:37:53 +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
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
db6df6ddb3
Only load JS on homepage, no other page uses it
2016-09-24 13:47:51 +02:00
337462aa5e
Re-organizing components to be more modular, adding loading bars
2016-09-19 23:26:21 +02:00
2e7aac793a
Adding sense of self to the UI, cleaning up routing, adding third (detail) column
2016-09-13 02:24:40 +02:00
92afd29650
The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests
...
Adding better errors for the API controllers, posting a simple status works from the frontend now
2016-08-26 19:12:19 +02:00
49520d6e62
Adding React.js, Redux, revamping dashboard
2016-08-24 17:56:44 +02:00
5764d52b04
Fix Sidekiq pooling issues. Remove API docs from homepage, replace with
...
a basic home timeline
2016-03-25 16:10:14 +01:00
f14f462eaf
Adding Turbolinks, adding status posting form on homepage
2016-03-21 18:26:47 +01:00
1aa477ac2f
Customized more doorkeeper views, only logged in users can create oauth apps
2016-03-12 19:46:06 +01:00
David Yip