Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						72cf8934c3
					 | 
					
						
						
							
							merged editmenu submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 16:06:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						627216cb77
					 | 
					
						
						
							
							some css not commited a long time ago
						
						
						
						
						
						
					 | 
					
						2015-04-19 16:05:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						8ff8fcd8da
					 | 
					
						
						
							
							merged search_api submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 16:01:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						178cfe05d0
					 | 
					
						
						
							
							merged search_api_solr submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:57:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						879cd137d5
					 | 
					
						
						
							
							merged search_api_page submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:54:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						7b975a5cab
					 | 
					
						
						
							
							merged wysiwyg submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:51:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ad76968844
					 | 
					
						
						
							
							merged views submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:48:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						c2252c8f9a
					 | 
					
						
						
							
							merged term_reference_tree submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:37:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						1be1c89407
					 | 
					
						
						
							
							WARNING don't now where i am here :/
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:33:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						aceb299147
					 | 
					
						
						
							
							merged entityreference submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:18:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						404757203b
					 | 
					
						
						
							
							merged CER submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:13:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						f0531608b7
					 | 
					
						
						
							
							merged field_group submodule. TODO test new version of field_group, IDs seem to be removed ...
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:09:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						28db07faf7
					 | 
					
						
						
							
							merged flag_lists submodule. TODO a new version is officially available compatible with flag 3 branch, TEST IT!
						
						
						
						
						
						
					 | 
					
						2015-04-19 15:01:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						88c1012c48
					 | 
					
						
						
							
							merged feedback submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:55:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						a494bb4627
					 | 
					
						
						
							
							merged materiobasemod submodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:47:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						894a4849e0
					 | 
					
						
						
							
							aadded gui_ck_fw
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:42:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						886114f49b
					 | 
					
						
						
							
							merged features sudmodule
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:34:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ae12eada47
					 | 
					
						
						
							
							changed gitignore first step of merging all subtrees second
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:22:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						51cc1bb7b2
					 | 
					
						
						
							
							changed gitignore first step of merging all subtrees
						
						
						
						
						
						
					 | 
					
						2015-04-19 13:18:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						f63556f674
					 | 
					
						
						
							
							new feature materio user import
						
						
						
						
						
						
					 | 
					
						2015-02-24 13:04:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						29079eeb84
					 | 
					
						
						
							
							updated all features with last database from inline
						
						
						
						
						
						
					 | 
					
						2015-02-23 11:27:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						bf88fdf0b9
					 | 
					
						
						
							
							added RewriteBase to .htaccess
						
						
						
						
						
						
					 | 
					
						2014-12-08 11:59:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						265c4ab336
					 | 
					
						
						
							
							fixed vreve search for free users
						
						
						
						
						
						
					 | 
					
						2014-10-31 19:12:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						c36797f2bb
					 | 
					
						
						
							
							splited search in two steps, 1 only taxonomy, 2 full text less 1
						
						
						
						
						
						
					 | 
					
						2014-10-22 20:30:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						e5b63e455f
					 | 
					
						
						
							
							removed advanced search code
						
						
						
						
						
						
					 | 
					
						2014-10-21 19:08:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ab1e9ae0ff
					 | 
					
						
						
							
							bugfixe : index on advanced search tree was wrong, wasn't tid
						
						
						
						
						
						
					 | 
					
						2014-10-03 17:28:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						6b3f29142b
					 | 
					
						
						
							
							removed a dsm()
						
						
						
						
						
						
					 | 
					
						2014-10-03 17:22:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						77450f1aad
					 | 
					
						
						
							
							removed a dsm()
						
						
						
						
						
						
					 | 
					
						2014-10-03 17:18:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						11617ec99c
					 | 
					
						
						
							
							advanced search :
						
						
						
						
						
						
						
						separate tree terms generation and form generation
