Commit Graph

9 Commits

Author SHA1 Message Date
kevgliss 9c0f2917ad Merge branch 'master' into ci
* master:
  Fixed issue where hardcoded localhost:port combination existed in Javascript, added another step to setup.py 'package' that removes such instances and creates a more agnostic javascript blob.
  Fixing issue where nginx was not sending the right mimetype for CSS files.

Conflicts:
	gulp/build.js
2015-07-20 16:53:58 -07:00
kevgliss c89dff7994 Getting travisCI setup 2015-07-20 16:13:42 -07:00
kevgliss 8e0e22d49d Fixing issue where nginx was not sending the right mimetype for CSS files. 2015-07-19 19:03:04 -07:00
kevgliss 8239aa55e1 fixing conflicts 2015-07-07 16:26:37 -07:00
kevgliss a7d20cb3a5 fixing conflict 2015-07-07 15:33:29 -07:00
kevgliss 6d384f342f adding test utils 2015-07-07 15:32:55 -07:00
kevgliss 02bea85f85 Docfixes 2015-07-06 16:30:13 -07:00
kevgliss 2856d13a4e Making docs more clear on steps to get database installed. 2015-07-02 13:51:52 -07:00
Kevin Glisson 4330ac9c05 initial commit 2015-06-22 13:47:27 -07:00