Commit Graph

214 Commits

Author SHA1 Message Date
Taylor Otwell 8a9acbccf0 Merge branch 'staging' 2012-09-01 21:50:41 -05:00
Taylor Otwell cfe5fa109a Add fix to change log. 2012-09-01 21:50:14 -05:00
Taylor Otwell 1b475d8f9c Merge pull request #1142 from HendrikJan/master
Improved code examples for inserting related models
2012-09-01 18:01:20 -07:00
Taylor Otwell 50b10fca95 Merge pull request #1132 from cmenke/master
Add Routing Wildcard '(:all)' to Documentation
2012-09-01 17:56:31 -07:00
Taylor Otwell c17c872b6a Merge pull request #1123 from daris/patch-1
Update laravel/documentation/database/fluent.md
2012-09-01 17:53:14 -07:00
Taylor Otwell c974052c13 Merge pull request #1115 from HiroKws/delete-top-anchor/doc-session.config
Deleted an anchor of top of line. Defined "config", but it was reffered ...
2012-09-01 17:50:46 -07:00
Taylor Otwell 5e11cb91ed Merge pull request #1112 from HiroKws/fix-markdown/git-docs
Change some Markdown to fit other md files' format.
2012-09-01 17:50:04 -07:00
Taylor Otwell 22962fce4a Merge pull request #1041 from Jakobud/feature/docs/templating
Reorg and Additions and Improvements to Templating Documentation
2012-09-01 17:29:41 -07:00
Taylor Otwell 8f8fa09708 Merge pull request #811 from xsbeats/feature/str_limit_exact
Feature: Str::limit_exact    limits a string including its custom ending to a specified length
2012-09-01 16:51:39 -07:00
Taylor Otwell c785067e95 Increment version and change log. 2012-08-29 14:45:22 -05:00
Taylor Otwell 928ce7c037 Merge branch 'staging' 2012-08-28 23:56:42 -05:00
Taylor Otwell 9b902427fd Updating version. 2012-08-28 23:55:04 -05:00
Taylor Otwell dd01308315 Merge pull request #1098 from franzliedke/patch-35
[Docs] Fix contribution page links
2012-08-26 19:28:56 -07:00
Taylor Otwell 7fa54c2ed9 Merge pull request #1100 from franzliedke/patch-36
[Docs] Pull request guidelines
2012-08-26 19:28:30 -07:00
Taylor Otwell b86b8ffed1 Merge pull request #1113 from HiroKws/markdown-fix/doc-change
Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
2012-08-26 19:26:46 -07:00
H.J. van Meerveld c44e69bf80 improved code to insert related models 2012-08-25 22:09:20 +02:00
Christoph Menke 20c696d4ae Added Routing Wildcard '(:all)' to Documentation 2012-08-21 17:08:21 +02:00
Tobsn 967d9898ae dann typo
i had one job…
2012-08-21 14:11:25 +02:00
Tobsn fa0fcff346 added unsigned() description
was missing…
2012-08-21 14:09:41 +02:00
Tobsn 161ae3f6e6 Docu on how to ensure foreign() works
tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
2012-08-21 00:12:29 +02:00
Tobsn 546c962612 Revert "Docu on how to ensure foreign() works"
This reverts commit b92f5bc854.
2012-08-21 00:10:03 +02:00
Tobsn b92f5bc854 Docu on how to ensure foreign() works
tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
2012-08-21 00:09:01 +02:00
daris be7544b67a Update laravel/documentation/database/fluent.md
Missing comma
2012-08-19 19:05:45 +03:00
Hirohisa Kawase aca179cb95 Deleted an anchor of top of line. Defined "config", but it was reffered from no where. So, keep code simple.
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
2012-08-18 21:57:54 +09:00
Hirohisa Kawase 359ee49f37 Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
2012-08-18 20:40:56 +09:00
Hirohisa Kawase 973551cd8d Change some Markdown to fit other md files' format.
Signed-off-by: Hirohisa Kawase <hiro@linux-eejv.(none)>
2012-08-18 19:46:23 +09:00
Taylor Otwell 1e20052b08 Merge branch 'staging' 2012-08-17 09:03:56 -05:00
Taylor Otwell 4d1405269c Merge branch 'develop' into staging 2012-08-17 09:02:51 -05:00
Taylor Otwell 9718d5cd0d fix nested queries. 2012-08-17 09:02:32 -05:00
Spencer Deinum 6c9d903e58 Added Command::run() to the documentation for artisan tasks.
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
2012-08-16 17:18:50 -04:00
Franz Liedke 385b776ba8 Docs: Finish section on pull request guidelines. 2012-08-15 11:47:27 -04:00
Franz Liedke f80d694a95 Contrib docs: add section stub about pull requests. 2012-08-15 10:47:51 -04:00
Franz Liedke 67464cb0f8 Fix typo in Github page table of contents. 2012-08-15 10:45:37 -04:00
Franz Liedke 1c7297dc02 Contrib docs: Remove pointless staging branch info. 2012-08-15 17:33:22 +03:00
Franz Liedke 5359085eda Fix contribution page links in documentation. 2012-08-15 17:27:50 +03:00
Jason Lewis 1bd157d0a6 Added in develop changes.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:48:55 +09:30
Taylor Otwell 43614cfeb9 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-08-09 22:50:22 -05:00
Taylor Otwell 749948bc9d fix conflicts. 2012-08-09 22:49:36 -05:00
Taylor Otwell 4d25f50f4b Merge pull request #1016 from purwandi/develop
Add decimal schema on docs
2012-08-09 20:45:11 -07:00
Taylor Otwell 343d132737 tweak change log. 2012-08-09 22:42:35 -05:00
Spencer Deinum e5dc10840a Fix documentation error in input.md
Documentation says "Replacing the entire input" but calls Input::merge()
instead of Input::replace().

Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
2012-08-09 15:44:34 -04:00
Simon Aebersold 8227784e11 Documentation Error, see /laravel/html.php line 225 for reference 2012-08-07 17:24:02 +02:00
Jakobud 761186a676 Reorganized Control Structure section.
Added Control Structure to TOC.
Added in missing @elseif example.
Move the Blade Comments to more appropriate section.
Simplified Blade Comments examples.
Minor changes to @parent example.

Signed-off-by: Jakobud <jake.e.wilson@gmail.com>
2012-07-31 12:00:47 -06:00
Dayle Rees 7256dc2a65 Merge pull request #1024 from Apathetic012/develop
add output of File::mime() example
2012-07-31 09:11:12 -07:00
Dayle Rees 30175c2a52 fixing merge issues for comment tweaks 2012-07-31 16:55:02 +01:00
Dayle Rees 2611c1f27a fixing merge issue for blade comments pull 2012-07-31 14:42:23 +01:00
Dayle Rees 9ea5018372 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-07-31 14:37:07 +01:00
Dayle Rees 9d9d1d010c fixing merge for contribution docs 2012-07-31 14:36:44 +01:00
Dayle Rees 184cc090bc Merge pull request #1026 from jbruni/patch-1
Update laravel/documentation/controllers.md
2012-07-31 02:16:36 -07:00
Dayle Rees 3a471de777 franz routing docs fix 2012-07-31 10:06:10 +01:00