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
acb17480ec
Merge branch 'master' into clostridium
...
* master:
select2 4.0
2015-11-17 12:34:20 -07:00
Matthew Dillon
4e5a91f776
select2 4.0
2015-11-17 12:33:30 -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
14be82212d
ember 2 series
2015-11-17 08:11:59 -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
6b30b33281
Remove quint-notifications
...
Trying on travis
2015-11-16 12:42:02 -07:00
Matthew Dillon
9218c29c0e
Tweaking bower.json to fix CI build errors
2015-11-16 12:25:27 -07:00
Matthew Dillon
8730b6659f
fixed merge conflict in tests/index
2015-11-13 08:33:04 -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
Matthew Dillon
2313135e68
ember-cli-mirage
2015-11-02 16:28:57 -07:00
38daf6ea5b
fixing config
2015-10-20 16:46:11 -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
56c0e92fe6
Fix up moment js
2015-08-24 13:40:40 -07:00
Matthew Dillon
2599d13b44
ember-cli 1.13.8
2015-08-24 13:28:19 -07: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
c276cdc74c
Add in quill WYSIWYG
2015-07-20 12:17:32 -08:00
Matthew Dillon
f295082592
update merge from master
2015-07-13 16:32:03 -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
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
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
cf44f33f39
Drop nprogress
2015-06-11 11:19:27 -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
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
ad13323d24
ember-cli 0.2.2
2015-03-31 09:06:26 -08:00
Matthew Dillon
8e37bce7c7
Swapped custom auth for component.
2015-03-23 14:17:57 -08:00
Matthew Dillon
c886a51b7d
Add moment.js support
2015-03-19 09:17:09 -08:00
Matthew Dillon
82c3bd9e38
Upgrade to ember-cli 0.2.0
2015-03-12 16:23:30 -08:00
Matthew Dillon
d606ba2228
Upgrade ember-cli to v0.2.0-beta.1. Closes #4 .
2015-02-27 14:17:54 -09:00
Matthew Dillon
ab2866df5b
Refs #1 : Simple initial take at progress bar.
2015-02-26 20:46:56 -09:00
Matthew Dillon
b1275edfd0
Upgrade ember-cli 0.1.9
2015-01-27 12:54:20 -09:00
Matthew Dillon
008d093520
Not sure how I missed this.
2015-01-22 09:24:18 -09:00
Matthew Dillon
0e16d2b0f4
Readme, quick bootstrapping, login, ember-data check
...
sdfsdf
2015-01-15 12:07:19 -09:00
Matthew Dillon
978dacb16e
install ember-cli-simple-auth
2015-01-15 11:54:04 -09:00
Matthew Dillon
e0a99a5f27
Upgrade ember-cli 0.1.7
2015-01-15 11:54:04 -09:00
Matthew Dillon
73485742de
Use flakes (getflakes.com)
2015-01-12 16:40:12 -09:00
