Commits · e7c67a34c496e4e4a0dc44876780eceeddfd839a · public / sequelize · GitLab

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

10 Nov, 2012 7 commits
- honor maxConcurrentQueries · e7c67a34
  Sascha Depold committed Nov 10, 2012
  
  e7c67a34 Browse Files
- merge · 360f09e1
  Sascha Depold committed Nov 10, 2012
  
  360f09e1 Browse Files
- json strings in pg · c28ffa71
  Sascha Depold committed Nov 10, 2012
  
  c28ffa71 Browse Files
- Merge branch 'pg-quoting2' of git://github.com/aslakhellesoy/sequelize into asla… · 31de4e5d
```
…khellesoy-pg-quoting2
```
  Sascha Depold committed Nov 10, 2012
  31de4e5d Browse Files
- Merge pull request #319 from guersam/master · caba7e8e
```
fix options priority (add to #315)
```
  Sascha Depold committed Nov 10, 2012
  caba7e8e Browse Files
- make sure global options are not altered · 1ff54933
  Jisoo Park committed Nov 10, 2012
  
  1ff54933 Browse Files
- fix options priority (add to #315, thanks to @mickhansen) · 9929d921
  Jisoo Park committed Nov 10, 2012
  
  9929d921 Browse Files
07 Nov, 2012 11 commits
- Fix for #305 · 9dd27b2b
  Aslak Hellesøy committed Nov 07, 2012
  
  9dd27b2b Browse Files
- rerun · bc4d02b8
  Sascha Depold committed Nov 06, 2012
  
  bc4d02b8 Browse Files
- Merge branch 'ghernandez345-master' · a3ca2c22
  Sascha Depold committed Nov 06, 2012
  
  a3ca2c22 Browse Files
- Model.find can now take an id as string · a8117182
  Sascha Depold committed Nov 06, 2012
  
  a8117182 Browse Files
- changed order of options check + check if the content of options can be an id · 8aa472cf
  Sascha Depold committed Nov 06, 2012
  
  8aa472cf Browse Files
- Merge branch 'master' of git://github.com/ghernandez345/sequelize into ghernandez345-master · 2fec91ae
  Sascha Depold committed Nov 06, 2012
  
  2fec91ae Browse Files
- update instance · 619f2957
  Sascha Depold committed Nov 06, 2012
  
  619f2957 Browse Files
- Merge branch 'update_return' of git://github.com/joshm/sequelize into joshm-update_return · 441ea3d8
  Sascha Depold committed Nov 06, 2012
  
  441ea3d8 Browse Files
- a test for correct usage of global options · a8f98af8
  Sascha Depold committed Nov 06, 2012
  
  a8f98af8 Browse Files
- local options have higher prio then global one · a9e6b87f
  Sascha Depold committed Nov 06, 2012
  
  a9e6b87f Browse Files
- add yourself to the package.json · 3949355c
  Sascha Depold committed Nov 06, 2012
  
  3949355c Browse Files
06 Nov, 2012 9 commits
- Revert "apply function options prior to global options" · a650baaa
```
This reverts commit bfbd3f1a.

It makes some test fail
```
  Jisoo Park committed Nov 06, 2012
  a650baaa Browse Files
- apply function options prior to global options · bfbd3f1a
  Jisoo Park committed Nov 06, 2012
  
  bfbd3f1a Browse Files
- removed duplicated comparison · 5de07d4b
  Jisoo Park committed Nov 06, 2012
  
  5de07d4b Browse Files
- instanceMethods and classMethods inherit global options (fix #304) · 7647c343
  Jisoo Park committed Nov 06, 2012
  
  7647c343 Browse Files
- Local options overwite global · e2c17b58
```
Replaced Utils.merge with Utils._.extend
```
  Jisoo Park committed Nov 06, 2012
  e2c17b58 Browse Files
- performance improvements · 3eb036f5
  Sascha Depold committed Nov 05, 2012
  
  3eb036f5 Browse Files
- removed handy helpers · aaf8687f
  Sascha Depold committed Nov 05, 2012
  
  aaf8687f Browse Files
- some words about collaboration · e890b938
  Sascha Depold committed Nov 05, 2012
  
  e890b938 Browse Files
- Merge remote-tracking branch 'upstream/master' into update_return · ca278d7e
  joshm committed Nov 05, 2012
  
  ca278d7e Browse Files
05 Nov, 2012 13 commits
- traviiiiiiis · d81742aa
  Jan Aagaard Meier committed Nov 05, 2012
  
  d81742aa Browse Files
- travis build · 2352589d
  Jan Aagaard Meier committed Nov 05, 2012
  
  2352589d Browse Files
- fix sequelize.query · 6a936fb3
  Jan Aagaard Meier committed Nov 05, 2012
  
  6a936fb3 Browse Files
- The code-base is now one exclamation point shorter · 746f7d97
  Jan Aagaard Meier committed Nov 05, 2012
  
  746f7d97 Browse Files
- Merge remote-tracking branch 'sdepold/master' into performancecherry · 0800fbce
  Jan Aagaard Meier committed Nov 05, 2012
  
  0800fbce Browse Files
- rebuild · fbd1246a
  Sascha Depold committed Nov 05, 2012
  
  fbd1246a Browse Files
- removed evil char · a7b58d31
  Sascha Depold committed Nov 04, 2012
  
  a7b58d31 Browse Files
- pass createdAt and updatedAt to the insert query · 6eb5078f
  Sascha Depold committed Nov 04, 2012
  
  6eb5078f Browse Files
- debugging · 9dbd0f67
  Sascha Depold committed Nov 04, 2012
  
  9dbd0f67 Browse Files
- debugging · b44da417
  Sascha Depold committed Nov 04, 2012
  
  b44da417 Browse Files
- re-enabled Sequelize#query specs · 081afe6c
  Sascha Depold committed Nov 04, 2012
  
  081afe6c Browse Files
- fixed attribute selection in test · e9c2e1dd
  Sascha Depold committed Nov 04, 2012
  
  e9c2e1dd Browse Files
- we really need proper factories -.- · af1396b9
  Sascha Depold committed Nov 04, 2012
  
  af1396b9 Browse Files