beatrix
e7edb4d1ee
Merge pull request #87 from tootsuite/master
...
merge upstream
2017-07-20 11:24:32 -04:00
kibigo!
d235224692
Restructured local settings internals
2017-07-19 20:41:28 -07:00
Sorin Davidoi
f24b81e27f
feat(css): Remove border radius from WebKit's scrollbars ( #4278 )
2017-07-20 00:20:54 +02:00
Sorin Davidoi
e01966f7b8
fix(status_list): Update scroll position after toots are appended ( #4277 )
2017-07-19 22:38:26 +02:00
unarist
4f2513337f
Update scroll top state on column mounting ( #4276 )
2017-07-19 20:26:51 +02:00
Sorin Davidoi
015269914e
fix: Handle errors without response ( #4274 )
2017-07-19 19:38:50 +02:00
Cygnan
bc1f9dc24b
Fix a typo in public.js (double semicolons) ( #4269 )
...
Signed-off-by: Cygnan <mail@cygnan.com>
2017-07-19 13:35:22 +02:00
m4sk1n
cdc349a2d1
i18n: Update Polish translation ( #4268 )
2017-07-19 12:25:06 +02:00
Sorin Davidoi
72108b20e2
feat(emoji): Add back title attribute ( #4253 )
2017-07-18 22:49:24 +02:00
kibigo!
0a678cf377
Fix for stylesheet split
2017-07-18 11:28:52 -07:00
Surinna Curtis
7a77f7b3bb
Add sourceRoot/includePaths to loaders
...
Use the settings modal as an example/testcase
2017-07-18 11:27:48 -07:00
lindwurm
767117f9b0
Update Japanese translation (chase #4249 ) ( #4251 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18 20:03:18 +02:00
m4sk1n
fb7f06a752
i18n: Update Polish translation ( #4252 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-18 20:03:06 +02:00
Ondřej Hruška
d69fa9e1f4
Merge changes from upstream with the CSS reload fix
2017-07-18 18:58:47 +02:00
lindwurm
0b4006fc47
Add Japanese translation for #4246 ( #4249 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18 18:43:19 +02:00
lindwurm
0ccd47f413
Update Japanese translations for new landing page ( #4159 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18 18:42:59 +02:00
Yamagishi Kazutoshi
3267e4a785
Add unfollow modal (optional) ( #4246 )
...
* Add unfollow modal
* unfollowing someone
* remove unnecessary prop
2017-07-18 17:14:43 +02:00
abcang
4d42a38954
Improve admin page ( #4121 )
...
* Improve admin page
* Fix test
* Add spec
* Improve select style
2017-07-18 16:38:22 +02:00
abcang
afa52e4d63
Fixed issue that the NSFW image is not hidden on detail page ( #4244 )
2017-07-18 15:24:57 +02:00
Yamagishi Kazutoshi
f5382ec085
Exclude self toots from regular expression filter ( #4245 )
...
* Exclude self toots from regular expression filter
* refactor
2017-07-18 15:20:38 +02:00
Sorin Davidoi
719ab720a7
feat(push-notifications): Open link in current tab if possible ( #4228 )
...
* fix(push-notification): Open link in current tab if possible
* feat(sw): Skip waiting and claim clients
2017-07-18 00:19:17 +02:00
Akihiko Odaki
b11ac88692
Require any modules after loading polyfill in entry points ( #4231 )
...
app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.
Strictly enforce the rule to require any modules after loading
polyfill in entry points.
2017-07-18 00:19:02 +02:00
Ondřej Hruška
c727eae441
Updated from tootsuite
2017-07-17 20:03:57 +02:00
Lynx Kotoura
681c33d1f4
Quit overwriting style of extended-video-player ( #4237 )
...
Though size of extended-video-player is already fixed to 80vw*80vh in components.scss, player size was also set to original video size in extended_video_player.js. Video size is fixed to 80vw*80vh, so video player's size must also be fixed to 80vw*80vh.
2017-07-17 19:05:29 +02:00
Sorin Davidoi
1d2616b79b
fix(emojis): Handle multipoint emojis (e.g. country flags) ( #4221 )
2017-07-17 10:57:45 +02:00
Akihiko Odaki
b15f790221
Require images in common.js ( #4232 )
2017-07-17 10:23:28 +02:00
kibigo!
d0aad1ac85
Documentation and cleanup
2017-07-16 17:13:16 -07:00
kibigo!
21b04af524
Fixes lack of <tbody> in header metadata table
2017-07-16 16:49:12 -07:00
Lynx Kotoura
d1c3e35d3f
Fix style settings for images in media modal ( #4220 )
...
* Shrink too wide single image modal
Fix too wide react-swipeable-view-container
Fix 0067f80 shrinking all react-swipeable-view-container
Change to apply max-width of react-swipeable-view-container only under media-modal.
Fix b30b03b just a typo
* Centering contents in image-loader
Centering small img, canvas, and video in image-loader.
2017-07-16 11:52:11 +02:00
Ondřej Hruška
3ea02314b9
split added glitch locales from vanilla ( #82 )
...
* Locale script now accepts overrides and new keys from glitch/locales
* Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts
2017-07-16 01:15:25 +02:00
kibigo!
4715161a93
FIXED STUFF FROM THE MERGE SORRY ;_;
2017-07-15 15:42:39 -07:00
kibigo!
bc4202d00b
Ported updates from #64
2017-07-15 15:10:06 -07:00
kibigo!
09cfc079b0
Merge upstream ( #81 )
2017-07-15 14:33:15 -07:00
unarist
695439775e
Fix column swiping ( #4211 )
...
This fixes broken behavior and enable animation only on swiping.
2017-07-15 17:25:04 +02:00
Ondřej Hruška
08d021916d
Fixed issue #72 - bad css in report dialog
2017-07-15 16:45:39 +02:00
Ondřej Hruška
3a526e2369
Fix broken letterboxing in media previews
2017-07-15 15:38:18 +02:00
Eugen Rochko
3fbf1bf35a
Fix #3773 - Pin favourites column ( #4201 )
2017-07-15 00:49:34 +02:00
Sorin Davidoi
72bd73f605
Small style fixes ( #4206 )
...
* fix(components/media_modal): Center horizontally in Firefox
* fix(components/status_list): Do not remove load more button
2017-07-14 22:31:25 +02:00
Sorin Davidoi
c1f201c49a
🎄 🔨 Force tree shake emojione ( #4202 )
...
* chore(yarn): Install babel-plugin-preval as development dependency
* feat(babel): Add preval as a plugin
* feat(emojione_light): Prevaled module what tree-shaked emojione
* refactor(emoji): Use emojione_light
* feat: Preload emojione_picker bundle
* fix(emojione_light): Do not use Object.entries
* fix(emojify): Update tests
* chore(emojione_light): Remove silly ascii art
2017-07-14 20:30:12 +02: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
Albert ARIBAUD
489d162477
fr.json: replace "silencer" with "masquer" ( #4196 )
...
"Silencer" as a verb does not exist in French. A good and valid replacement is "masquer".
2017-07-14 12:12:16 +02:00
Yamagishi Kazutoshi
9008ab3407
Do not load unnecessary script files ( #4193 )
2017-07-14 11:08:56 +02:00
Yamagishi Kazutoshi
87b96f8d33
Add Japanese translations for #3243 ( #4192 )
2017-07-14 11:03:01 +02:00
unarist
eeb5923e89
Add object-fit polyfill for Edge ( #4182 )
2017-07-14 01:59:34 +02:00
Sorin Davidoi
a9067167bb
Improve swiping ( #4188 )
...
* feat(components/columns_area): Toggle animation settings
* fix(components/media_modal): Center non-visible views
* fix(components/media_modal): Check for null
* refactor(columns_area): Better logic
2017-07-14 00:49:01 +02:00
Sorin Davidoi
a9a0c854e1
fix(components/media_modal): Style issues ( #4187 )
2017-07-13 22:18:18 +02: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
unarist
c29c20ab3c
Add background color for spoiler input, like toot textarea ( #4181 )
2017-07-13 14:49:57 +02:00
kibigo!
6ce806f913
Fixed faulty import on notifs
2017-07-13 03:36:12 -07:00
