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

2019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
54242eef43 clear cache at end process 2013-10-24 08:54:20 +02:00
Manuel Raynaud
3f7300bdee add some control for knwoing if user is in install mode 2013-10-24 08:31:49 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
Franck Allimant
7ca2399573 Worked on catalog 2013-10-23 23:47:44 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
Manuel Raynaud
fa99482f46 update phpdoc 2013-10-23 19:54:28 +02:00
Manuel Raynaud
f6b20f813f add customer order list 2013-10-23 19:53:47 +02:00
Manuel Raynaud
4db360a22a Merge branch 'master' of github.com:thelia/thelia 2013-10-23 19:34:28 +02:00
Manuel Raynaud
fc49b13ef8 remove composer.phar from tracked files 2013-10-23 19:33:35 +02:00
Etienne Roudeix
7433971515 Merge branch 'master' of github.com:thelia/thelia 2013-10-23 19:23:53 +02:00
Etienne Roudeix
d1024c6841 fix minor admin bugs 2013-10-23 19:23:29 +02:00
Manuel Raynaud
bfbb9c46db hide default_lang_without_translation config parameter 2013-10-23 19:21:30 +02:00
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
Etienne Roudeix
fb66f5a021 fix insert 2013-10-23 08:48:59 +02:00
Manuel Raynaud
e824907854 Merge pull request #48 from thelia/coupon 
Coupon
 2013-10-22 23:30:17 -07: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
0d242a4fc0 fix auth loop on index 2013-10-22 16:53:40 +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
Manuel Raynaud
5755da1e8c change newsletter success message 2013-10-22 11:22:23 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00