Commits · 7f4b0ecff6ce60bec56adf09444fdc19a4a85eeb · Jon Lachmann / docs

Browse files

Dec 01, 2014
- Merge branch '3.0-merge' of github.com:cakephp/docs into 3.0-merge · 7f4b0ecf
  euromark authored Dec 01, 2014
  
  7f4b0ecf
- Add docs about merging. · 11e11243
  euromark authored Dec 01, 2014
  
  11e11243
Nov 27, 2014
- [fr] Docs for merging parsers · d26c2d8d
  antograssiot authored Nov 27, 2014
  
  d26c2d8d
Nov 26, 2014
- Docs for merging parsers. · 0320c9da
  euromark authored Nov 26, 2014
  
  0320c9da
- Merge pull request #2045 from caBBAlainB/patch-26 · c143f186
  Anto authored Nov 26, 2014
  c143f186
- Merge pull request #2044 from caBBAlainB/patch-25 · 34bf20bd
  cake17 authored Nov 26, 2014
  34bf20bd
- [fr] Update concernant 'callback' events.rst · 99e07916
  Alain authored Nov 26, 2014
  99e07916
- [fr] Update events.rst · cf353b30
  Alain authored Nov 26, 2014
  
  cf353b30
Nov 25, 2014
- Merge pull request #2043 from antograssiot/3.0 · c5f1dac0
  cake17 authored Nov 25, 2014
  c5f1dac0
- [fr] follow #2035, 1f02e451 · c625aa69
  antograssiot authored Nov 25, 2014
  
  c625aa69
- Merge pull request #2042 from cakephp/issue-2041 · ca2eef5f
  José Lorenzo Rodríguez authored Nov 25, 2014
  ca2eef5f
- [fr] minor modification · be1a17b1
  antograssiot authored Nov 25, 2014
  
  be1a17b1
- Remove mention of the Cache.disable config flag. · 3d4f2938
  Mark Story authored Nov 24, 2014
  3d4f2938
Nov 24, 2014
- update`.::` to `. ::` to avoid `:` being displayed · 50890839
  Anthony GRASSIOT authored Nov 24, 2014
  
  50890839
- Fixing explanation for the enabled cache config · 1f02e451
  José Lorenzo Rodríguez authored Nov 24, 2014
  
  1f02e451
- Merge pull request #2036 from antograssiot/3.0 · 88c6632f
  cake17 authored Nov 24, 2014
  88c6632f
- Merge pull request #2038 from caBBAlainB/patch-23 · 4d743ae3
  Anto authored Nov 24, 2014
  4d743ae3
- Merge pull request #2039 from caBBAlainB/patch-24 · b45ff7c2
  Anto authored Nov 24, 2014
  b45ff7c2
- [fr] Update behaviors.rst · fead21f9
  Alain authored Nov 24, 2014
  fead21f9
- [fr] Update Entities.rst · 3293f2e7
  Alain authored Nov 24, 2014
  3293f2e7
- Remove duplicate and confusing ControllerTestCase docs. · 269aa740
  Mark Story authored Nov 23, 2014
  
  269aa740
Nov 23, 2014
- Merge pull request #2035 from cakephp/controller-cleanup · ea6feb46
  José Lorenzo Rodríguez authored Nov 23, 2014
  ea6feb46
- Document and add an example for setAction() · f2ea1f07
  Mark Story authored Nov 22, 2014
  
  f2ea1f07
- Reorder some sections. · 86dc956d
  Mark Story authored Nov 22, 2014
  86dc956d
Nov 22, 2014
- update format · e1b06033
  antograssiot authored Nov 22, 2014
  
  e1b06033
- [fr] typos · cef9b70d
  antograssiot authored Nov 22, 2014
  
  cef9b70d
Nov 21, 2014
- Update es and fr docs for custom validation providers. · faece0ba
  Mark Story authored Nov 20, 2014
  
  faece0ba
- Add example of custom provider near other method types. · ae8103d0
  Mark Story authored Nov 20, 2014
  ae8103d0
Nov 20, 2014
- [fr] follow #2031, 80b1ec4c , 57288770 · 63d4a5c7
  antograssiot authored Nov 20, 2014
  
  63d4a5c7
- finalize #2024 · f41cc870
  antograssiot authored Nov 20, 2014
  
  f41cc870
- Merge pull request #2031 from davidyell/patch-13 · 767c24ac
  Mark Story authored Nov 20, 2014
  767c24ac
- Merge pull request #2030 from caBBAlainB/patch-22 · 5a152ff2
  cake17 authored Nov 20, 2014
  5a152ff2
- Update events.rst · 01dc6a32
  David Yell authored Nov 20, 2014
  01dc6a32
- [fr] Update Text.rst · 09f51cc3
  Alain authored Nov 20, 2014
  
  09f51cc3
- Remove rankness · 57288770
  Andy Dawson authored Nov 20, 2014
  
  57288770
- Use simpler language in the seo section · 80b1ec4c
  Andy Dawson authored Nov 20, 2014
  80b1ec4c
- Update html.rst · 602ba11e
  cake17 authored Nov 20, 2014
  
  602ba11e
- Merge pull request #2029 from caBBAlainB/patch-21 · 45332471
  cake17 authored Nov 20, 2014
  45332471
- [fr] Update Html.rst · 538cfaf6
  Alain authored Nov 20, 2014
  
  538cfaf6
- Merge pull request #2026 from cakephp/3.0-misc · 95cdb2c2
  José Lorenzo Rodríguez authored Nov 20, 2014
  95cdb2c2