3348 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	da5890e584	Update adherent.class.php	2019-10-07 20:32:51 +02:00
ptibogxiv	ff992d996c	Update type_translation.php	2019-10-07 13:37:35 +02:00
ptibogxiv	decbdaa5af	Rename traduction.php to type_translation.php	2019-10-07 13:35:40 +02:00
Laurent Destailleur	e02794248e	Merge branch 'develop' into patch-264	2019-10-07 13:25:16 +02:00
Laurent Destailleur	c2a7ae23bc	Merge pull request #12034 from aspangaro/11_faicon ... Fix Fa-icon	2019-10-07 13:03:27 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Alexandre SPANGARO	ddadff5731	Add globe fa-icon	2019-10-03 21:32:55 +02:00
Frédéric FRANCE	98023353fe	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-03 17:21:31 +02:00
Sebastien Baguet	5dbf34a864	Small fix on a query	2019-10-03 13:34:47 +02:00
stickler-ci	09b423d14d	Fixing style errors.	2019-10-02 22:35:09 +00:00
Sebastien Baguet	9daffcbe07	Fix for no subscription members	2019-10-03 00:29:41 +02:00
Frédéric FRANCE	3afb4355a8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-02 18:59:18 +02:00
Laurent Destailleur	d8a8c4fbe6	Look and feel v11. Picto are fontawesome.	2019-10-02 18:36:36 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
Frédéric FRANCE	010b2723b6	work on migration script	2019-10-01 20:14:06 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Frédéric FRANCE	1b151da776	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-29 11:28:54 +02:00
Laurent Destailleur	db32ca99c6	Fix translation and sql request	2019-09-28 12:36:09 +02:00
Laurent Destailleur	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Alexandre SPANGARO	e38bb89a2e	NEW Add fa_icon on load_fiche_titre	2019-09-27 11:48:40 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +02:00
Alexandre SPANGARO	1e49fd0d45	Translate	2019-09-20 15:07:58 +02:00
Alexandre SPANGARO	e32772fdc5	Translate	2019-09-20 09:44:49 +02:00
Alexandre SPANGARO	278312f38f	Translate	2019-09-20 07:02:14 +02:00
Alexandre SPANGARO	b3807bbb20	Merge branch 'develop' into 11.0_translation	2019-09-19 22:34:43 +02:00
Alexandre SPANGARO	4819414d3a	Translate and some fix	2019-09-19 22:33:26 +02:00
stickler-ci	8d8ded324d	Fixing style errors.	2019-09-17 11:56:16 +00:00
ptibogxiv	a295d57e0c	Update adherent_type.class.php	2019-09-17 13:54:17 +02:00
ptibogxiv	c01ab4ab53	Update adherent_type.class.php	2019-09-17 13:53:34 +02:00
ptibogxiv	cff6da34df	Create traduction.php	2019-09-17 13:53:06 +02:00
Frédéric FRANCE	ccaa4cc1f3	work on contact	2019-09-14 16:35:18 +02:00
Frédéric FRANCE	af63ac4051	work on contact	2019-09-14 13:31:26 +02:00
Frédéric FRANCE	1cd59cc16a	work on user	2019-09-14 11:26:31 +02:00
Frédéric FRANCE	de3a67f5bd	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-12 21:52:06 +02:00
Frédéric FRANCE	cd109d04cd	add function	2019-09-12 20:44:24 +02:00
Frédéric FRANCE	fa44af1df8	work on user	2019-09-12 20:03:28 +02:00
Frédéric FRANCE	e4a0de245a	work on user	2019-09-12 18:41:26 +02:00
Laurent Destailleur	84e197e48a	Clean code	2019-09-12 00:09:49 +02:00