Commits · e011a7d2ae6c40942e163d00b69a538e00a4c2ef · public / sequelize · GitLab

不要怂，就是干，撸起袖子干！

You need to sign in or sign up before continuing.

30 Jul, 2013 38 commits
- Merge branch 'master' into milestones/2.0.0 · e011a7d2
```
Conflicts:
	test/dao.validations.test.js
```
  Daniel Durante committed Jul 30, 2013
  e011a7d2 Browse Files
- Updated changelog. · 9a41b4ae
  Daniel Durante committed Jul 30, 2013
  
  9a41b4ae Browse Files
- Merge pull request #793 from durango/mysql-text · 6f5a2c50
```
MySQL will no longer try to create a text/blob column with a default value (there's no such thing). Closes #785
```
  Daniel Durante committed Jul 30, 2013
  6f5a2c50 Browse Files
- MySQL will no longer try to create a text/blob column with a default value (there's no such thing). · 0e699b63
  Daniel Durante committed Jul 30, 2013
  
  0e699b63 Browse Files
- Added more to the #create dao-validations test. · 41a9810f
  Daniel Durante committed Jul 30, 2013
  
  41a9810f Browse Files
- Added #create specs for dao-validation tests. · dbc3cdec
  Daniel Durante committed Jul 30, 2013
  
  dbc3cdec Browse Files
- Added #create specs for dao-validation tests. · 71a0d785
  Daniel Durante committed Jul 30, 2013
  
  71a0d785 Browse Files
- Merge branch 'master' into milestones/2.0.0 · f37ceaf3
  Daniel Durante committed Jul 30, 2013
  
  f37ceaf3 Browse Files
- Added #create specs for dao-validation tests. · 71f2579b
  Daniel Durante committed Jul 30, 2013
  
  71f2579b Browse Files
- Merge branch 'master' into milestones/2.0.0 · 6061e0f7
  Daniel Durante committed Jul 30, 2013
  
  6061e0f7 Browse Files
- Added more tests to sqlite specific query-generator. · 321e0444
  Daniel Durante committed Jul 30, 2013
  
  321e0444 Browse Files
- Merge branch 'master' into milestones/2.0.0 · a5636f43
  Daniel Durante committed Jul 30, 2013
  
  a5636f43 Browse Files
- Updated changelog. · d8eab0ca
  Daniel Durante committed Jul 30, 2013
  
  d8eab0ca Browse Files
- Merge branch 'master' into milestones/2.0.0 · 566bbcf5
  Daniel Durante committed Jul 30, 2013
  
  566bbcf5 Browse Files
- Fixed some async issues with mocha tests. · 1133077c
  Daniel Durante committed Jul 30, 2013
  
  1133077c
- Updated README for mocha tests. · 7e565cd7
  Daniel Durante committed Jul 30, 2013
  
  7e565cd7
- Merge branch 'master' into milestones/2.0.0 · 9f4fca12
  Daniel Durante committed Jul 30, 2013
  
  9f4fca12
- Updated depedencies (commander and generic-pool) · 9f7cd186
  Daniel Durante committed Jul 30, 2013
  
  9f7cd186 Browse Files
- Merge branch 'master' into milestones/2.0.0 · 83f94b36
```
Conflicts:
	lib/emitters/custom-event-emitter.js
	spec-jasmine/dao.spec.js
	spec/associations/has-one.spec.js
	spec/dao.spec.js
	spec/promise.spec.js
	test/dao.validations.test.js
```
  Daniel Durante committed Jul 30, 2013
  83f94b36
- Added myself onto contributors. · 610c80d0
  Daniel Durante committed Jul 30, 2013
  
  610c80d0 Browse Files
- removed specs · 754de900
  Sascha Depold committed Jul 30, 2013
  
  754de900 Browse Files
- Merge branch 'mocha' · 0638842a
  Sascha Depold committed Jul 30, 2013
  
  0638842a Browse Files
- Merge branch 'master' into mocha · 394b5ad5
  Sascha Depold committed Jul 30, 2013
  
  394b5ad5 Browse Files
- Merge branch 'mocha' of github.com:sequelize/sequelize into mocha · e22ba8ea
  Sascha Depold committed Jul 30, 2013
  
  e22ba8ea Browse Files
- Added quoteIdentifiers=true in DAO Postgres specific specs, to ensure Travis isn't confused. · fbd05339
  Daniel Durante committed Jul 29, 2013
  
  fbd05339 Browse Files
- Travis should be fixed. · 75d4d1a4
  Daniel Durante committed Jul 29, 2013
  
  75d4d1a4 Browse Files
- Postgres association tests should pass properly now. · fad4b39b
  Daniel Durante committed Jul 29, 2013
  
  fad4b39b Browse Files
- Merge branch 'mocha' of github.com:sequelize/sequelize into mocha · 72a25637
  Sascha Depold committed Jul 29, 2013
  
  72a25637 Browse Files
- Default dialect to MySQL and supressed additional echo output in the Makefile. · 71c40d61
  Daniel Durante committed Jul 29, 2013
  
  71c40d61
- travis. please use our new Makefile. you will love it. · bc44a4d7
  Sascha Depold committed Jul 29, 2013
  
  bc44a4d7 Browse Files
- removed custom stuff + referenced make all · 9248a299
  Sascha Depold committed Jul 29, 2013
  
  9248a299 Browse Files
- restructured the makefile + added spec teaser · 305a45a7
  Sascha Depold committed Jul 29, 2013
  
  305a45a7 Browse Files
- added make all · 11a2f7fb
  Sascha Depold committed Jul 29, 2013
  
  11a2f7fb Browse Files
- fixed spec · 5867c29e
  Sascha Depold committed Jul 29, 2013
  
  5867c29e Browse Files
- Merge branch 'mocha' of github.com:sequelize/sequelize into mocha · 020b4dbc
  Sascha Depold committed Jul 29, 2013
  
  020b4dbc Browse Files
- Added sinon to package. · bceb028b
  Daniel Durante committed Jul 29, 2013
  
  bceb028b Browse Files
- Merge branch 'mocha' of github.com:sequelize/sequelize into mocha · c5a5ece0
  Sascha Depold committed Jul 29, 2013
  
  c5a5ece0 Browse Files
- Removed sinon-chai references in DAO Factory tests. · 196ce6c9
  Daniel Durante committed Jul 29, 2013
  
  196ce6c9 Browse Files
29 Jul, 2013 2 commits
- Merge branch 'mocha' of github.com:sequelize/sequelize into mocha · 64349b7b
  Sascha Depold committed Jul 29, 2013
  
  64349b7b Browse Files
- Smart where object will no longer try to handle NULLs (as Sequelize currently do… · ffc8030e
```
…esn't support it as-is).
```
  Daniel Durante committed Jul 28, 2013
  ffc8030e Browse Files