Matthew Dillon
418b294634
Merge branch 'master' into clostridium
...
* master:
Refresh token
2015-09-17 15:58:25 -07:00
Matthew Dillon
97db4e4662
Refresh token
2015-09-17 15:56:47 -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
4699e26fa0
Notes
2015-09-17 10:39:14 -07:00
Matthew Dillon
4b6a776b63
Cleaning up measurement edit
2015-09-17 10:39:03 -07:00
Matthew Dillon
40f2b789e4
Dummy measurement edit
2015-09-16 09:12:13 -07:00
Matthew Dillon
fa6507be66
Fix login error transition
2015-09-15 10:59:57 -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
065ab972e2
Drop isEditing
2015-09-10 07:03:40 -07:00
Matthew Dillon
06417b6069
Fix table widths
2015-09-10 07:02:44 -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
425dd689ae
Working on users
2015-09-09 16:49:48 -07:00
Matthew Dillon
be8a842c67
Roughing in user admin
2015-09-09 14:23:25 -07:00
Matthew Dillon
3b3f8cc691
Add measurements to strains page
2015-09-09 11:40:32 -07:00
Matthew Dillon
137ba20bd9
Clean up models
2015-09-09 11:40:15 -07:00
Matthew Dillon
37d7ca0029
Application-wide serializer
2015-09-09 11:40:07 -07:00
Matthew Dillon
de8ac653f6
Create and edit characteristics
2015-09-08 10:37:48 -07:00
Matthew Dillon
fb296340c3
Characteristics details
2015-09-08 06:31:57 -07:00
Matthew Dillon
ceccf6e536
Rough in detail view for characteristics
2015-09-04 10:47:32 -07:00
Matthew Dillon
f59de829ee
Restructuring forms
2015-09-04 10:30:36 -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
e58d01f999
Removing measurements route
2015-09-04 09:31:42 -07:00
Matthew Dillon
f25fae0a83
Edit characteristic
2015-09-04 08:45:54 -07:00
Matthew Dillon
24c870353f
'Select All' in compare.
...
Fixes #8
2015-09-03 10:50:01 -07:00
Matthew Dillon
1ee73a342e
Fixed sort order in strains list
2015-09-03 08:41:17 -07:00
Matthew Dillon
391b15cf92
genbank url for whole genome sequences
2015-08-31 13:35:01 -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
814203e19a
Merge branch 'updates'
...
* updates:
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:19:32 -07:00
Matthew Dillon
2ae0523a9f
DS deprecation (rollback)
2015-08-24 15:25:42 -07:00
Matthew Dillon
56c0e92fe6
Fix up moment js
2015-08-24 13:40:40 -07:00
Matthew Dillon
fb88f494b2
Drop brocfile
2015-08-24 13:40:33 -07:00
Matthew Dillon
2599d13b44
ember-cli 1.13.8
2015-08-24 13:28:19 -07:00
Matthew Dillon
f1a1b1f63a
Fix transition deprecation
2015-08-24 12:28:14 -07:00
Matthew Dillon
3a03dbe92f
Upgrade ember-cli-flash
2015-08-24 12:28:03 -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
37c6472512
Enabling user zoom
2015-07-20 15:03:46 -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
1d0d948c29
Fix broken strain reference
2015-07-20 12:17:38 -08:00
Matthew Dillon
8ab9312b9e
Rich text species and strains
2015-07-20 12:17:37 -08:00
Matthew Dillon
c276cdc74c
Add in quill WYSIWYG
2015-07-20 12:17:32 -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
da4ebc9b29
Add CSV download for compare (change backing service, too)
2015-07-17 16:38:52 -08:00
Matthew Dillon
7c194447f7
Drop new user component, for now
2015-07-17 08:38:42 -08:00
Matthew Dillon
fb57534b64
Clean up some loading stuff
2015-07-17 07:32:53 -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
1bb5dc67b2
Clean up forms a bit
2015-07-16 21:23:35 -08:00
Matthew Dillon
226a82d57f
Missing import in ajax-request
2015-07-16 21:15:51 -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
c51a1deeab
Handle user lockouts (new authenticator added)
2015-07-16 18:47:12 -08:00
Matthew Dillon
c7dc14d4f9
catch split exception in parsebase64
2015-07-16 12:56:19 -08:00
