tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
 		2018-12-18 16:55:15 +01:00
..
actions Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
components Back to the getting-started when pins the timeline. (#9561) 2018-12-18 16:43:50 +01:00
containers Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Split out is_changing_upload from is_submitting (#9536) 2018-12-16 21:17:56 +01:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Fix a problem about generating an url of notifications (#8758) 2018-09-24 05:45:58 +02:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store Restore vanilla components 2017-11-17 19:29:16 -08:00
utils Resize images by area instead of fixed dimensions (#8083) 2018-07-28 03:33:00 +02:00
api.js Refactor /api/web APIs to use the centralized axios instance (#6223) 2018-01-08 20:01:33 +01:00
base_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
common.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
compare_id.js Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
extra_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
is_mobile.js Restore vanilla components 2017-11-17 19:29:16 -08:00
link_header.js Restore vanilla components 2017-11-17 19:29:16 -08:00
load_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
main.js bug fix (WebPush does not work) (#6120) 2017-12-28 16:20:34 +01:00
performance.js Restore vanilla components 2017-11-17 19:29:16 -08:00
ready.js Restore vanilla components 2017-11-17 19:29:16 -08:00
rtl.js Restore vanilla components 2017-11-17 19:29:16 -08:00
scroll.js Restore vanilla components 2017-11-17 19:29:16 -08:00
settings.js Implement tag auto-completion by history (#6621) 2018-03-04 20:27:25 +01:00
stream.js Use randomized setTimeout when fallback-polling and re-add since_id (#7522) 2018-05-18 02:32:35 +02:00
test_setup.js Restore vanilla components 2017-11-17 19:29:16 -08:00
uuid.js Restore vanilla components 2017-11-17 19:29:16 -08:00