Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
2017-09-28 08:55:53 +02:00
Ondřej Hruška
3783062450
Emoji and Hashtag autocomplete
2017-09-20 20:21:09 +02:00
Surinna Curtis
0a207be99d
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
Surinna Curtis
2ea9b164d3
Satisfy eslint.
2017-09-13 21:47:30 -05:00
Surinna Curtis
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
David Yip
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
David Yip
b9f7bc149b
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
Yamagishi Kazutoshi
c9d04f1c39
Fix second report (regression from 3b81baaaaf) ( #4863 )
2017-09-09 13:42:48 +02:00
voidSatisfaction
85c7c42098
Add Pinned toot column ( #4817 )
...
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
2017-09-07 09:58:11 +02:00
Eugen Rochko
9caa90025f
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
Yamagishi Kazutoshi
110227ac5e
Remove status from favorites list when unfavorited ( #4597 )
2017-08-20 23:23:05 +02:00
Eugen Rochko
3c6503038e
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
2017-08-14 04:53:31 +02:00
Ondřej Hruška
b1c8a702a4
Add favourited toot to favourites column ( #4562 )
...
* Add faved toot to faves column
* renamed append to prepend for clarity
2017-08-09 00:22:26 +02:00
Ondřej Hruška
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
Sorin Davidoi
8eb6d171e6
feat: Cache status height to avoid expensive renders ( #4439 )
...
* feat: Cache status height to avoid expensive renders
* feat: Escape content and emojify in reducers
* fix(css): Remove backface-visibility: hidden from .scrollable
* fix(statuses): Avoid creating DOMParses inside a loop
2017-08-07 20:32:03 +02:00
kibigo!
8150689b48
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
bb85043f46
Disable sensitive button when with content warnings ( #4460 )
2017-07-31 05:06:56 +02:00
Ondřej Hruška
6ff084dbbb
Improved notifications cleaning UI with set operations ( #109 )
...
* added notification cleaning drawer
* bugfix
* fully implemented set operations for notif cleaning
* i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog
* - notif dismiss "overlay" now shoves the notif aside to avoid overlap
- added focus ring to header buttons
- removed notif overlay entirely from DOM if mode is disabled
* removed comment
* CSS tuning - inconsistent division lines fix
2017-07-30 12:36:28 -04:00
Yamagishi Kazutoshi
970297a138
Change to sensitive when adding content warning from web UI ( #4456 )
2017-07-30 16:27:57 +02:00
beatrix-bitrot
984d2d4cb6
Merge that good fresh upstream shit
2017-07-22 01:16:53 +00:00
Ondřej Hruška
604654ccb4
New notification cleaning mode ( #89 )
...
This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant.
* w.i.p. notif clearing mode
* Better CSS for selected notification and shorter text if Stretch is off
* wip for rebase ~
* all working in notif clearing mode, except the actual removal
* bulk delete route for piggo
* cleaning + refactor. endpoint gives 422 for some reason
* formatting
* use the right route
* fix broken destroy_multiple
* load more notifs after succ cleaning
* satisfy eslint
* Removed CSS for the old notif delete button
* Tabindex=0 is mandatory
In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0
* Corrected aria-label
Previous label implied a different behavior from what actually happens
* aria role localization & made the overlay behave like a checkbox
* checkboxes css and better contrast
* color tuning for the notif overlay
* fanceh checkboxes etc and nice backgrounds
* SHUT UP TRAVIS
2017-07-21 20:33:16 +02:00
Sorin Davidoi
c1bc5e14eb
feat(compose): More space on mobile devices ( #4282 )
...
* feat(compose): More space on mobile devices
* feat(compose): Hide navigation when typing on mobile devices
* fix(compose): Make animation faster
* fix(navigation_bar): Remove hardcoded title
* fix(compose): Prevent accidental bluring
* fix(compose): Increase max-height to 600px
2017-07-21 01:38:24 +02:00
Ondřej Hruška
c727eae441
Updated from tootsuite
2017-07-17 20:03:57 +02:00
Sorin Davidoi
1d2616b79b
fix(emojis): Handle multipoint emojis (e.g. country flags) ( #4221 )
2017-07-17 10:57:45 +02:00
kibigo!
4715161a93
FIXED STUFF FROM THE MERGE SORRY ;_;
2017-07-15 15:42:39 -07:00
kibigo!
09cfc079b0
Merge upstream ( #81 )
2017-07-15 14:33:15 -07:00
Eugen Rochko
e2685ccc81
Fix #4149 , fix #1199 - Store emojis as unicode ( #4189 )
...
- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore
2017-07-14 19:47:53 +02:00
Ondřej Hruška
75aafc932e
Added buttons and menu items to dismiss individual notifications ( #76 )
...
* Added DELETE verb for notifications
* Added notification dismiss button to status dropdown
* Added reveal-on-hover notif dismiss button, added FollowNotification component
2017-07-14 11:03:43 -04:00
Sorin Davidoi
0c7c188c45
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
kibigo!
79d898ae0a
Merge upstream!! #64 <3 <3
2017-07-12 02:03:17 -07:00
kibigo!
297921fce5
Moved glitch files to their own location ;)
2017-07-12 01:02:51 -07:00
Sorin Davidoi
cc68d1945b
refactor: Rewrite immutablejs import statements using destructuring ( #4147 )
2017-07-11 01:00:14 +02:00
Yamagishi Kazutoshi
2b9721d1b3
Add setting a always mark media as sensitive ( #4136 )
2017-07-10 14:00:32 +02:00
Sorin Davidoi
37c832cdf7
refactor: Make all reducers sync ( #4125 )
2017-07-09 12:16:08 +02:00
Ondřej Hruška
dc2b8bdecd
Added a toggle for full-width media previews
2017-07-08 06:46:12 -04:00
Sorin Davidoi
348d6f5e75
Lazy load components ( #3879 )
...
* feat: Lazy-load routes
* feat: Lazy-load modals
* feat: Lazy-load columns
* refactor: Simplify Bundle API
* feat: Optimize bundles
* feat: Prevent flashing the waiting state
* feat: Preload commonly used bundles
* feat: Lazy load Compose reducers
* feat: Lazy load Notifications reducer
* refactor: Move all dynamic imports into one file
* fix: Minor bugs
* fix: Manually hydrate the lazy-loaded reducers
* refactor: Move all dynamic imports to async-components
* fix: Loading modal style
* refactor: Avoid converting the raw state for each lazy hydration
* refactor: Remove unused component
* refactor: Maintain modal name
* fix: Add as=script to preload link
* chore: Fix lint error
* fix(components/bundle): Check if timestamp is set when computing elapsed
* fix: Load compose reducers for the onboarding modal
2017-07-08 00:06:02 +02:00
Surinna Curtis
3464bb30f8
replies to local-only toots default to local-only, and fix some regex bugs
2017-07-06 22:30:51 -05:00
Surinna Curtis
6b67b91eb1
satisfy eslint
2017-07-04 21:33:53 -07:00
Surinna Curtis
0c71c0ccc8
reset advanced options when appropriate
2017-07-04 21:33:53 -07:00
Surinna Curtis
556cede00f
Local-only option and dropdown all working
2017-07-04 21:33:53 -07:00
kibigo!
ec2daae71c
Media display improvements
...
- built in fullwidth styling
- letterbox settings toggle
- media no longer counts towards height when making toot-collapsing
measurements
2017-06-30 02:18:25 -07:00
kibigo!
2d8ebdcc72
Initial store for local settings is now Immutable all the way down
2017-06-28 22:11:21 -07:00
kibigo!
595c6de32c
Added App Setttings Modal
2017-06-28 22:00:54 -07:00
kibigo!
da05cde721
Better settings handling with localSettings (new!)
2017-06-24 19:56:37 -07:00
kibigo!
ddba5d3b8c
Use Redux store to keep track of layout
2017-06-24 18:30:30 -07:00
Yamagishi Kazutoshi
eff9416469
Remove unused variables ( #3906 )
2017-06-23 16:05:04 +02:00
Eugen Rochko
bb911043de
Fix regression from #3748 - properly set defaultColumns ( #3750 )
2017-06-14 23:07:06 +02:00
unarist
d8a0ee1956
Fix merge default columns ( #3748 )
...
mergeDeep also merges columns, but it should be replaced simply.
So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.
2017-06-14 21:59:52 +02:00
Eugen Rochko
47bf7a8047
Fix #3665 - Refactor timelines reducer ( #3686 )
...
* Move ancestors/descendants out of timelines reducer
* Refactor timelines reducer
All types of timelines now have a flat structure and use the same
reducer functions and actions
* Reintroduce some missing behaviours
* Fix wrong import in reports
* Fix includes typo
* Fix issue related to "next" pagination in timelines and notifications
* Fix bug with timeline's initial state, expandNotifications
2017-06-11 17:07:35 +02:00
ふぁぼ原
7623766241
Add regex filters on the community timeline and the public timeline. ( #3564 )
...
* Add regex filter on the community timeline and the public timeline
* correcting
* Adjust the height of header buttons
* Remove trailing spaces
* Remove trailing spaces
* Solve some code duplication
* reset the state of the locale files in app/javascript/mastodon/locales
* adjust to upstream
* adjust to upstream
* change keys of locale settings
2017-06-06 16:56:10 +02:00
