From 948ce87cd9ed34b1353501cae69c10f5299120ea Mon Sep 17 00:00:00 2001 From: syntaqx Date: Fri, 18 May 2012 23:51:00 -0600 Subject: [PATCH 1/2] added gitattributes file and updated gitignore Signed-off-by: syntaqx --- .gitattributes | 1 + .gitignore | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..21256661 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto \ No newline at end of file diff --git a/.gitignore b/.gitignore index e43b0f98..49d6cd59 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,37 @@ +# Numerous always-ignore extensions +*.diff +*.err +*.orig +*.log +*.rej +*.swo +*.swp +*.vi +*~ +*.sass-cache + +# OS or Editor folders .DS_Store +Thumbs.db +.cache +.project +.settings +.tmproj +*.esproj +nbproject + +# Dreamweaver added files +_notes +dwsync.xml + +# Komodo +*.komodoproject +.komodotools + +# Folders to ignore +.hg +.svn +.CVS +intermediate +publish +.idea \ No newline at end of file From 2c8bad7e68b930e0de4fbd1cc96a941ed575c4ec Mon Sep 17 00:00:00 2001 From: syntaqx Date: Sat, 19 May 2012 00:15:04 -0600 Subject: [PATCH 2/2] added syntax highlighting to the readme Signed-off-by: syntaqx --- readme.md | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/readme.md b/readme.md index e05ef395..37ac6038 100644 --- a/readme.md +++ b/readme.md @@ -19,29 +19,43 @@ Laravel is a clean and classy framework for PHP web development. Freeing you fro **Hello World:** - Route::get('/', function() - { - return "Hello World!": - }); +```php +find($id); +```php +with('user', $user); - }); +Route::get('user/(:num)', function($id) +{ + $user = DB::table('users')->find($id); + + return View::make('profile')->with('user', $user); +}); +``` **Redirecting & Flashing Data To The Session:** - return Redirect::to('profile')->with('message', 'Welcome Back!'); +```php +with('message', 'Welcome Back!'); +``` ### Contributing to Laravel Contributions are encouraged and welcome; however, please review the Developer Certificate of Origin in the "license.txt" file included in the repository. All commits must be signed off using the "-s" switch. - git commit -s -m "this commit will be signed off automatically!" +```bash +git commit -s -m "this commit will be signed off automatically!" +``` ### License