64a107bc64
Merge pull request #87 from tootsuite/master
...
merge upstream
7 years ago
46112b7cbe
Restructured local settings internals
7 years ago
707d6fa9c0
fix(status_list): Update scroll position after toots are appended ( #4277 )
7 years ago
c44fcfd9e7
Update scroll top state on column mounting ( #4276 )
7 years ago
e6275b4ade
fix: Handle errors without response ( #4274 )
7 years ago
8465019f54
i18n: Update Polish translation ( #4268 )
7 years ago
fa9c117921
feat(emoji): Add back title attribute ( #4253 )
7 years ago
b8db4f786a
Update Japanese translation (chase #4249 ) ( #4251 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
7 years ago
03644ac855
i18n: Update Polish translation ( #4252 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
ed6c60a0c2
Merge changes from upstream with the CSS reload fix
7 years ago
9756975884
Add Japanese translation for #4246 ( #4249 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
7 years ago
7c0b509ba9
Update Japanese translations for new landing page ( #4159 )
...
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
7 years ago
87bb16a236
Add unfollow modal (optional) ( #4246 )
...
* Add unfollow modal
* unfollowing someone
* remove unnecessary prop
7 years ago
c5cd48bff7
Fixed issue that the NSFW image is not hidden on detail page ( #4244 )
7 years ago
af027b6b30
Exclude self toots from regular expression filter ( #4245 )
...
* Exclude self toots from regular expression filter
* refactor
7 years ago
49389c3809
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
7 years ago
df2a07d354
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.
7 years ago
713938f266
Updated from tootsuite
7 years ago
64202d0fcf
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.
7 years ago
36d42f83f3
fix(emojis): Handle multipoint emojis (e.g. country flags) ( #4221 )
7 years ago
53cb659076
Require images in common.js ( #4232 )
7 years ago
02f16aea28
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
7 years ago
803842f809
FIXED STUFF FROM THE MERGE SORRY ;_;
7 years ago
f48f42598f
Merge upstream ( #81 )
7 years ago
55313a0102
Fix column swiping ( #4211 )
...
This fixes broken behavior and enable animation only on swiping.
7 years ago
c0e596062b
Fix #3773 - Pin favourites column ( #4201 )
7 years ago
20111dd4d5
Small style fixes ( #4206 )
...
* fix(components/media_modal): Center horizontally in Firefox
* fix(components/status_list): Do not remove load more button
7 years ago
8207918890
🎄 🔨 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
7 years ago
5138dde794
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
7 years ago
1eeead616d
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
7 years ago
2772a256c1
fr.json: replace "silencer" with "masquer" ( #4196 )
...
"Silencer" as a verb does not exist in French. A good and valid replacement is "masquer".
7 years ago
5b2a54e305
Do not load unnecessary script files ( #4193 )
7 years ago
9669dc86f4
Add Japanese translations for #3243 ( #4192 )
7 years ago
e9f905bc87
Add object-fit polyfill for Edge ( #4182 )
7 years ago
912ca0fa57
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
7 years ago
b047d5c747
fix(components/media_modal): Style issues ( #4187 )
7 years ago
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
7 years ago
1b225a979a
Moved glitch containers and commented unused files
7 years ago
c3ec4f2dac
Rerender modal on property changes ( #4175 )
...
Render function for BundleContainer must not be methods.
React doesn't know dependency of the method, so they won't rerender on property updates.
In this case, when you close modal and open another modal immediately,
old modal will be open instead of new one.
7 years ago
a5ea495c96
i18n: @49026e2, @8abeec1 + consistency improvement (pl) ( #4171 )
...
* i18n: @49026e2 (pl)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: @8abeec1 (pl)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Improve consistency (pl)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
c0699e3ec9
local-only/compose advanced options tweaks.
...
Squashed commit of the following:
commit b9877e37f72fdd8134936e1014033b07cb6c3671
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:50:10 2017 -0500
account for the eye in the chars left count for local-only toots
commit 56ebfa96542e16daa1986cc45e07974801ee12dc
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:21:02 2017 -0500
factor out an AdvancedOptionsToggle to avoid unnecessary re-renders
commit 04cec44ab8744e4e0f52da488c9ec24b1b1422ef
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:20:24 2017 -0500
s/changeComposeAdvancedOption/toggleComposeAdvancedOption/g
commit af5815dee750d1aa8b797a9305e5ab3ce6774e3f
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Tue Jul 11 23:55:19 2017 -0500
clicking anywhere on the whole advanced option toggles
7 years ago
bcc30c8697
Merge upstream!! #64 <3 <3
7 years ago
0549ccc458
Importing vanillin from upstream ;) ;)
7 years ago
0e08cb1b36
Moved glitch files to their own location ;)
7 years ago
29cb8849d2
Fixed #66 disabling collapse collapses all toots
7 years ago
6e511ee673
Fix media modal prev button behavior. ( #4158 )
7 years ago
49026e27e8
Redesign the landing page, mount public timeline on it ( #4122 )
...
* Redesign the landing page, mount public timeline on it
* Adjust the standalone mounted component to the lacking of router
* Adjust auth layout pages to new design
* Fix tests
* Standalone public timeline polling every 5 seconds
* Remove now obsolete translations
* Add responsive design for new landing page
* Address reviews
* Add floating clouds behind frontpage form
* Use access token from public page when available
* Fix mentions and hashtags links, cursor on status content in standalone mode
* Add footer link to source code
* Fix errors on pages that don't embed the component, use classnames
* Fix tests
* Change anonymous autoPlayGif default to false
* When gif autoplay is disabled, hover to play
* Add option to hide the timeline preview
* Slightly improve alt layout
* Add elephant friend to new frontpage
* Display "back to mastodon" in place of "login" when logged in on frontpage
* Change polling time to 3s
7 years ago
b9e0dbe326
Require stylesheets in common.js ( #4152 )
...
Require stylesheets in common.js because stylesheets are shared by the
entry points.
7 years ago
bf012605a3
Drawer tab according to column ( #4135 )
...
* Add notifications link to drawer
* Remove local and public timeline tab in drawer
* Add home
7 years ago
1a5ae3019d
refactor: Rewrite immutablejs import statements using destructuring ( #4147 )
7 years ago
beatrix
kibigo!
Sorin Davidoi
unarist
m4sk1n
lindwurm
Ondřej Hruška
Yamagishi Kazutoshi
abcang
Akihiko Odaki
Lynx Kotoura
Eugen Rochko
Albert ARIBAUD
Surinna Curtis
Naoki Kosaka