Commit Graph

948 Commits

Author SHA1 Message Date
Danny Coates 5a1602a479 Merge branch 'master' into cross-env-dep 2017-06-22 15:54:11 -07:00
Danny Coates e1bd4d934b Merge pull request from mozilla/remove-bitly
removed bitly integration
2017-06-22 15:49:34 -07:00
Danny Coates 45a45cfc8d Merge branch 'master' into remove-bitly 2017-06-22 15:46:38 -07:00
Peter deHaan 70746b44ff Merge branch 'master' into cross-env-dep 2017-06-22 15:38:03 -07:00
Danny Coates ac1165b228
☹️ 2017-06-22 15:34:43 -07:00
Abhinav Adduri 60fd36a58e removed bitly integration 2017-06-22 15:32:52 -07:00
Peter deHaan 9f0ea96777 Move cross-env to a dep 2017-06-22 15:31:09 -07:00
Danny Coates c64844bc80 Merge pull request from mozilla/docker-circle
fix docker build
2017-06-22 15:29:33 -07:00
Danny Coates 255d84e9bb Merge branch 'master' into docker-circle 2017-06-22 15:27:32 -07:00
Danny Coates 2e4aaefbc6
fix docker build 2017-06-22 15:26:26 -07:00
Danny Coates ab82700b0d Merge pull request from mozilla/docker-circle
added docker service to circle.yml
2017-06-22 15:21:53 -07:00
Danny Coates b83cdc5f2f
added docker service to circle.yml 2017-06-22 15:19:18 -07:00
Abhinav Adduri 73180ae9b3 Merge pull request from mozilla/sentry-clean
added sentry
2017-06-22 14:53:34 -07:00
Abhinav Adduri 50714d35a5 added sentry 2017-06-22 14:50:57 -07:00
Danny Coates 6d8330992d Merge pull request from relud/patch-2
change docker image name and add builds for tags
2017-06-22 13:35:19 -07:00
Danny Coates 5bd17ff58b Merge branch 'master' into patch-2 2017-06-22 13:23:09 -07:00
Danny Coates 31f9537bc8 Merge pull request from relud/patch-1
add /__lbheartbeat__ endpoint
2017-06-22 13:22:41 -07:00
Daniel Thorn 1d60778a3f change docker image name and add builds for tags 2017-06-22 12:56:07 -07:00
Daniel Thorn f13cd9f8b8 add /__lbheartbeat__ endpoint 2017-06-22 12:18:07 -07:00
Danny Coates 84d1267417 Merge pull request from pdehaan/issue-78
Optimize/minimize bundle.js for production
2017-06-22 11:46:53 -07:00
Peter deHaan f097428ecd
Uglify the production bundle 2017-06-22 11:37:31 -07:00
Danny Coates da8b4abe41 Merge pull request from pdehaan/clean-eslint
Fix a bunch of ESLint and HTMLLint errors
2017-06-22 10:57:04 -07:00
Danny Coates 9bcdf09eb2 Merge branch 'master' into clean-eslint 2017-06-22 10:11:51 -07:00
Abhinav Adduri 8ed180d8d1 removing shim for more browser compatibility 2017-06-22 10:09:56 -07:00
Peter deHaan 5f8eab3f2b
Fix more stylelint and eslint errors 2017-06-22 09:54:34 -07:00
Peter deHaan 12cd4777d4 Remove htmllint 2017-06-22 09:49:45 -07:00
Peter deHaan c532ea4770 Auto-format files using 'npm run format' 2017-06-22 09:49:45 -07:00
Peter deHaan 74c41897ad Fix a bunch of ESLint and HTMLLint errors 2017-06-22 09:49:45 -07:00
Danny Coates 99d7196799 Merge pull request from mozilla/ui
Progress bars
2017-06-22 09:27:04 -07:00
Danny Coates 9c33ec381e Merge branch 'master' into ui 2017-06-21 16:17:33 -07:00
Abhinav Adduri 87bdb7ab4c truncating referrer 2017-06-21 14:30:14 -07:00
Danny Coates be3df22757 Merge branch 'master' into ui 2017-06-21 14:04:12 -07:00
Abhinav Adduri 246796edd7 Merge pull request from mozilla/analytics-clean
added in anonmyized ip google analytics
2017-06-21 13:57:54 -07:00
Abhinav Adduri 575f04a824 added in anonmyized ip google analytics 2017-06-21 13:54:24 -07:00
Abhinav Adduri cfd2883db5 Merge pull request from mozilla/notify-clean
added notifications
2017-06-21 13:38:28 -07:00
Abhinav Adduri c9da5b8078 added notifications 2017-06-21 13:23:36 -07:00
Danny Coates 0015b3c0c6 Merge branch 'master' into ui 2017-06-21 09:48:52 -07:00
Danny Coates 37f74cacfa Merge pull request from mozilla/docker
added Dockerfile
2017-06-21 08:44:03 -07:00
Danny Coates f7c1b1718e
added ENV to Dockerfile, also deployment to circleci 2017-06-21 08:42:18 -07:00
Daniela Arcese ae3e18c443 format 2017-06-20 15:52:01 -04:00
Daniela Arcese 8bc1cb4e63 resolve conflicts 2017-06-20 15:48:08 -04:00
Daniela Arcese d4413e6e6f add progress bars 2017-06-20 15:44:36 -04:00
Daniela Arcese 4e040eece0 enable copy button again 2017-06-20 15:36:43 -04:00
Daniela Arcese 9e228417b4 add progress bars 2017-06-20 15:23:12 -04:00
Danny Coates 53f264e63b
added Dockerfile 2017-06-20 11:32:31 -07:00
Abhinav Adduri 2bb0c7eb4b pushing package-lock 2017-06-20 10:56:19 -07:00
Abhinav Adduri 9495dba5ad Merge pull request from mozilla/helmet
Added Helmet Middleware
2017-06-20 10:54:44 -07:00
Abhinav Adduri e8280df647 pr changes 2017-06-20 10:47:51 -07:00
Danny Coates 2effdf2b95 Merge pull request from mozilla/testing
Testing
2017-06-20 10:45:32 -07:00
Abhinav Adduri 1c49181acb pr changes 2017-06-20 10:21:11 -07:00