Commit graph

436 commits

Author SHA1 Message Date
William DURAND a712d9e4aa Fixed composer 2012-04-24 12:06:37 +02:00
William Durand b874332293 Merge pull request #142 from havvg/2.0
add information on the branching model
2012-04-23 15:13:56 -07:00
Toni Uebernickel 2e00efa471 add information on the branching model 2012-04-24 00:03:22 +02:00
William Durand c032f468b3 Merge pull request #134 from mrbase/backport-slaves-configuration
Backport slaves configuration
2012-04-17 06:01:20 -07:00
ulrik nielsen 04d607bbf8 updated docs 2012-04-17 14:56:17 +02:00
ulrik nielsen 97dbf813dd slaves should only be added as child of a master connection 2012-04-17 14:25:13 +02:00
ulrik nielsen 0507a57277 Avoid error when no slave database configuration are given + adding case in the test 2012-04-17 12:12:23 +02:00
Joel Wurtz 6fe154ab94 Add slaves configuration for propel in config.yml 2012-04-17 12:10:43 +02:00
Toni Uebernickel e0d2b9f43a Merge pull request #128 from havvg/2.0
backport of DataFixtures fix by removed CLASS_DEFAULT
2012-03-14 02:53:03 -07:00
Toni Uebernickel 9491c1b27c backport f589d31 from master 2012-03-14 10:16:09 +01:00
Toni Uebernickel 01bd79c3b5 Merge pull request #126 from lucasaba/typo-fix-AbstractPropelCommand
Typo fix in AbstractPropelCommand
2012-03-12 14:37:54 -07:00
Luca Saba 77d338f39b Correct a typo in a comment in AbstractPropelCommand 2012-03-12 22:05:09 +01:00
William DURAND ebf5aece63 Removed the use of CLASS_DEFAULT constant 2012-03-03 18:47:08 +01:00
Toni Uebernickel c4459e665e Merge pull request #110 from havvg/hotfix/dataloader-array-column
add handling of array type in data loader
2012-02-23 15:24:36 -08:00
Toni Uebernickel 264708ab16 fix minor code styles 2012-02-24 00:22:04 +01:00
Toni Uebernickel 563a368687 add tests for array dump and load 2012-02-22 10:20:15 +01:00
Toni Uebernickel 82170e1718 dump array columns as array 2012-02-22 10:15:41 +01:00
Toni Uebernickel d2e2805fac add handling of array type in data loader 2012-02-21 23:37:29 +01:00
William DURAND 51b58bf428 Merge pull request #109 from real-chocopanda/fix-non-mysql-reverse
Fix propel:reverse for non-mysql databases
2012-02-21 06:59:12 -08:00
Matthieu Robin 521c978e44 fix propel:reverse command for non-mysql databases fixes #89 2012-02-21 15:15:34 +01:00
William DURAND 6bd8f77793 Merge pull request #108 from havvg/hotfix/cachedir-2.0
use configured cache directory
2012-02-18 05:27:23 -08:00
Toni Uebernickel b56f80a5a7 use configured cache directory 2012-02-18 12:56:44 +01:00
William DURAND 0dc2bd7e78 Merge pull request #104 from havvg/feature/syntax-extension
some love for the SyntaxExtension
2012-02-10 06:24:10 -08:00
Toni Uebernickel 034eb3703f add more highlights to SyntaxExtension
* add more keywords to highlight
* add highlight on query comments
* add highlight on table names
2012-02-09 15:55:27 +01:00
William DURAND 33fbd28b39 Merge pull request #102 from K-Phoen/fix-fixtures-ordering
Fix fixtures ordering
2012-02-07 08:16:17 -08:00
Kévin Gomez Pinto db8ed4da4c Fix: fixtures ordering was not handled by the FixturesLoad command 2012-02-07 16:15:54 +01:00
William DURAND 89adb254af Merge pull request #99 from francisbesset/2.0
[2.0] Fixed bug in CLI environment
2012-01-23 00:55:34 -08:00
Francis Besset 31c4b8699e Fixed bug if the cache is built out of CLI 2012-01-23 09:33:10 +01:00
William DURAND 71ccc1bc80 Merge pull request #97 from havvg/2.0
fix distributed testing environment
2012-01-13 07:54:12 -08:00
Toni Uebernickel 9618a04e23 fix distributed testing environment 2012-01-12 17:42:34 +01:00
William DURAND 654ba24db2 Removed useless text in the WDT 2012-01-02 17:31:00 +01:00
William DURAND 22e79ef973 Merge pull request #92 from docteurklein/fix_unique
fix unique validator when checked column is the first of all class fields
2011-12-23 01:58:36 -08:00
Klein Florian 995d655a6d fix unqiue validator when checked column is the first of all class fields 2011-12-23 10:29:42 +01:00
William DURAND 32423b077e Added a unit test for the previous commit 2011-12-15 17:00:52 +01:00
William DURAND c0221a604e Fixed issue when no dbname provided in the DSN 2011-12-15 16:32:05 +01:00
William DURAND 26069a0d71 Fixed test on travis-ci 2011-12-14 16:02:15 +01:00
William DURAND b644e34738 Fixed typo 2011-12-14 14:57:18 +01:00
William DURAND 31ee48bf10 fixed security user reloading when the user has been changed via a form with validation errors 2011-12-14 14:41:36 +01:00
William DURAND a7ed277e78 Fixed getPackagePrefix() method (fixes a bug on Windows platforms) 2011-12-05 23:12:56 +01:00
William DURAND 667ca20b80 Fixed AbstractDataLoader class 2011-12-05 22:22:30 +01:00
William DURAND bacae3feae Fixed transformToLogicalName() method
This fix should solve some bugs on Windows platforms.
2011-12-05 22:22:18 +01:00
William DURAND ab50b5ec39 Fixed CS 2011-12-05 18:42:24 +01:00
William DURAND 4f9a41df37 Merge pull request #81 from docteurklein/bundle-inherit
use FileLocator to handle bundle's schema inheritance
2011-11-29 07:15:14 -08:00
Klein Florian f35a6833b5 use FileLocator to handle bundle's schema inheritance 2011-11-29 16:04:35 +01:00
William DURAND 2e556b5640 Merge pull request #76 from havvg/schema-bundle-inheritance
schema bundle inheritance
2011-11-28 01:15:45 -08:00
William DURAND aa2b2c07a8 Merge pull request #78 from havvg/patch-1
fix mentioned directory to place schema files in
2011-11-28 01:13:29 -08:00
Toni Uebernickel 320c162771 add documentation about schema inheritance 2011-11-28 10:06:22 +01:00
Toni Uebernickel 9bd1c77a27 fix directory for schema files in docs 2011-11-28 10:01:18 +01:00
Toni Uebernickel 1144197d11 use iterator_count to check for schema files
Conflicts:

	Command/AbstractPropelCommand.php
2011-11-25 17:35:22 +01:00
Toni Uebernickel ec9ba0e26b add bundle inheritance to schema processing 2011-11-25 16:56:39 +01:00