Commit Graph

2177 Commits

Author SHA1 Message Date
Taylor Otwell
363b7c54df Merge branch 'staging' into develop 2012-04-01 13:51:05 -05:00
Taylor Otwell
63ff04991b fixing merge conflicts. 2012-04-01 13:50:55 -05:00
Taylor Otwell
bf886f3271 incrementing version. 2012-04-01 13:49:56 -05:00
Taylor Otwell
d2f35900cd fix where in shortcut and response header casing problem. 2012-04-01 13:48:27 -05:00
Taylor Otwell
369ecd80f7 Merge branch 'staging' into develop 2012-03-30 08:45:16 -05:00
Taylor Otwell
b66d326ec4 Merge branch 'master' into staging 2012-03-30 08:45:04 -05:00
Taylor Otwell
b72f4e9fd9 fix change log. 2012-03-30 08:44:56 -05:00
Taylor Otwell
636d05665c fix merge conflicts. 2012-03-30 08:44:23 -05:00
Taylor Otwell
6aaf015cff incremented version and change log. 2012-03-30 08:43:10 -05:00
Taylor Otwell
75f6384767 fix eloquent->delete bug. 2012-03-30 08:41:52 -05:00
Taylor Otwell
3e0d468470 Merge branch 'staging' into develop 2012-03-29 22:11:42 -05:00
Taylor Otwell
062ae8756c fix conflicts. 2012-03-29 22:11:30 -05:00
Taylor Otwell
b870ac09dd fix front controller. 2012-03-29 22:06:39 -05:00
Taylor Otwell
67758b6932 update change log. 2012-03-29 22:06:20 -05:00
Taylor Otwell
b5dd77d387 Fixing Eloquent constructor bug.
Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
2012-03-29 22:04:04 -05:00
Taylor Otwell
579bc8719f cleaning up code. 2012-03-29 17:13:13 -05:00
Taylor Otwell
144117c0a1 cleaning up the eloquent model class. 2012-03-29 16:58:08 -05:00
Taylor Otwell
7c9228b40b update change log. 2012-03-29 16:23:15 -05:00
Taylor Otwell
cd71c1e517 added sync method to has many and belongs to entity relationship. 2012-03-29 16:20:38 -05:00
Taylor Otwell
c6125edc66 fix bug in input::except method when passing a string. 2012-03-29 15:14:46 -05:00
Taylor Otwell
270cdf2ffc Merge branch 'staging' into develop 2012-03-29 14:21:53 -05:00
Taylor Otwell
487c9314c2 Merge branch 'master' into staging 2012-03-29 14:21:43 -05:00
Taylor Otwell
15982efd11 Merge branch 'master' of github.com:laravel/laravel 2012-03-29 14:21:31 -05:00
Taylor Otwell
b2324a7575 upgrade change log for redis database option. 2012-03-29 14:21:19 -05:00
Taylor Otwell
1b67691e08 Updated change log.
Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
2012-03-29 14:13:27 -05:00
Taylor Otwell
17cabd47e6 Added to_array() and $hidden variable to the Eloquent base model.
Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
2012-03-29 14:12:03 -05:00
Taylor Otwell
713f70a777 Merge pull request #456 from Tenga/master
Updated upgrade guide, Blade was missing from aliases
2012-03-29 09:50:15 -07:00
Taylor Otwell
023dacf5e0 fix replacement of optional parameters in the URL::transpose method. 2012-03-28 13:58:02 -05:00
Taylor Otwell
6bf68aad38 update for 3.1.1 2012-03-28 11:43:32 -05:00
Taylor Otwell
720d9de582 Fix bug in eloquent model hydration.
Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
2012-03-28 11:07:26 -05:00
Drazen
176f0862aa Updated upgrade guide, Blade is also needed in the aliases
Signed-off-by: Drazen <drazen@promotim.ba>
2012-03-28 11:09:47 +02:00
Taylor Otwell
2c12be305d register symfony console namespace with autoloader. 2012-03-27 22:40:13 -05:00
Taylor Otwell
c327fdcf47 added vendor directory which contains the symfony console component. 2012-03-27 22:36:45 -05:00
Taylor Otwell
70f586281f removing tests and vendor. 2012-03-27 15:50:33 -05:00
Taylor Otwell
9eabd73b64 <auto> merging hotfixes. re-added tests into repository. 2012-03-27 15:47:04 -05:00
Taylor Otwell
8b4c17a8b6 <auto> removed unit tests from repository. 2012-03-27 15:46:51 -05:00
Taylor Otwell
fd725aca21 fixing release script. 2012-03-27 15:46:42 -05:00
Taylor Otwell
59ae60d287 fixing release script. 2012-03-27 15:45:52 -05:00
Taylor Otwell
8f22071e6f Merge branch 'develop' into testing 2012-03-27 15:44:31 -05:00
Taylor Otwell
043b2cee50 tweaking the release script. 2012-03-27 15:44:08 -05:00
Taylor Otwell
1d9a794fcd remove tests. 2012-03-27 15:43:46 -05:00
Taylor Otwell
b102155ed7 update release script. 2012-03-27 15:42:49 -05:00
Taylor Otwell
15fe1d5258 added tests to develop branch. 2012-03-27 15:41:30 -05:00
Taylor Otwell
f4258f7759 added classloader and console symfony components. 2012-03-27 15:17:02 -05:00
Taylor Otwell
2aac28e09e removed symfony components. 2012-03-27 15:13:53 -05:00
Taylor Otwell
939ef7826e added ClassLoader and Console Symfony components. 2012-03-27 15:04:41 -05:00
Taylor Otwell
9dee79ba00 Fixing SQLite connector.
Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
2012-03-27 10:25:42 -05:00
Taylor Otwell
0e6312d076 fix changelog. 2012-03-27 09:37:49 -05:00
Taylor Otwell
9356bb9213 updated change-log 2012-03-27 08:18:27 -05:00
Taylor Otwell
8af11e6d61 Fix bug in eloqueny hydrator. 2012-03-26 16:49:31 -05:00