Commit Graph

5 Commits (9250511c44306234c6d7b191bd72419d2dd5b1a9)

Author SHA1 Message Date
Thibaut Girka aaf98669a5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
Eugen Rochko 77dc5cc132 Refactor icons in web UI to use Icon component (#9951)
* Refactor uses of icons to an Icon component in web UI

* Refactor options passed to the Icon component

* Make tests work with absolute component paths
2019-02-01 00:14:05 +01:00
kibigo! 5466150ea4 Removed glitch tests 2017-11-17 19:29:17 -08:00
Yamagishi Kazutoshi 8c97598548 Enable coverage for Jest (#5442) 2017-10-18 11:39:36 +02:00
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412) 2017-10-16 09:33:08 +02:00