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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
 		2018-08-10 16:22:31 +02:00
..
actions Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
components Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
containers Remove protocol handler registration (#8127) 2018-08-08 21:12:45 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
selectors Make whole-word filter regex consistent between Ruby and JS (#7987) 2018-07-10 03:01:50 +02:00
service_worker Disable service worker media cache and IndexedDB storage (#7932) 2018-07-03 19:50:18 +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
.gitkeep Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +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 Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +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-07-16 14:50:42 +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