Commit graph

60 commits

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
6d97466075 ember-cli 1.13.13 2015-11-28 11:34:04 -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
bb1efd6733 ember 2.2.0 & ember-data 2.2.1 2015-11-25 21:47:51 -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
04d05f9795 ESA 1.0.1 2015-11-16 18:29:06 -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
d05c31cc94 Dropping ember-select2 for custom component
Fixes #53
2015-11-13 15:13:46 -07:00
Matthew Dillon
28e82d59ba ember-cli 1.13.12 2015-11-13 08:55:20 -07:00
Matthew Dillon
8730b6659f fixed merge conflict in tests/index 2015-11-13 08:33:04 -07:00
Matthew Dillon
b12ff0eb20 ember-ajax
Fixes #37
Fixes #38
2015-11-12 13:32:41 -07:00
Matthew Dillon
1fe7702430 ember-cli 1.13.11 2015-11-12 06:36: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
406a33ccdb ember-one-way-input 2015-11-03 14:15:35 -07:00
Matthew Dillon
2313135e68 ember-cli-mirage 2015-11-02 16:28:57 -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
5ec6a049d6 Upgrade ember-cli-flash
Closes #30
2015-10-29 13:05:43 -07:00
38daf6ea5b fixing config 2015-10-20 16:46:11 -07:00
1aa8d8d88d Clear out old stuff 2015-10-20 10:40:23 -07:00
131c59daa2 Update package, drop esa-token 2015-10-20 10:24:58 -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
33ed70caaf ember 1.13.7 & ember-data 1.13.13 2015-10-01 07:45:08 -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
2599d13b44 ember-cli 1.13.8 2015-08-24 13:28:19 -07:00
Matthew Dillon
3a03dbe92f Upgrade ember-cli-flash 2015-08-24 12:28:03 -07:00
Matthew Dillon
f295082592 update merge from master 2015-07-13 16:32:03 -08:00
Matthew Dillon
b78aa571ee Remove ember-table and measurements 2015-07-10 12:33:12 -08:00
Matthew Dillon
58779a4a7d ember-cli 1.13.1 2015-07-09 16:08:09 -08:00
Matthew Dillon
8ab97c00e1 Updated merge from master 2015-07-07 14:41:40 -08:00
Matthew Dillon
de15fd0a30 Scrubbing out test server --- going to use golang dev server 2015-06-28 19:58:42 -08:00
Matthew Dillon
c1b180ebac Set up ember-cli-flash 2015-06-23 16:52:06 -08:00
Matthew Dillon
0710fdf680 Upgrade ember simple auth 0.8.0 2015-06-18 14:37:22 -08:00
Matthew Dillon
6d04a8a6c8 init clostridium 2015-06-17 14:47:40 -08:00
Matthew Dillon
3c1fca43b8 Rough in characteristic types, add meas optgroups 2015-06-16 15:47:29 -08:00
Matthew Dillon
8276f8df57 For now just use ember-table (revisit this) 2015-06-16 13:25:46 -08:00
Matthew Dillon
046fea2dbb select2 2015-06-12 14:46:38 -08:00
Matthew Dillon
1d8bda846d ember-cli 0.2.7 2015-06-11 11:19:27 -08:00
Matthew Dillon
459bd7d6be Upgrading authentication libs 2015-06-11 11:19:19 -08:00
Matthew Dillon
6f50a381fc ember-cli 0.2.5 (take 2) 2015-06-05 13:17:43 -08:00
Matthew Dillon
53be80d617 Dropping ember-can 2015-06-05 09:36:51 -08:00
Matthew Dillon
afcf24a8d8 Rough in species 2015-06-02 14:27:23 -08:00
Matthew Dillon
20765e5dac Revert "ember-cli 0.2.5"
Will look at this later

This reverts commit 7a24962d30.
2015-05-29 15:45:46 -08:00
Matthew Dillon
7a24962d30 ember-cli 0.2.5 2015-05-24 15:07:29 -08:00
Matthew Dillon
f3a700462d ember-cli 0.2.3 2015-04-24 11:07:27 -08:00
Matthew Dillon
ce40ef6071 Roughing in ember-can: placeholders for strain mod 2015-04-22 11:44:25 -08:00
Matthew Dillon
5048fb7695 Roughing in users resource 2015-04-10 11:51:22 -08:00
Matthew Dillon
ad13323d24 ember-cli 0.2.2 2015-03-31 09:06:26 -08:00
Matthew Dillon
c5cb0ec145 Login: display feedback. 2015-03-26 10:43:36 -08:00
Matthew Dillon
8e37bce7c7 Swapped custom auth for component. 2015-03-23 14:17:57 -08:00
Matthew Dillon
62020a9865 Cleaning out old stuff 2015-03-18 14:12:50 -08:00