Commits · aac09eca26bea754a9988fce91ceddd3f99cb122 · Jon Lachmann / docs

Browse files

Mar 22, 2016
- Merge branch '3.3' of github.com:cakephp/docs into 3.3 · aac09eca
  Mark Story authored Mar 21, 2016
  
  aac09eca
- Merge branch '3.0' into 3.3 · c0e00738
  Mark Story authored Mar 21, 2016
  
  c0e00738
Mar 21, 2016
- Merge pull request #3840 from joshwyrick/3.3 · fffa4286
  Mark Story authored Mar 21, 2016
  fffa4286
- Misspellings/typos · 87dd6fd2
  joshwyrick authored Mar 21, 2016
  
  87dd6fd2
- [ja] #3838 · 53ed2205
  OKINAKA Kenshin authored Mar 21, 2016
  
  53ed2205
- Merge pull request #3839 from cakephp/issue-8440 · 7f519550
  José Lorenzo Rodríguez authored Mar 21, 2016
  7f519550
- Attempt to clarify how to update existing junction data. · a88c9dd8
  Mark Story authored Mar 20, 2016
  a88c9dd8
- Merge pull request #3838 from cakephp/lorenzo-patch-1 · 1c3b13b8
  Mark Story authored Mar 20, 2016
  1c3b13b8
Mar 20, 2016
- Typo · ac43b25e
  Marc Würth authored Mar 20, 2016
  
  ac43b25e
- Changing sub-heading title to avoid the word "hydration" · 2f0bd3c9
  José Lorenzo Rodríguez authored Mar 20, 2016
  
  2f0bd3c9
- Merge pull request #3837 from cakephp/3.3-nested-resources · 12df9f83
  José Lorenzo Rodríguez authored Mar 20, 2016
  12df9f83
Mar 19, 2016
- Add docs for nested resource routing. · 2930bcd1
  Mark Story authored Mar 19, 2016
  2930bcd1
- Merge branch '3.0' into 3.3 · e4c4a920
  Mark Story authored Mar 19, 2016
  
  e4c4a920
- [ja] update tickets.rst · 130a6d63
  OKINAKA Kenshin authored Mar 19, 2016
  
  130a6d63
- [ja] Update tutorials-and-examples/bookmarks/intro.rst · 10cb021d
  OKINAKA Kenshin authored Mar 19, 2016
  
  10cb021d
Mar 18, 2016
- [ja] #3833 · 5b5699f8
  OKINAKA Kenshin authored Mar 19, 2016
  
  5b5699f8
- Merge pull request #3833 from ionas/patch-28 · 34d0e033
  Mark Story authored Mar 18, 2016
  34d0e033
- Merge pull request #3834 from ionas/patch-29 · 8370d669
  Mark Story authored Mar 18, 2016
  8370d669
- Merge pull request #3835 from ionas/patch-30 · 199172a9
  Mark Story authored Mar 18, 2016
  199172a9
- fix wording · 431c4588
  Jonas authored Mar 18, 2016
  
  431c4588
- fix typo · d2040f2d
  Jonas authored Mar 18, 2016
  
  d2040f2d
- Make sure composer is recent · e26da4a4
  Jonas authored Mar 18, 2016
  e26da4a4
- comma · 9f750d76
  Jonas authored Mar 18, 2016
  
  9f750d76
- Make sure composer is recent · 8254033e
  Jonas authored Mar 18, 2016
  8254033e
- Make sure composer is recent · 7d219f45
  Jonas authored Mar 18, 2016
  
  7d219f45
- Merge pull request #3832 from cakephp/issue-3831 · 29b35a70
  José Lorenzo Rodríguez authored Mar 18, 2016
  29b35a70
- Merge pull request #3828 from gr-ishiguro/translation/ja_chronos · 4bf1f178
  Kenshin Okinaka authored Mar 18, 2016
  4bf1f178
- fix. means of translation for japanese · dfd08078
  gr-ishiguro authored Mar 18, 2016
  
  dfd08078
- Add more wholesome example for blog-auth tutorial. · 9b00bbdd
  Mark Story authored Mar 17, 2016
  9b00bbdd
Mar 17, 2016
- fix. mistake of translation · 2121cf67
  gr-ishiguro authored Mar 17, 2016
  
  2121cf67
- fix. indent · 401af8dd
  gr-ishiguro authored Mar 17, 2016
  
  401af8dd
- Merge pull request #3830 from jeffblack360/patch-39 · 519341d8
  Mark Story authored Mar 16, 2016
  519341d8
- Update tickets.rst · f00debc8
  JB authored Mar 16, 2016
  f00debc8
Mar 16, 2016
- Merge pull request #3829 from curtisgibby/patch-1 · f8b2e696
  Anto authored Mar 16, 2016
  f8b2e696
- Fix language error · e01250d5
  Curtis Gibby authored Mar 16, 2016
  e01250d5
- fix. indent · a90884ec
  gr-ishiguro authored Mar 17, 2016
  
  a90884ec
- translate ja/chronos · 813d403b
  gr-ishiguro authored Mar 17, 2016
  
  813d403b
- [ja] #3772, a5e35d70 · 5d48dbdd
  OKINAKA Kenshin authored Mar 16, 2016
  
  5d48dbdd
- [ja] #3819 · 292e2755
  OKINAKA Kenshin authored Mar 16, 2016
  
  292e2755
- [ja] #3823, 8f342542 · db02b61e
  OKINAKA Kenshin authored Mar 16, 2016
  
  db02b61e