Merge branch 'master' into clostridium

* master: ember-cli 1.13.13
2015-11-28 11:35:23 -07:00 · 2015-11-25 21:48:26 -07:00 · 2015-11-25 21:31:24 -07:00 · 2015-11-17 16:36:48 -07:00 · 2015-11-17 16:18:05 -07:00 · 2015-11-17 16:11:22 -07:00
9 changed files with 16 additions and 16 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# hymenobacterdotinfo
+# clostridiumdotinfo

 This ember application is an interface for the [bactdb](https://github.com/thermokarst/bactdb).

--- a/app/index.html
+++ b/app/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>hymenobacter.info</title>
+    <title>clostridium.info</title>
    <meta name="description" content="">
    <meta name="viewport" content="initial-scale=1.0, maximum-scale=10.0, minimum-scale=1.0, user-scalable=yes">
    <meta name="apple-mobile-web-app-capable" content="yes">
@ -12,7 +12,7 @@
    {{content-for 'head'}}

    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/hymenobacterdotinfo.css">
+    <link rel="stylesheet" href="assets/clostridiumdotinfo.css">

    {{content-for 'head-footer'}}
  </head>
@ -20,7 +20,7 @@
    {{content-for 'body'}}

    <script src="assets/vendor.js"></script>
-    <script src="assets/hymenobacterdotinfo.js"></script>
+    <script src="assets/clostridiumdotinfo.js"></script>

    {{content-for 'body-footer'}}
  </body>
--- a/app/mirage/config.js
+++ b/app/mirage/config.js
@ -7,7 +7,7 @@ export default function() {

 export function testConfig() {
  this.urlPrefix = 'https://bactdb-test.herokuapp.com';
-  this.namespace = '/api/hymenobacter';
+  this.namespace = '/api/clostridium';
  this.timing = 0;

  this.get('/users');
--- a/app/pods/protected/about/template.hbs
+++ b/app/pods/protected/about/template.hbs
@ -1,3 +1,3 @@
 <div class="about">
-  <p>This is some information about hymenobacter.info</p>
+  <p>This is some information about clostridium.info</p>
 </div>
--- a/bower.json
+++ b/bower.json
@ -1,5 +1,5 @@
 {
-  "name": "hymenobacterdotinfo",
+  "name": "clostridiumdotinfo",
  "dependencies": {
    "jquery": "~2.1.1",
    "ember": "~2.2.0",
--- a/config/environment.js
+++ b/config/environment.js
@ -2,7 +2,7 @@

 module.exports = function(environment) {
  var ENV = {
-    modulePrefix: 'hymenobacterdotinfo',
+    modulePrefix: 'clostridiumdotinfo',
    environment: environment,
    baseURL: '/',
    locationType: 'auto',
@ -12,9 +12,9 @@ module.exports = function(environment) {
      }
    },
    APP: {
-      genus: 'hymenobacter',
+      genus: 'clostridium',
    },
-    podModulePrefix: 'hymenobacterdotinfo/pods',
+    podModulePrefix: 'clostridiumdotinfo/pods',
    flashMessageDefaults: {
      sticky: true,
      type: 'error',
--- a/firebase.json
+++ b/firebase.json
@ -1,5 +1,5 @@
 {
-  "firebase": "hymenobacter-test",
+  "firebase": "clostridium-test",
  "public": "./dist",
  "ignore": [
    "firebase.json",
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
-  "name": "hymenobacterdotinfo",
+  "name": "clostridiumdotinfo",
  "version": "0.0.0",
-  "description": "Small description for hymenobacterdotinfo goes here",
+  "description": "Small description for clostridiumdotinfo goes here",
  "private": true,
  "directories": {
    "doc": "doc",
--- a/tests/index.html
+++ b/tests/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Hymenobacterdotinfo Tests</title>
+    <title>clostridiumdotinfo Tests</title>
    <meta name="description" content="">
    <meta name="viewport" content="width=device-width, initial-scale=1">

@ -11,7 +11,7 @@
    {{content-for 'test-head'}}

    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/hymenobacterdotinfo.css">
+    <link rel="stylesheet" href="assets/clostridiumdotinfo.css">
    <link rel="stylesheet" href="assets/test-support.css">

    {{content-for 'head-footer'}}
@ -23,7 +23,7 @@

    <script src="assets/vendor.js"></script>
    <script src="assets/test-support.js"></script>
-    <script src="assets/hymenobacterdotinfo.js"></script>
+    <script src="assets/clostridiumdotinfo.js"></script>
    <script src="testem.js" integrity=""></script>
    <script src="assets/tests.js"></script>
    <script src="assets/test-loader.js"></script>
Author	SHA1	Message	Date
Matthew Dillon	4f4b5d8a4d	Merge branch 'master' into clostridium * master: ember-cli 1.13.13	2015-11-28 11:35:23 -07:00
Matthew Dillon	b3c646cb18	Merge branch 'master' into clostridium * master: ember 2.2.0 & ember-data 2.2.1	2015-11-25 21:48:26 -07:00
Matthew Dillon	26dcecaa05	Merge branch 'master' into clostridium * master: Easiest to just unload the entire store Hide measurements on new strain Fix char/strain sort order	2015-11-25 21:31:24 -07:00
Matthew Dillon	d2c1609e86	Merge branch 'master' into clostridium * master: Context-sensitive save-model mixin	2015-11-17 16:36:48 -07:00
Matthew Dillon	935a3511de	Merge branch 'master' into clostridium * master: Removing char edit text	2015-11-17 16:18:05 -07:00
Matthew Dillon	732e8482a5	Merge branch 'master' into clostridium * master: Detailed characteristics view	2015-11-17 16:11:22 -07:00
Matthew Dillon	d6d9c92ef6	Merge branch 'master' into clostridium * master: Use API sort order for species	2015-11-17 15:54:29 -07:00
Matthew Dillon	ab964bbca1	Merge branch 'master' into clostridium * master: Compare - link to chars	2015-11-17 13:47:39 -07:00
Matthew Dillon	7c503876ac	Merge branch 'master' into clostridium * master: Fix up full name, again Force sort order for compare	2015-11-17 13:19:39 -07:00
Matthew Dillon	acb17480ec	Merge branch 'master' into clostridium * master: select2 4.0	2015-11-17 12:34:20 -07:00
Matthew Dillon	019031dd58	Merge branch 'master' into clostridium * master: User adapter	2015-11-17 09:59:12 -07:00
Matthew Dillon	838588da54	Merge branch 'master' into clostridium * master: User permission error handling	2015-11-17 09:34:43 -07:00
Matthew Dillon	74e901380e	Merge branch 'master' into clostridium * master: Password reset verbiage	2015-11-17 09:20:25 -07:00
Matthew Dillon	2aa432376f	Merge branch 'master' into clostridium * master: Fix strains index strain name formatting	2015-11-17 09:08:42 -07:00
Matthew Dillon	4aaa9cdfb9	Merge branch 'master' into clostridium * master: ember 2 series Remove globals initializer	2015-11-17 08:13:07 -07:00
Matthew Dillon	0815e4c4c9	Merge branch 'master' into clostridium * master: ESA 1.0.1	2015-11-16 18:29:15 -07:00
Matthew Dillon	d93f4a3152	Merge branch 'master' into clostridium * master: Lint	2015-11-16 18:15:42 -07:00
Matthew Dillon	aa4ca05897	Merge branch 'master' into clostridium * master: Customizing refresh token flow Remove quint-notifications Tweaking bower.json to fix CI build errors Changed mind on strain model MU prop Remove ES6 features from config	2015-11-16 16:59:10 -07:00
Matthew Dillon	09650e0f1b	Merge branch 'master' into clostridium * master: Inline images in CSP Strains form formatting Clean up delete button and tests Lint	2015-11-16 10:55:10 -07:00
Matthew Dillon	6574f4986c	Merge branch 'master' into clostridium * master: select2 ember-cli-build	2015-11-13 17:01:36 -07:00
Matthew Dillon	27c2788bd2	Merge branch 'master' into clostridium * master: Dropping ember-select2 for custom component Update getProperty helper #55, species Rest of strain MU strain.strainNameMU to component Refactor delete button Handle password change errors New Ajax Error util ember-cli 1.13.12	2015-11-13 15:50:32 -07:00
Matthew Dillon	8730b6659f	fixed merge conflict in tests/index	2015-11-13 08:33:04 -07:00
Matthew Dillon	dc5b54cfbf	Merge branch 'master' into clostridium * master: Refactor characteristics/new Refactor characteristics/edit Refactor characteristics/show Refactor characteristics/index MetaData mixin Additional creation checks Set up tests for existing pod	2015-11-05 15:37:01 -07:00
Matthew Dillon	0a039e57c4	Merge branch 'master' into clostridium * master: Add staging env Tweak shippable config	2015-11-05 09:38:50 -07:00
Matthew Dillon	6bdbacf978	Tweak mirage for clostridium	2015-11-04 20:32:22 -07:00
Matthew Dillon	d674d07951	Merge branch 'master' into clostridium * master: (27 commits) Temporary fix for quill editor use in strains edit Test new species (plus minor cleanup) Wrapping up form cleanup Quill DDAU Fixed up checkbox input WIP (checkbox) ember-one-way-input DeleteModel Mixin Using mixins on new species ElevatedAccess Mixin SaveModel Mixin Refactor species edit Refactor species/show fix format date import nvm Drop node version trying a different phantomjs route Rough in species index test Tweak mirage config ember-cli-mirage ...	2015-11-04 20:29:14 -07:00
Matthew Dillon	6509f63f00	Merge branch 'master' into clostridium * master: Upgrade ember-cli-flash	2015-10-29 13:06:30 -07:00
Matthew Dillon	6810c209d8	update merge	2015-10-29 12:09:26 -07:00
Matthew Dillon	6a8a4c1a36	Merge branch 'master' into clostridium * master: Clean up password reset	2015-10-27 16:20:20 -07:00
Matthew Dillon	80bd608045	Merge branch 'master' into clostridium * master: Revert #22	2015-10-21 07:28:59 -07:00
Matthew Dillon	fd9157007a	Merge branch 'master' into clostridium * master: Missing semicolon in login controller	2015-10-20 20:35:31 -07:00
Matthew Dillon	c17abc6829	Missing pod prefix	2015-10-20 18:16:41 -07:00
Matthew Dillon	38daf6ea5b	fixing config	2015-10-20 16:46:11 -07:00
Matthew Dillon	7665452f72	Merge branch 'master' into clostridium * master: Fix "New Strain" button under species edit Don't transition to loading route during login	2015-10-19 16:52:31 -07:00
Matthew Dillon	13f8c5afcc	Merge branch 'master' into clostridium * master: Add clickable to strains chars table Sort meas table in chars Fixes #33 Manually sort strains/chars Refresh token notes Linting	2015-10-19 15:42:57 -07:00
Matthew Dillon	f6a175980a	Merge branch 'master' into clostridium * master: Clean up beforeModel(s) Remove unneeded user model hook 404/Not Found	2015-10-14 13:12:48 -07:00
Matthew Dillon	075585c54f	Merge branch 'master' into clostridium * master: Show validation errors on save	2015-10-14 10:30:00 -07:00
Matthew Dillon	c505afd0fe	Merge branch 'master' into clostridium * master: Drop soft delete	2015-10-13 16:34:23 -07:00
Matthew Dillon	421831b5a6	Merge branch 'master' into clostridium * master: Need to wait for currentUser promise Tweak custom session Keep non-admins out of user profiles	2015-10-13 10:49:52 -07:00
Matthew Dillon	096e2dca20	Merge branch 'master' into clostridium * master: Change password Clear store on role change Roughing in roles selection Confirm delete on meas/char Delete strains Delete species Delete characteristic minor cleanup ember 1.13.7 & ember-data 1.13.13 Edit user Adapter error deprecated. Add characteristic/measurement to strain Delete measurement Track changes	2015-10-12 20:48:27 -07:00
Matthew Dillon	418b294634	Merge branch 'master' into clostridium * master: Refresh token	2015-09-17 15:58:25 -07:00
Matthew Dillon	56888c7fba	Merge branch 'master' into clostridium * master: Notes Cleaning up measurement edit Dummy measurement edit Fix login error transition	2015-09-17 11:01:04 -07:00
Matthew Dillon	f4939a962e	Merge branch 'master' into clostridium * master: Drop isEditing Fix table widths	2015-09-10 16:26:28 -07:00
Matthew Dillon	53650c7808	Merge branch 'master' into clostridium * master: Working on users Roughing in user admin Add measurements to strains page Clean up models Application-wide serializer Create and edit characteristics Characteristics details Rough in detail view for characteristics Restructuring forms	2015-09-09 16:54:10 -07:00
Matthew Dillon	1ce84c7269	Merge branch 'master' into clostridium * master: Removing measurements route Edit characteristic 'Select All' in compare. Fixed sort order in strains list genbank url for whole genome sequences	2015-09-04 09:32:05 -07:00
Matthew Dillon	9696313568	Merge branch 'master' into clostridium * master: DS deprecation (rollback) Fix up moment js Drop brocfile ember-cli 1.13.8 Fix transition deprecation Upgrade ember-cli-flash	2015-08-24 19:29:10 -07:00
Matthew Dillon	4d7cc5fc56	Merge branch 'master' into clostridium * master: Enabling user zoom Conflicts: app/index.html	2015-07-20 16:19:38 -08:00
Matthew Dillon	765bc45ce7	Merge branch 'master' into clostridium * master: Fix broken strain reference Rich text species and strains Add in quill WYSIWYG	2015-07-20 12:23:17 -08:00
Matthew Dillon	b5a260615b	Merge branch 'master' into clostridium * master: Add CSV download for compare (change backing service, too) Drop new user component, for now Clean up some loading stuff	2015-07-17 16:39:57 -08:00
Matthew Dillon	8c3bf30ace	Merge branch 'master' into clostridium * master: Clean up forms a bit Missing import in ajax-request	2015-07-16 21:24:46 -08:00
Matthew Dillon	c996dd5374	Merge branch 'master' into clostridium * master: Handle user lockouts (new authenticator added) catch split exception in parsebase64 Refactor ajax request	2015-07-16 21:13:54 -08:00
Matthew Dillon	cbac28e040	Merge branch 'master' into clostridium * master: Working on deprecations	2015-07-15 15:51:54 -08:00
Matthew Dillon	cca97e7542	Merge branch 'master' into clostridium * master: Clean up verification Update flash message Inject global var service in routes	2015-07-14 13:43:57 -08:00
Matthew Dillon	14a678092e	Missed in merge	2015-07-14 08:05:01 -08:00
Matthew Dillon	0ab0cf5a6a	Merge branch 'master' into clostridium * master: Remove duplicate mixins auto-reload compare/results model, cleanup	2015-07-14 08:03:21 -08:00
Matthew Dillon	f295082592	update merge from master	2015-07-13 16:32:03 -08:00
Matthew Dillon	8ab97c00e1	Updated merge from master	2015-07-07 14:41:40 -08:00
Matthew Dillon	9e8b02ac90	Overflow table	2015-07-07 14:38:36 -08:00
Matthew Dillon	3436989a89	Edit species	2015-07-07 14:28:16 -08:00
Matthew Dillon	583d7ca0db	SQUASH	2015-07-07 14:28:06 -08:00
Matthew Dillon	38894d94e7	Sideload strains in species list	2015-07-07 11:09:41 -08:00
Matthew Dillon	ae7f3bdafa	Test-drive metadata	2015-07-07 09:56:49 -08:00
Matthew Dillon	4bbf931853	Going back to model reference	2015-07-07 08:38:05 -08:00
Matthew Dillon	9aed858982	Continuing with species refactor	2015-07-07 07:30:48 -08:00
Matthew Dillon	622cd0faaf	Species edit refactor (wip)	2015-07-06 11:02:41 -08:00
Matthew Dillon	236a622505	Merge branch 'master' into clostridium * master: Stopgap sort order + cleanup	2015-06-17 16:24:23 -08:00
Matthew Dillon	6d04a8a6c8	init clostridium	2015-06-17 14:47:40 -08:00