415 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abhinav Adduri	10d489f766	fixed issues, fluentfmt output matches	2017-07-25 09:55:40 -07:00
Abhinav Adduri	4065bbcfd7	removing bundle files	2017-07-25 09:25:49 -07:00
Abhinav Adduri	330da9b258	merging master	2017-07-25 09:23:42 -07:00
Danny Coates	3febcfe1ea	Merge pull request #291 from mozilla/legal ... added legal page	2017-07-25 09:03:11 -07:00
Daniela Arcese	5996bceef7	Merge pull request #307 from mozilla/ui ... don't show error page on upload cancel	2017-07-25 11:48:34 -04:00
Daniela Arcese	ba277b9382	don't show error page on upload cancel	2017-07-25 11:08:41 -04:00
Danny Coates	5a564e2c37	tighten csp	2017-07-24 22:08:43 -07:00
Danny Coates	4b8445191b	Merge pull request #299 from mozilla/circleVersion ... use CIRCLE_TAG as version.json version if present	2017-07-24 18:35:34 -07:00
Danny Coates	12033edda5	use CIRCLE_TAG as version.json version if present	2017-07-24 18:25:28 -07:00
Danny Coates	8e6d8eaddd	bump version	2017-07-24 16:34:00 -07:00
Daniela Arcese	faaa8afe17	Merge pull request #296 from mozilla/ui ... restyle delete popup	2017-07-24 17:42:06 -04:00
Daniela Arcese	84e8abf2c5	fix horizontal scroll issue	2017-07-24 17:38:03 -04:00
Danny Coates	5db8a20b9d	Merge pull request #295 from mozilla/envvar ... renamed environment variables to remove P2P_ prefix	2017-07-24 14:30:09 -07:00
Danny Coates	117c6ea12d	Merge branch 'master' into envvar	2017-07-24 14:06:55 -07:00
Danny Coates	83880d97e6	Merge pull request #294 from mozilla/invalidDragAndDrops ... dealing with invalid drag and drops	2017-07-24 13:56:00 -07:00
Abhinav Adduri	c3be5228cb	removing dialog	2017-07-24 13:35:40 -07:00
Danny Coates	ade214c69c	Merge pull request #297 from mozilla/expire ... added environment variable for expire time	2017-07-24 13:27:37 -07:00
Danny Coates	4cb040d70d	added environment variable for expire time	2017-07-24 13:20:18 -07:00
Danny Coates	73ccce627c	renamed environment variables to remove P2P_ prefix	2017-07-24 13:10:30 -07:00
Daniela Arcese	4043d35c8b	restyle delete popup	2017-07-24 16:04:31 -04:00
Abhinav Adduri	a576cc0198	dealing with invalid drag and drops	2017-07-24 12:42:16 -07:00
Abhinav Adduri	fa1f0208a4	added tagLength to fileReceiver	2017-07-24 12:16:01 -07:00
Danny Coates	193d3b1aef	Merge pull request #292 from mozilla/fixes289 ... Fixes289	2017-07-24 12:10:12 -07:00
Abhinav Adduri	3b28ce88bf	removing bundle from gitignore	2017-07-24 12:03:38 -07:00
Abhinav Adduri	c77983d902	removing bundle file, adding public/bundle.js to gitignore	2017-07-24 10:54:57 -07:00
Abhinav Adduri	6ef9f8fa43	fixes 289	2017-07-24 10:52:54 -07:00
Danny Coates	1eabc1a11e	added legal page	2017-07-24 10:51:57 -07:00
Danny Coates	9136694d29	Merge pull request #288 from mozilla/uploads ... fix: Don`t allow upload when not on the upload page.	2017-07-24 10:30:52 -07:00
Erica Wright	ec7f058afc	don`t allow upload when not on the upload page.	2017-07-24 13:04:46 -04:00
Danny Coates	62989ee2c9	Merge pull request #285 from mozilla/phases ... added messages for processing phases	2017-07-24 09:53:45 -07:00
Danny Coates	85068e97ae	Merge pull request #267 from mozilla/responsive-and-feedback ... make site responsive and add feedback link	2017-07-24 09:52:39 -07:00
Abhinav Adduri	eb73dbfe78	removed empty lines	2017-07-24 09:41:37 -07:00
John Gruen	dde2c4d5a9	Merge branch 'master' of https://github.com/mozilla/send into responsive-and-feedback	2017-07-24 18:31:47 +02:00
Danny Coates	20cf8d0a15	added messages for processing phases	2017-07-24 09:23:56 -07:00
Peter deHaan	b2bd623a49	Merge pull request #286 from pdehaan/issue-205 ... Update download progress bar color	2017-07-24 08:49:45 -07:00
Peter deHaan	fc3001978c	Update download progress bar color	2017-07-23 22:42:40 -07:00
Danny Coates	d6823f492d	Merge pull request #281 from pdehaan/deLint ... Stop ESLint from linting the /public/ directory	2017-07-23 12:42:53 -07:00
Peter deHaan	c3751c2efc	Ignore console statements in test/ directory because yolo	2017-07-23 00:06:24 -07:00
Peter deHaan	70396e2f36	Stop ESLint from linting the /public/ directory	2017-07-22 23:26:42 -07:00
Danny Coates	b557665d04	ignore the firefox installed for selenium in docker	2017-07-21 20:09:59 -07:00
Danny Coates	6393d70a33	rearrange dependencies. fixes #255	2017-07-21 20:00:38 -07:00
Danny Coates	834df8526f	Merge pull request #280 from mozilla/unsupported ... created /unsupported page and added gcmCompliant to /download page	2017-07-21 17:50:26 -07:00
Danny Coates	f5bd332ff8	created /unsupported page and added gcmCompliant to /download page	2017-07-21 17:42:40 -07:00
Danny Coates	0d5fb1740d	npm run format	2017-07-21 17:01:26 -07:00
Danny Coates	5ed4db9689	Merge pull request #279 from mozilla/split ... create separate js bundles for upload/download pages	2017-07-21 16:55:50 -07:00
Danny Coates	31b810eb7d	create separate js bundles for upload/download pages	2017-07-21 16:23:08 -07:00
Abhinav Adduri	168a711c05	Firefox Send and Test Pilot should not be localized	2017-07-21 14:04:59 -07:00
Abhinav Adduri	7243a10340	Merge pull request #268 from mozilla/testpilotGA ... Testpilot ga	2017-07-21 13:49:45 -07:00
Abhinav Adduri	b18bcd3b6e	removing initialization on top in favor of default	2017-07-21 13:41:59 -07:00
Abhinav Adduri	09a6192bf5	merging master	2017-07-21 13:36:26 -07:00