Commit graph

758 commits

Author SHA1 Message Date
Jeremy Bush 85a7001503 Merge remote branch 'origin/3.1/develop' into 3.1/develop 2011-02-16 10:54:43 -06:00
Jeremy Bush b69ee1252f tracking submodules for 3.1.1 2011-02-16 10:54:30 -06:00
Kohana Builds 41b0d20468 Automated submodule update 2011-02-14 18:07:40 +00:00
Jeremy Bush 826e915f66 Tracking system submodule 2011-02-14 09:17:37 -06:00
Jeremy Bush 5370fc0b7b tracking system submodule 2011-02-14 09:04:51 -06:00
Jeremy Bush b6f5cb915c Tracking system 2011-02-14 08:48:33 -06:00
Jeremy Bush 5a30c25af1 Merge remote branch 'origin/3.1/develop' into 3.1/develop
Conflicts:
	system
2011-02-10 17:14:57 -06:00
Jeremy Bush 19ef9544bf tracking system submodule 2011-02-10 17:08:34 -06:00
Kiall Mac Innes 83e0f9d28c Updating submodules 2011-02-10 21:13:22 +00:00
Kiall Mac Innes 4ff1926f9d Updating submodules 2011-02-10 21:12:26 +00:00
Kiall Mac Innes 2869dce59f Refs #3724 - Removing unused properties from build.xml
Conflicts:

	build.xml
2011-02-10 20:58:11 +00:00
Kiall Mac Innes 591c8cb5e9 Merge branch '3.1/develop' of http://github.com/kohana/kohana into 3.1/develop 2011-02-10 20:19:06 +00:00
Kiall Mac Innes 6ec2e85553 Fixes #3657 - Environments and KOHANA_ENV
Conflicts:

	application/bootstrap.php
2011-02-10 20:18:19 +00:00
Jeremy Bush e543b9d26c Tracking system submodule 2011-02-10 12:35:48 -06:00
Jeremy Bush fb6139a67a Updating comment for symlinkd index.php behavior 2011-02-10 10:12:37 -06:00
Jeremy Bush 64e65e45dd Tracking system submodule 2011-02-10 09:52:53 -06:00
Jeremy Bush e8149aa868 tracking system submodule 2011-02-10 09:39:50 -06:00
Jeremy Bush 3815a0423f Fixing late night mistake on version number :( 2011-02-10 09:39:42 -06:00
Jeremy Bush 91527eb381 Update readme to describe release status 2011-02-09 22:52:10 -06:00
Jeremy Bush 92f0eeb98f Tracking system submodule 2011-02-09 20:03:52 -06:00
Jeremy Bush e9a7e714dc Tracking system submodule 2011-02-09 19:35:22 -06:00
Kiall Mac Innes aae5eaecbb Updating system submodule 2011-02-08 05:59:48 +00:00
Jeremy Bush 08ce1425f9 tracking submodules for release 2011-02-07 09:26:15 -06:00
Kiall Mac Innes 196c9f0e4a Merge branch '3.1/develop' into 3.1/release/3.1.0 2011-02-06 05:41:51 +00:00
Kiall Mac Innes 3e2e5251ef Updating modules 2011-02-06 05:41:06 +00:00
Kiall Mac Innes 7e12545e3b Merge branch '3.1/develop' into 3.1/release/3.1.0 2011-02-02 01:44:42 +00:00
Kiall Mac Innes 5d8e77f48d Updating system 2011-02-02 01:44:25 +00:00
Kiall Mac Innes 85cb95f419 Merge branch '3.1/develop' into 3.1/release/3.1.0 2011-02-02 01:10:29 +00:00
Kiall Mac Innes 5f3a8fa858 Updating system submodule. 2011-02-02 01:09:54 +00:00
Kiall Mac Innes d7792a42f8 Updating system submodule 2011-02-02 01:06:05 +00:00
Kiall Mac Innes 6194aec3d1 Merge branch '3.1/develop' into 3.1/release/3.1.0 2011-02-01 17:00:09 +00:00
Kiall Mac Innes 7814721049 Updating cache submodule 2011-02-01 16:53:07 +00:00
Kiall Mac Innes 4004a79f33 Updating submodules. 2011-02-01 16:45:45 +00:00
Kiall Mac Innes 746de0a93c Adding MySQL test to install.php 2011-01-16 08:47:58 +00:00
Kiall Mac Innes 88157d6965 Updating install.php to test for PECL http 2011-01-16 08:44:13 +00:00
Kiall Mac Innes e3c355d383 Fixed merge error in build.xml 2011-01-16 08:06:58 +00:00
Kiall Mac Innes 00b9055e7f Merge branch '3.1/develop' into 3.1/release/3.1.0
Conflicts:
	build.xml
	system
2011-01-16 07:55:58 +00:00
Kiall Mac Innes 12f557ef3f Updating submodules 2011-01-16 07:50:08 +00:00
Jeremy Bush 419d2e9207 Tracking 3.1.0-rc2 system 2011-01-15 17:09:05 -06:00
Kiall Mac Innes 78eeba6d99 Updating system submodule. 2011-01-15 22:42:10 +00:00
Kiall Mac Innes d54975430a Updating submodules 2011-01-15 22:08:53 +00:00
Kiall Mac Innes f3045e2ca6 Updating submodules 2011-01-15 21:44:32 +00:00
Kiall Mac Innes 1f381ae742 Updating ORM submodule 2011-01-15 19:11:12 +00:00
Kiall Mac Innes 53e92ccdb5 Updating submodules. 2011-01-15 17:45:27 +00:00
Kiall Mac Innes 1a0a0b52ce Switching submodules from git:// to http:// 2011-01-14 18:57:33 +00:00
Kiall Mac Innes 04b537756e Updating submodules 2011-01-14 18:55:01 +00:00
Kiall Mac Innes 4232b61973 Updating submodules. 2011-01-14 15:03:26 +00:00
Isaiah DeRose-Wilson 9af922510d Removed oauth and pagination from .gitmodules-dev 2011-01-13 01:22:52 -05:00
Isaiah DeRose-Wilson 96f2f5f52a Updating submodules 2011-01-13 00:58:10 -05:00
Isaiah DeRose-Wilson 748ee22854 Removed oauth and pagination modules from build.xml and bootstrap.php refs 8bfabf79a0 2011-01-13 00:05:09 -05:00