Woody Gilk
|
b1ceab8182
|
Merge branch '3.1/master' into 3.1/develop
|
2011-03-29 11:48:26 -05:00 |
|
|
Woody Gilk
|
b68b730fd0
|
Merge branch '3.0/master' into 3.1/master
|
2011-03-29 11:48:10 -05:00 |
|
|
Woody Gilk
|
2d8b2c21e9
|
Merge branch '3.0/master' into 3.0/develop
|
2011-03-29 11:48:02 -05:00 |
|
|
Woody Gilk
|
78ff7a7934
|
Merge branch 'hotfix/layout-partial' into 3.0/master
|
2011-03-29 11:47:45 -05:00 |
|
|
Woody Gilk
|
e4f538e4d7
|
Bump version number
|
2011-03-29 11:46:18 -05:00 |
|
|
Woody Gilk
|
901e5a6916
|
Layout needs to reference "content" not "body", fixes #20
|
2011-03-29 11:26:52 -05:00 |
|
|
Woody Gilk
|
eb9fc9e8c3
|
Merge branch '3.1/master' into 3.1/develop
|
2011-03-29 11:04:11 -05:00 |
|
|
Woody Gilk
|
cd21edb412
|
Merge branch 'hotfix/3.1-compatibility' into 3.1/master
|
2011-03-29 11:03:57 -05:00 |
|
|
Woody Gilk
|
185e9d4905
|
Fixes cf68822121 for Kohana 3.1 compatibility
|
2011-03-29 11:03:43 -05:00 |
|
|
Woody Gilk
|
1b6e7b7781
|
Merge branch '3.0/master' into 3.1/master
|
2011-03-29 11:00:51 -05:00 |
|
|
Woody Gilk
|
406249fe10
|
Merge branch '3.0/master' into 3.0/develop
|
2011-03-29 11:00:33 -05:00 |
|
|
Woody Gilk
|
23ffb4ffcc
|
Merge branch 'release/2.0.2' into 3.0/master
|
2011-03-29 11:00:06 -05:00 |
|
|
Woody Gilk
|
9b4ac1c1a1
|
Preparing v2.0.2 release
|
2011-03-29 10:59:44 -05:00 |
|
|
Woody Gilk
|
cf68822121
|
Use Kohana exception ::handler() rather than just ::text() to display the exception, fixes #18
|
2011-03-29 10:58:36 -05:00 |
|
|
Woody Gilk
|
1c73ca8b0b
|
Check $this->_template before detecting the template, fixes #19
|
2011-03-29 10:55:03 -05:00 |
|
|
Woody Gilk
|
8104d8f18d
|
Merge branch '3.0/develop' into 3.1/develop
|
2011-03-16 09:18:13 -05:00 |
|
|
Woody Gilk
|
e9c37fd6a0
|
Merge branch 'feature/extend-mustache' into 3.0/develop
|
2011-03-16 09:17:34 -05:00 |
|
|
Woody Gilk
|
228b8d111c
|
Added missing newline to EOF
|
2011-03-16 09:17:01 -05:00 |
|
czukowski
|
cbdd16bcb2
|
Mustache class extension
|
2011-03-16 09:15:49 -05:00 |
|
|
Woody Gilk
|
b72765a3b7
|
Merge branch '3.1/master' into 3.1/develop
|
2011-03-14 14:20:03 -05:00 |
|
|
Woody Gilk
|
e044fdb749
|
Merge branch '3.0/master' into 3.0/develop
|
2011-03-14 14:19:52 -05:00 |
|
|
Woody Gilk
|
ce5e8b0b55
|
Merge branch '3.0/master' into 3.1/master
|
2011-03-14 14:19:41 -05:00 |
|
|
Woody Gilk
|
ad890a62fa
|
Merge branch 'release/2.0.1' into 3.0/master
|
2011-03-14 14:19:31 -05:00 |
|
|
Woody Gilk
|
19bfd1e3da
|
Preparing for v2.0.1 release
|
2011-03-14 14:19:15 -05:00 |
|
|
Woody Gilk
|
4435f98cb5
|
Merge branch '3.0/master' into 3.1/master
|
2011-03-14 14:17:57 -05:00 |
|
|
Woody Gilk
|
3df8d66032
|
Merge branch 'hotfix/construct-auto-template' into 3.0/master
|
2011-03-14 14:17:48 -05:00 |
|
|
Woody Gilk
|
58c26155ee
|
Added missing template detection when using "new View_Foo" instead of "Kostache::factory(foo)"
|
2011-03-14 14:17:34 -05:00 |
|
|
Woody Gilk
|
0086a172b2
|
Merge branch '3.0/develop' into 3.1/develop
|
2011-03-01 13:52:27 -05:00 |
|
|
Woody Gilk
|
d632be3fd4
|
Added new $options parameter to Kostache::_stache() which will appear in v6.0.0 of mustache.php
|
2011-03-01 13:52:00 -05:00 |
|
|
Woody Gilk
|
ded64ea091
|
Merge branch '3.1/master' into 3.1/develop
|
2011-02-28 09:51:40 -05:00 |
|
|
Woody Gilk
|
6a8103ce84
|
Merge branch '3.0/master' into 3.0/develop
|
2011-02-28 09:51:22 -05:00 |
|
|
Woody Gilk
|
e655f3812b
|
Merge branch '3.0/master' into 3.1/master
|
2011-02-28 09:50:37 -05:00 |
|
|
Woody Gilk
|
68d00e418c
|
Merge branch '3.0/hotfix/render-tostring' into 3.0/master
|
2011-02-28 09:50:19 -05:00 |
|
|
Woody Gilk
|
c665fad5a9
|
__toString must return a string
|
2011-02-28 09:47:57 -05:00 |
|
|
Woody Gilk
|
58cd894f0e
|
Merge branch '3.1/release/v2.0' into 3.1/master
|
2011-02-25 11:54:31 -05:00 |
|
|
Woody Gilk
|
e25381a223
|
Merge branch '3.1/not-extends-mustache' into 3.1/develop
Conflicts:
classes/kohana/kostache.php
|
2011-02-25 11:53:29 -05:00 |
|
|
Woody Gilk
|
cc95479ff3
|
Merge branch '3.0/release/v2.0' into 3.0/master
|
2011-02-25 11:49:39 -05:00 |
|
|
Woody Gilk
|
00760297c4
|
Merge branch '3.0/not-extends-mustache' into 3.0/develop
|
2011-02-25 11:48:29 -05:00 |
|
|
Woody Gilk
|
d8e3a1ffbb
|
Merge branch '3.0/not-extends-mustache' into 3.1/not-extends-mustache
|
2011-02-25 11:01:38 -05:00 |
|
|
Woody Gilk
|
6cc9fa9dcd
|
Added class doc comment and LICENSE file
|
2011-02-25 11:01:20 -05:00 |
|
|
Woody Gilk
|
c1f5b5592d
|
Added $render_layout flag to Kostache_Layout
|
2011-02-25 11:01:12 -05:00 |
|
|
Woody Gilk
|
553d8dda07
|
Kohana 3.1 compatibility
|
2011-02-25 10:29:07 -05:00 |
|
|
Woody Gilk
|
3919aab096
|
Make all Kostache classes abstract
|
2011-02-24 18:34:41 -05:00 |
|
|
Woody Gilk
|
6e3e9c46de
|
Load partials defined by view in __construct
|
2011-02-24 18:20:05 -05:00 |
|
|
Woody Gilk
|
454a50e62a
|
Forgot to actually make Kostache not extend Mustache, DOH!
|
2011-02-24 18:00:13 -05:00 |
|
|
Woody Gilk
|
2739d284b3
|
Merge branch '3.1/develop' into 3.1/master
|
2011-02-24 17:49:37 -05:00 |
|
|
Woody Gilk
|
b2cba92959
|
Merge branch 'feature/3.1' into 3.1/develop
|
2011-02-24 17:49:20 -05:00 |
|
|
Woody Gilk
|
e77f6a99a2
|
Kostache not extending Mustache, aka Kostache v2.0beta1
|
2011-02-24 17:45:29 -05:00 |
|
|
Woody Gilk
|
21ec6521a4
|
Change all references to KOstache to Kostache
|
2011-02-24 15:26:09 -05:00 |
|
|
Woody Gilk
|
cd9e05b15f
|
Added security header to init.php
|
2011-02-24 15:25:49 -05:00 |
|