TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,006 Commits 1 Branch 0 Tags
fc49b13ef86714924b30c93efe89dfc29d5a22a5
Commit Graph

1525 Commits

Author SHA1 Message Date
Manuel Raynaud
a7796cf481 manage lanf <=> url assignment 2013-10-23 19:04:49 +02:00
Manuel Raynaud
d81c384ce0 Merge branch 'master' of github.com:thelia/thelia 2013-10-23 18:02:23 +02:00
Manuel Raynaud
c924b2a5bd create form for language url 2013-10-23 18:02:04 +02:00
Etienne Roudeix
a631a4e174 fix tagged_form_field 2013-10-23 18:00:04 +02:00
Etienne Roudeix
cf67a0478e Merge branch 'master' into tax 2013-10-23 16:32:10 +02:00
Etienne Roudeix
fb8b82093a administrators management 2013-10-23 16:31:37 +02:00
Manuel Raynaud
3dd51d98b6 process default behacior for languages 2013-10-23 15:41:41 +02:00
Manuel Raynaud
5542d8c494 create lang defaultBehavior form 2013-10-23 15:03:23 +02:00
Manuel Raynaud
53e25ce7c1 process delete language 2013-10-23 12:38:33 +02:00
Manuel Raynaud
b16edfbd1d create language delete event object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 2013-10-23 12:38:32 +02:00
Manuel Raynaud
f881edbaa6 create toggleDefault method in lang method and modify in Country model 2013-10-23 12:38:32 +02:00
Manuel Raynaud
eac2c274e7 change http code status on different context 2013-10-23 12:38:32 +02:00
Manuel Raynaud
d356974ef7 create lang toggleDefault object 2013-10-23 12:38:32 +02:00
Manuel Raynaud
38761a7275 process lang udate action 2013-10-23 12:38:32 +02:00
Manuel Raynaud
a2d292f6a3 create lang object events 2013-10-23 12:38:32 +02:00
Manuel Raynaud
7915552fe6 create ajax modal for lang edition 2013-10-23 12:38:32 +02:00
Manuel Raynaud
c15431a468 create languages pages 2013-10-23 12:38:32 +02:00
Etienne Roudeix
3c69e38a3b Merge branch 'tax' 2013-10-23 08:49:24 +02:00
gmorel
52e471ab1b Working adding decrementation when coupon is consumed 2013-10-22 23:04:08 +02:00
gmorel
b45fbef2ad Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-22 23:01:04 +02:00
Etienne Roudeix
29d4ecbe35 Merge branch 'master' into tax 2013-10-22 20:20:40 +02:00
Etienne Roudeix
dba4a129ff module access management 2013-10-22 20:20:15 +02:00
Etienne Roudeix
44a5909c81 permission resource 2013-10-22 19:51:01 +02:00
Manuel Raynaud
2d987473b4 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 17:20:18 +02:00
Manuel Raynaud
0580539ed8 fix cart quantity for issue #46 2013-10-22 17:19:16 +02:00
Etienne Roudeix
ca04b87738 my bad 2013-10-22 16:13:29 +02:00
Etienne Roudeix
ddd8c4f7a5 fix auth loop 2013-10-22 15:57:31 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +02:00
Manuel Raynaud
6fef556319 Merge branch 'propel' 
Conflicts:
	install/thelia.sql
 2013-10-22 14:48:10 +02:00
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Etienne Roudeix
77dbdce4e8 fix tests 2013-10-22 11:33:01 +02:00
Etienne Roudeix
42e8b3a596 fix tests 2013-10-22 11:24:33 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
47212490d2 verify if an email already exists in newsletter table 2013-10-22 10:58:16 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
Manuel Raynaud
c9074892b2 complete controller and newsletter listener 2013-10-22 10:01:02 +02:00
Manuel Raynaud
888c2c6ab9 create routes for newsletter management 2013-10-22 09:54:44 +02:00
Manuel Raynaud
30f0973481 complete newsletter controller 2013-10-22 09:51:42 +02:00
Manuel Raynaud
f6fb778c3e create newsletter listener 2013-10-22 09:48:24 +02:00
Manuel Raynaud
f52a0f3652 create event message for newsletter subsribe action 2013-10-22 09:46:38 +02:00
Manuel Raynaud
6b8c7602b4 create newsletter event 2013-10-22 09:45:37 +02:00
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
Manuel Raynaud
f4c4cea32b create newsletter entity 2013-10-22 09:36:52 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00
Manuel Raynaud
af51086fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-22 09:12:23 +02:00
Manuel Raynaud
4630007bc2 fix typo in error message 2013-10-22 09:11:33 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
42aa46905b Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
 2013-10-21 22:49:32 +02:00