Commit Graph

77 Commits

Author SHA1 Message Date
Abhinav Adduri 6670d9ad69 fixing conflicts 2017-07-19 12:17:24 -07:00
Abhinav Adduri 902010704a Merge branch 'master' of github.com:mozilla/send into localization 2017-07-19 11:35:11 -07:00
Abhinav Adduri 7ed30f497b finished localizations except for download.js 2017-07-18 15:46:44 -07:00
Abhinav Adduri cc35206ee4 added functionality to cancel uploads 2017-07-18 10:52:32 -07:00
Abhinav Adduri 26b228a976 Merge branch 'master' of github.com:mozilla/send into fixes195and192 2017-07-17 16:18:14 -07:00
Danny Coates 9735aa62bd Merge pull request #204 from mozilla/hsts
added HSTS header
2017-07-17 16:15:32 -07:00
Danny Coates 6970e9228a
changed CSP quotes 2017-07-17 15:49:09 -07:00
Daniela Arcese 61c49fb329 fixing things 2017-07-17 16:29:51 -04:00
Danny Coates 2127857790
added HSTS header 2017-07-17 12:36:32 -07:00
Abhinav Adduri ef9b15c1d7 bracket typo 2017-07-13 14:56:28 -07:00
Abhinav Adduri 3f89c2bf0a changed to decodeURIComponent in server code 2017-07-13 12:55:34 -07:00
Abhinav Adduri b419a6025f fixes issues 195 and 192 2017-07-13 12:53:15 -07:00
Danny Coates 9234bce75d
added csp directives 2017-07-12 11:11:17 -07:00
Danny Coates b32e63c305
reformat 2017-07-12 10:53:29 -07:00
Danny Coates 20b9766742
rename to 'send' 2017-07-11 13:45:31 -07:00
Abhinav Adduri cdf45de8e2 added server tests 2017-07-11 12:47:40 -07:00
Abhinav Adduri 8c907c9029 removed extraneous failure 2017-07-11 12:10:11 -07:00
Abhinav Adduri 6231385c74 fixed issues in branch title 2017-07-11 11:18:31 -07:00
Abhinav Adduri 6aa79472bf fixing small issues 2017-07-10 12:45:20 -07:00
Abhinav Adduri c4b7a2bd97 linting issues 2017-07-10 12:30:17 -07:00
Abhinav Adduri 6f7930e34d changed localstorage id's to match response from server, refactored meta.delete and newId out of storage module 2017-07-10 12:19:20 -07:00
Abhinav Adduri 1ce24f7e08 id is now independent on iv 2017-07-07 14:47:56 -07:00
Danny Coates 67f586b65c
format 2017-06-29 10:30:08 -07:00
Danny Coates 05fe534e14
use header for file metadata 2017-06-29 10:27:36 -07:00
Abhinav Adduri 34c367c49f
added aad encryption 2017-06-27 14:39:23 -07:00
Abhinav Adduri 50995238bd
gcm encryption 2017-06-27 10:50:14 -07:00
Danny Coates 5cd44be83c
remove notLocalHost 2017-06-23 20:01:32 -07:00
Danny Coates 9bcd186d8f Merge pull request #132 from pdehaan/issue-33
Add /__version__ route
2017-06-23 17:26:19 -07:00
Danny Coates d09b97db41
npm run format 2017-06-23 17:06:08 -07:00
Peter deHaan 7042165ff2 Merge branch 'master' into issue-33 2017-06-23 16:54:39 -07:00
Peter deHaan 314e756ef1
Move __version__ to a script 2017-06-23 16:53:17 -07:00
Daniela Arcese 6ee2df5adc removing unused code 2017-06-23 15:48:45 -04:00
Daniela Arcese aa8c1afa9d lint 2017-06-23 15:48:37 -04:00
Daniela Arcese 4dadec5ae9 fix conflicts 2017-06-23 15:47:47 -04:00
Danny Coates 72807686f3 Merge branch 'master' into heartbeat 2017-06-23 11:56:37 -07:00
Abhinav Adduri 525c15124a cleaned 2017-06-23 11:42:51 -07:00
Peter deHaan 2b01bb75dc
Add /__version__ route 2017-06-23 11:29:45 -07:00
Danny Coates d247e0ba31
added __heartbeat__ 2017-06-23 11:20:48 -07:00
Abhinav Adduri 2b4df1cd51 added sentry to server code 2017-06-23 10:53:11 -07:00
Abhinav Adduri 60fd36a58e removed bitly integration 2017-06-22 15:32:52 -07:00
Abhinav Adduri 50714d35a5 added sentry 2017-06-22 14:50:57 -07:00
Daniel Thorn f13cd9f8b8 add /__lbheartbeat__ endpoint 2017-06-22 12:18:07 -07:00
Peter deHaan c532ea4770 Auto-format files using 'npm run format' 2017-06-22 09:49:45 -07:00
Danny Coates be3df22757 Merge branch 'master' into ui 2017-06-21 14:04:12 -07:00
Abhinav Adduri 575f04a824 added in anonmyized ip google analytics 2017-06-21 13:54:24 -07:00
Danny Coates 0015b3c0c6 Merge branch 'master' into ui 2017-06-21 09:48:52 -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
Abhinav Adduri e8280df647 pr changes 2017-06-20 10:47:51 -07:00
Abhinav Adduri f3fe56e3d5 fixed delete bug 2017-06-19 16:11:33 -07:00