TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,033 Commits 1 Branch 0 Tags
79e40013e2bb4ecdf8b3974c190618bc77bbec7a
Commit Graph

292 Commits

Author SHA1 Message Date
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
7128739da5 Finished currency edition 2013-09-03 19:03:54 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
 2013-09-03 19:03:27 +02:00
franck
fce528c41f Added AdminUtilities Smarty plugin, optimized templates 2013-09-03 15:43:05 +02:00
gmorel
89edb958e5 WIP 
- Coupon create
 2013-09-03 14:04:05 +02:00
mespeche
5bd501315d Max usage field and Is enabled field updates 2013-09-03 12:31:57 +02:00
mespeche
94b1e3f5ff Max usage gestion 2013-09-03 12:31:17 +02:00
Manuel Raynaud
e4d59fc2e0 Merge branch 'master' of github.com:thelia/thelia 2013-09-03 11:28:13 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
mespeche
0754a1d880 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 2013-09-03 11:09:25 +02:00
mespeche
9dc8518202 Working 
Update of edit view
- Add Is unlimited field
 2013-09-03 11:04:55 +02:00
gmorel
6ee99b6cad Working 
- implementation Coupon Read page
 2013-09-03 11:02:02 +02:00
mespeche
42175ca4eb Working 
- Add Jqueryui theme
- Change values in edit page
- Add filter on list page
 2013-09-03 10:45:06 +02:00
Manuel Raynaud
1e6a31d1a3 Merge branch 'install' into reloadTask 2013-09-03 10:30:21 +02:00
Manuel Raynaud
50e585044f initialize step 2 2013-09-02 19:56:34 +02:00
Manuel Raynaud
73508028b4 create layout for install template 2013-09-02 17:44:22 +02:00
Manuel Raynaud
384b0cd355 start to create install template 2013-09-02 17:27:11 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
mespeche
71d557020f WIP 
Add slider and others filter on tablesorter
 2013-09-02 16:39:57 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
mespeche
f48de82e96 WIP 
Filters input on tablesorter tables
 2013-09-02 15:10:07 +02:00
mespeche
7f3e90555a Working 
Implementation of metadata for the exclusion of certain columns
 2013-09-02 12:38:52 +02:00
mespeche
34c201d5d9 Working 
Tablesorter styles
 2013-09-02 10:12:17 +02:00
mespeche
1a5c667c83 Working 
Merge of Frank's updates
 2013-09-02 09:51:31 +02:00
mespeche
034c9f6050 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	templates/admin/default/assets/css/admin.less
 2013-09-02 09:41:30 +02:00
mespeche
fb459eea8f WIP 
Modification message d'erreur miniBrowser
 2013-09-02 09:35:17 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
mespeche
fe859591f4 WIP 
Refonte et mise en place du minibrowser
 2013-08-30 16:32:01 +02:00
mespeche
64698b1d3d Working 
Remise en place du chartage CSS du composant datepicker et ajout de la
mixin gradient
 2013-08-30 16:01:40 +02:00
mespeche
031ba3d19c Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:50:40 +02:00
mespeche
e5f8f65f77 WIP 
Suite de mise en place de la page d'édition des coupons avec miniBrowser
 2013-08-30 15:47:13 +02:00
gmorel
180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:43:43 +02:00
Etienne Roudeix
e63ff065c7 product page 2013-08-30 15:04:08 +02:00
Etienne Roudeix
c0a4b8b987 Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
 2013-08-30 15:02:48 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
mespeche
0d4b992bc6 WIP 
Réorganisation des scripts
 2013-08-30 08:54:03 +02:00
mespeche
db102a5329 Working 
Supprésion de cette version de jQuery
 2013-08-30 08:52:37 +02:00
mespeche
ed763344ec WIP 
Début de mise en place de coupon/add (coupon/edit)
 2013-08-29 17:51:50 +02:00
Michaël ESPECHE
4b9a54fa68 WIP 
- Implémentation coupon/list en cours
- Implémentation coupon/read OK
- Implémentation coupon/edit en cours
 2013-08-29 16:16:21 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00