Commit Graph

  • 3eb644feb0 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-07-09 11:49:19 +02:00
  • 40160948d3 update travis file Manuel Raynaud 2013-07-09 11:48:59 +02:00
  • 1a6cde1c65 update composer.lock file Manuel Raynaud 2013-07-09 11:47:24 +02:00
  • aa6fe04eec Merge branch 'master' of https://github.com/thelia/thelia franck 2013-07-09 11:45:01 +02:00
  • dd05888450 Added Auth loop franck 2013-07-09 11:42:25 +02:00
  • 89a8ef80fe remove break line from regex Manuel Raynaud 2013-07-09 11:41:59 +02:00
  • 7b0f2aa8eb test regex for logger Manuel Raynaud 2013-07-09 11:38:32 +02:00
  • 7276ca47f5 test new regex for log test Manuel Raynaud 2013-07-09 11:29:18 +02:00
  • ed74ca53dd fix datetime regex Manuel Raynaud 2013-07-09 11:23:45 +02:00
  • 9db64bbe78 complete install command and fix travis file Manuel Raynaud 2013-07-09 10:52:37 +02:00
  • 66d2451def add travis file Manuel Raynaud 2013-07-09 10:24:10 +02:00
  • 25a8b28c61 track composer.lock file Manuel Raynaud 2013-07-09 10:19:35 +02:00
  • 58bcc10a75 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-07-09 09:52:38 +02:00
  • 3f1547a1f3 remove unused "use" namespaces Manuel Raynaud 2013-07-09 09:52:13 +02:00
  • fa66f3423f Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-07-09 09:38:37 +02:00
  • 6752531e04 loop arguments product loop Etienne Roudeix 2013-07-09 09:29:40 +02:00
  • 7cea85b43e Added magic method __call to access loop arguments using getArgname() franck 2013-07-08 20:04:53 +02:00
  • 07b64d7429 return $this on setPassword Manuel Raynaud 2013-07-08 14:49:00 +02:00
  • aa50413b00 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-07-08 14:15:44 +02:00
  • ab37da6eee product loop Etienne Roudeix 2013-07-08 14:15:18 +02:00
  • b130abb9c3 Added sample to pagination.html franck 2013-07-08 14:13:38 +02:00
  • a91d0e4c78 Fixed method name franck 2013-07-08 13:39:37 +02:00
  • a3f7f53d22 Fixed merge problem franck 2013-07-08 13:32:35 +02:00
  • 49605c88cc Merge branch 'master' of https://github.com/thelia/thelia franck 2013-07-08 13:26:13 +02:00
  • 2b0fdc670b Merge franck 2013-07-08 13:25:08 +02:00
  • 6890482101 Working on security franck 2013-07-08 13:22:11 +02:00
  • 5bec576b9b Integration of security franck 2013-07-08 13:20:44 +02:00
  • 58796033fa Integration of auth system franck 2013-07-08 13:19:36 +02:00
  • d68c50df95 Typo franck 2013-07-08 13:18:58 +02:00
  • 267e468a3f Merge branch 'loops' Etienne Roudeix 2013-07-08 12:02:58 +02:00
  • 4bd971e625 pagination sample Etienne Roudeix 2013-07-08 11:52:10 +02:00
  • c4014ed62e Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-07-08 11:43:57 +02:00
  • a06771bea6 extends Symfony Request Manuel Raynaud 2013-07-08 11:43:23 +02:00
  • abdff9bc1a Merge branch 'admin' franck 2013-07-08 11:27:37 +02:00
  • 8f894382f6 Fixed loop arguments franck 2013-07-08 11:03:54 +02:00
  • 5da11c253e fix propel namespaces Manuel Raynaud 2013-07-08 10:57:49 +02:00
  • 7646c05cd4 Loop arguments should now be accessed using $this->getArgValue($argname), or getArg($name)->value. Loop args initialisation is now located in BaseLoop class franck 2013-07-08 10:57:05 +02:00
  • 0b9d7d1d35 allow possibility to change PropelPDO class connection Manuel Raynaud 2013-07-08 10:44:57 +02:00
  • 0e7ea83fac add helper getLang in session Manuel Raynaud 2013-07-08 10:21:58 +02:00
  • 7b89469d06 add missing files Manuel Raynaud 2013-07-08 10:20:57 +02:00
  • a2e40872c0 extends symfony session for adding some helpers Manuel Raynaud 2013-07-08 10:10:05 +02:00
  • 6fa6756000 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-07-08 09:25:56 +02:00
  • 61fc13309d Fixed admin/master merge franck 2013-07-06 11:09:24 +02:00
  • d3a505906b Added missing MAP directory franck 2013-07-06 11:00:33 +02:00
  • 162084140e Merge remote-tracking branch 'origin/master' into admin franck 2013-07-06 10:34:09 +02:00
  • 6e5b259d44 Added Feed loop to retreive feeds using SimplePie franck 2013-07-06 10:18:19 +02:00
  • ddc6d02f80 Merge branch 'loops' Etienne Roudeix 2013-07-05 17:16:10 +02:00
  • 7f0dd5c13b product loop Etienne Roudeix 2013-07-05 17:15:22 +02:00
  • 7d3d36231f update composer php verification Manuel Raynaud 2013-07-05 16:11:05 +02:00
  • 85bb7594ee change compatibility for propel2 Manuel Raynaud 2013-07-05 15:59:41 +02:00
  • 02c9184e53 complete insert sql Manuel Raynaud 2013-07-05 14:47:15 +02:00
  • a2012259bf change getting propel connection Manuel Raynaud 2013-07-05 12:57:04 +02:00
  • e0416c08f8 fix broken test Manuel Raynaud 2013-07-05 12:13:28 +02:00
  • c27c62f3f3 use propel 2 Etienne Roudeix 2013-07-05 12:04:13 +02:00
  • f003312f82 Merge branch 'master' into loops Etienne Roudeix 2013-07-05 11:55:23 +02:00
  • faf2c1de77 product loop Etienne Roudeix 2013-07-05 11:54:26 +02:00
  • 962afc6d14 Removed shared .htaccess franck 2013-07-05 11:49:44 +02:00
  • f02ade10f8 Added SimplePie to dependencies franck 2013-07-05 11:48:21 +02:00
  • 9ed14bf7a3 change default locale to en_US Manuel Raynaud 2013-07-05 11:21:31 +02:00
  • 55a309c00a Merge branch 'master' into loops Etienne Roudeix 2013-07-05 11:16:55 +02:00
  • a7a9688d41 product lopp Etienne Roudeix 2013-07-05 11:12:51 +02:00
  • 5fbb923e40 end propel 2 migration Manuel Raynaud 2013-07-05 09:43:49 +02:00
  • 715e7ac294 Merge branch 'customer' Manuel Raynaud 2013-07-04 19:46:08 +02:00
  • 5fda702b8d migrte propel to propel 2 Manuel Raynaud 2013-07-04 19:31:09 +02:00
  • abe6064955 allow to display result or not if translation is present Manuel Raynaud 2013-07-04 18:47:20 +02:00
  • ca44544f84 manage lang for customer Manuel Raynaud 2013-07-04 18:21:24 +02:00
  • b7a8648c10 start lang management Manuel Raynaud 2013-07-04 18:10:08 +02:00
  • 3073f9a43c fix thelia diese problems Etienne Roudeix 2013-07-03 16:07:18 +02:00
  • b5d9f69212 thelia loop Etienne Roudeix 2013-07-03 15:07:49 +02:00
  • 0d1e0c6a2c fiw typo in schema model Manuel Raynaud 2013-07-03 15:05:08 +02:00
  • 89ca995f29 fix typo in phpdoc Manuel Raynaud 2013-07-03 14:45:18 +02:00
  • bc6545e914 create class form for customer modification Manuel Raynaud 2013-07-03 14:38:06 +02:00
  • b4a2862131 product loop Etienne Roudeix 2013-07-03 13:20:55 +02:00
  • 40f8c42fae Merge branch 'admin' into loops Etienne Roudeix 2013-07-03 10:53:00 +02:00
  • 92d15d44c7 new types Etienne Roudeix 2013-07-03 10:52:24 +02:00
  • 34ffdd12f5 Moved Security package to the proper location franck 2013-07-03 10:48:00 +02:00
  • 8b8ea994ef allow to reuse creation customer method for modification. Password is not mandatory Manuel Raynaud 2013-07-03 10:33:25 +02:00
  • ad8fa59e9a put form in error if saving customer fails Manuel Raynaud 2013-07-03 10:11:40 +02:00
  • 42c41d4de1 add some phpdoc Manuel Raynaud 2013-07-03 09:54:17 +02:00
  • 32f1fb3441 Merge branch 'admin' into loops Etienne Roudeix 2013-07-03 09:52:06 +02:00
  • 18e49e7ebe Introduction of loop scopes. franck 2013-07-02 19:18:41 +02:00
  • dcb3baaf4c change text name event by using TheliaEvents constant Manuel Raynaud 2013-07-02 17:26:41 +02:00
  • 09e8cb4a98 change return in customer::preInsert model Manuel Raynaud 2013-07-02 17:23:45 +02:00
  • 1128c10fa8 fix typo Manuel Raynaud 2013-07-02 17:22:54 +02:00
  • 34d7629c1d add untrack file for before commit Manuel Raynaud 2013-07-02 17:19:13 +02:00
  • aa2ebdc56c allow to change programmatically customer ref using event dispatcher Manuel Raynaud 2013-07-02 17:18:10 +02:00
  • 63e9707cc7 parser trouble sample Etienne Roudeix 2013-07-02 16:35:08 +02:00
  • 40c0da5553 loop product Etienne Roudeix 2013-07-02 16:33:43 +02:00
  • b20c44b12b Merge branch 'admin' of https://github.com/thelia/thelia into admin franck 2013-07-02 15:54:24 +02:00
  • b54fec5243 Added "remember me" field franck 2013-07-02 15:50:30 +02:00
  • 97f948e647 Added security franck 2013-07-02 15:49:29 +02:00
  • 363e0ab8ae fiw non saving customer title Manuel Raynaud 2013-07-02 15:00:34 +02:00
  • 33aba6b3d5 add missing field to customerCreation field Manuel Raynaud 2013-07-02 14:35:18 +02:00
  • e15c53625e complete CustomerCreation form Manuel Raynaud 2013-07-02 11:48:34 +02:00
  • 23aaa4951b product loop (not functional yet) Etienne Roudeix 2013-07-01 17:03:48 +02:00
  • 7382159685 create type formatter create product loop (not functional yet) Etienne Roudeix 2013-07-01 17:02:15 +02:00
  • 6f4c2f0376 Merge branch 'form' Manuel Raynaud 2013-07-01 16:57:32 +02:00
  • c10086f6c9 Introduction du package Thelia Security franck 2013-07-01 16:50:19 +02:00
  • b820afa945 continue to implement form customer Manuel Raynaud 2013-07-01 16:27:43 +02:00
  • 62a3dc3074 create creation account form Manuel Raynaud 2013-07-01 16:16:24 +02:00