Commit Graph

3473 Commits

Author SHA1 Message Date
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
Dayle Rees
7298c93be1 Merge pull request #1109 from JesseObrien/feature/profiler-timers
Added profile timers
2012-08-17 13:28:28 -07:00
Jesse O'Brien
7193f29240 Added profile timers
Track the running time of a function
Profiler::time(function(){});
Profiler::time(function(){}, 'name');

Track a stopwatch style timer throughout your app
Profiler::tick('name');
Profiler::tick('name', function($timer){});
2012-08-17 16:22:12 -04:00
Taylor Otwell
1203473469 revert eloquent back to 3.2.3 2012-08-17 09:18:16 -05:00
Taylor Otwell
e8119f8109 increment version. 2012-08-17 09:04:17 -05: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
Dayle Rees
722de55eeb Merge pull request #1105 from spencerdeinum/master
Add Command::run() to artisan documentation.
2012-08-16 14:29:30 -07: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
Franz Liedke
abd30eb338 Fix contribution page links in documentation. 2012-08-15 17:26:33 +03:00
Dayle Rees
97761f08f1 missing a from attribute 2012-08-14 12:04:49 +02:00
Taylor Otwell
8dbe2d1a9a Merge pull request #681 from bencorlett/develop
Added Output Buffering
2012-08-13 12:17:35 -07:00
Taylor Otwell
64605f2223 Merge pull request #706 from Vespakoen/patch-1
(profiler doesn't show up) laravel.done event doesn't get fired for php-fcgi users
2012-08-13 12:16:08 -07:00
Taylor Otwell
feb651f630 Merge pull request #670 from kbanman/hmvc-fix
Add support for non-string parameters in controller routes
2012-08-13 12:13:58 -07:00
Taylor Otwell
fdac5e843f Merge pull request #636 from ProgerXP/patch-bexpand
Branch::expand()
2012-08-13 12:08:50 -07:00
Franz Liedke
41e3c95ed6 Add German translations for new array validator. 2012-08-13 19:03:59 +03:00
Dayle Rees
a7c2c2544e Merge pull request #1053 from tobsn/patch-12
added array and array count validation for multi-select input
2012-08-12 12:50:10 -07:00
Dayle Rees
4b8ba99211 Merge pull request #1043 from tobsn/patch-10
type boolean is tinyint(1)
2012-08-12 12:43:15 -07:00
Dayle Rees
e0338f3671 Merge branch 'core-tests' of https://github.com/franzliedke/laravel into develop 2012-08-12 16:19:13 +01:00
Kelly Banman
e3a000af41 Fix Query::lists() for empty resultsets 2012-08-11 15:52:58 -07: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
Jason Lewis
4d0f95598c Merge pull request #1079 from sineld/develop
Added Turkish language files.
2012-08-11 10:10:08 -07:00
Jason Lewis
f685597180 Defer URI language support to L4.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:16:11 +09:30
Jason Lewis
a95b5eb4b9 Defer URI language support to L4.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:15:52 +09:30
Jason Lewis
694f696cb6 Merge pull request #1063 from stayallive/develop
Changed jQuery '$' to 'jQuery' in the Profiler
2012-08-11 09:20:50 -07:00
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
7dae482708 Merge branch 'develop' into staging 2012-08-09 22:47:17 -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
29a4ac2701 Merge pull request #1049 from Apathetic012/develop
fix namespace issue on exception
2012-08-09 20:44:15 -07:00
Taylor Otwell
343d132737 tweak change log. 2012-08-09 22:42:35 -05:00
Taylor Otwell
79f92e57df defer language support in URIs to version 4. 2012-08-09 22:42:03 -05:00
Joe Wallace
d31f89d42f Fixing a bug with saving data to pivot table 2012-08-09 22:10:49 -05:00
Dayle Rees
b5e81cb33c Merge pull request #1083 from spencerdeinum/master
Input documentation fix.
2012-08-09 13:23:33 -07: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
Taylor Otwell
f5123f935a Merge pull request #1052 from sergiigrebeniuk/hotfix-phpdoc
phpdoc fixes
2012-08-09 10:02:21 -07:00
Sinan Eldem
0d718bbf30 Added Turkish language files.
Signed-off-by: Sinan Eldem <sinan@sinaneldem.com.tr>
2012-08-08 11:36:28 +03:00
Phill Sparks
ebec6ba8e0 Merge pull request #1077 from aebersold/master
Fix Documentation Error in html.md
2012-08-07 14:56:44 -07:00
Simon Aebersold
8227784e11 Documentation Error, see /laravel/html.php line 225 for reference 2012-08-07 17:24:02 +02:00
Phill Sparks
86b0ac0dff Merge pull request #1064 from jwpage/bug/fix_index_path
Update path to index view file.
2012-08-07 06:17:08 -07:00
Tobsn
43c3c2de68 fixes from testing
- all tested now - ready for merge into staging :P
2012-08-06 03:10:39 +02:00
Johnson Page
93f5785911 Update path to index view file.
Signed-off-by: Johnson Page <jwpage@gmail.com>
2012-08-05 07:51:09 +10:00