fixed a php notice 
						
						
					 | 
					
						2014-10-03 16:48:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						d1b96a77a6
					 | 
					
						
						
							
							feature admin : added navigation menu link items
						
						
						
						
						
						
					 | 
					
						2014-10-01 19:01:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						077d83613e
					 | 
					
						
						
							
							bugfixe : companies page fixe views bug (relation)
						
						
						
						
						
						
					 | 
					
						2014-10-01 18:54:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						d2cffdeddd
					 | 
					
						
						
							
							improved better search
						
						
						
						
						
						
						
						activated terms filtration regarding useinadvancedsearch term field
added all children of level 2 terms 
						
						
					 | 
					
						2014-09-27 13:02:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						4237cb8edb
					 | 
					
						
						
							
							bugfixe
						
						
						
						
						
						
						
						= []; is not working on production server 
						
						
					 | 
					
						2014-09-27 10:03:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						88d4cf09dc
					 | 
					
						
						
							
							Merge branch 'bettersearch' into prod
						
						
						
						
						
						
						
						added advanced to prod branch for inline production 
						
						
					 | 
					
						2014-09-27 09:58:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						1cc9a63c46
					 | 
					
						
						
							
							code cleaning
						
						
						
						
						
						
					 | 
					
						2014-09-27 09:58:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						0bba2d0657
					 | 
					
						
						
							
							bugfixe : i18n was filtrering to much terms with taxonomy_get_tree
						
						
						
						
						
						
						
						fixed in materio_taxonomy module with query alter 
						
						
					 | 
					
						2014-09-16 21:09:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						8e138e1153
					 | 
					
						
						
							
							bugfix
						
						
						
						
						
						
					 | 
					
						2014-09-16 16:51:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ccb121e83a
					 | 
					
						
						
							
							bugfix: location change on webform adhesion block the form
						
						
						
						
						
						
						
						-> do not fill default value if form is rebuilded 
						
						
					 | 
					
						2014-09-16 16:48:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						8f54fcd944
					 | 
					
						
						
							
							some changes in the form structure
						
						
						
						
						
						
					 | 
					
						2014-09-16 16:46:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						98f738f951
					 | 
					
						
						
							
							cleaning : removed some whitespaces
						
						
						
						
						
						
					 | 
					
						2014-09-10 21:05:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ef50154a49
					 | 
					
						
						
							
							bugfixe : autocomplete and guillemets
						
						
						
						
						
						
					 | 
					
						2014-09-10 21:04:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						982122065e
					 | 
					
						
						
							
							bugfix : floders on preview mode
						
						
						
						
						
						
					 | 
					
						2014-09-10 19:51:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						80e491f1d8
					 | 
					
						
						
							
							fixed country ID on uc_checkout_form
						
						
						
						
						
						
					 | 
					
						2014-09-05 16:10:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						c5f5eb4f64
					 | 
					
						
						
							
							added some comments
						
						
						
						
						
						
					 | 
					
						2014-09-05 11:37:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						7d410e8393
					 | 
					
						
						
							
							updated subscription : removed coupons
						
						
						
						
						
						
					 | 
					
						2014-09-04 14:31:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						afce4662bd
					 | 
					
						
						
							
							fixe
						
						
						
						
						
						
					 | 
					
						2014-09-03 14:14:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						ab40bcf861
					 | 
					
						
						
							
							commented some dsm
						
						
						
						
						
						
					 | 
					
						2014-09-02 17:04:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						497a0108ae
					 | 
					
						
						
							
							added phone field to subbscription form and billing form
						
						
						
						
						
						
					 | 
					
						2014-08-28 16:42:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						9f3444676a
					 | 
					
						
						
							
							features : Materio content type
						
						
						
						
						
						
					 | 
					
						2014-08-27 16:13:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bachir Soussi Chiadmi
							
						 
					 | 
					
						
						
							
						
						0545fabe49
					 | 
					
						
						
							
							features : updated permissions for User Test UC
						
						
						
						
						
						
					 | 
					
						2014-08-27 16:04:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |