Commit Graph

69137 Commits

Author SHA1 Message Date
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
72895bebbf Add field twitter and facebook 2018-09-12 13:18:03 +02:00
Laurent Destailleur
53da80a79f FIX Missing translation in predefined email to membership renewal 2018-09-12 12:55:10 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Laurent Destailleur
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901 Standardize and update code 2018-09-12 10:10:07 +02:00
Philippe GRAND
05772f5327 Standardize and update code 2018-09-11 17:30:43 +02:00
Philippe GRAND
b4cbb0561d Standardize and update code 2018-09-11 10:36:39 +02:00
Philippe GRAND
f0a3d64492 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-11 10:22:00 +02:00
Laurent Destailleur
45e769243d Fix import web site 2018-09-11 00:11:14 +02:00
Laurent Destailleur
016bc6851b Fix generation of tpl 2018-09-10 23:37:51 +02:00
Laurent Destailleur
a4a4b8ddff Fix error management 2018-09-10 23:23:44 +02:00
Laurent Destailleur
b0be1ddadb Fix files generated 2018-09-10 23:20:31 +02:00
Laurent Destailleur
d2c6c7ddff Fix import 2018-09-10 22:58:34 +02:00
Laurent Destailleur
9e982e05df Fix import 2018-09-10 22:58:20 +02:00
Laurent Destailleur
280f15e8bf Fix fk_user 2018-09-10 21:55:03 +02:00
Laurent Destailleur
98c3657d45 Fix default status of website 2018-09-10 21:43:21 +02:00
Laurent Destailleur
5a279bfce0 Fix import 2018-09-10 21:25:30 +02:00
Laurent Destailleur
3de8381c20 Website module 2018-09-10 19:36:46 +02:00
Laurent Destailleur
d011204624 Fix switch of extrafields between all and only one entity 2018-09-10 17:36:46 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Laurent Destailleur
20fa294ff1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-10 01:22:16 +02:00
Laurent Destailleur
15aa99fc8e Fix css 2018-09-10 01:22:01 +02:00
Laurent Destailleur
f9e2fb7a36 Style 2018-09-10 01:16:32 +02:00
Laurent Destailleur
5719a38ea7 Work on website module. Support now links to company logos. 2018-09-09 14:05:23 +02:00
Laurent Destailleur
d86ebad006 Update doc 2018-09-09 13:28:24 +02:00
Laurent Destailleur
6b47b63e61 Code comment 2018-09-09 13:23:41 +02:00
Laurent Destailleur
f0950e4cfb Add last change date 2018-09-09 13:15:32 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Laurent Destailleur
d9eeb43118 FIX translation no visible for access forbidden 2018-09-09 11:59:38 +02:00
Philippe GRAND
804badd561 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-09 10:45:59 +02:00
Laurent Destailleur
0db7f6b8f3 Clean code 2018-09-08 23:00:17 +02:00
Laurent Destailleur
f29720cc98 Fix scrutinizer bug 2018-09-08 18:40:36 +02:00
Laurent Destailleur
84bbe8684b Fix scrutinizer 2018-09-08 18:38:24 +02:00
Laurent Destailleur
c2b3b0ce7b Fix syntax error 2018-09-08 18:28:21 +02:00
Laurent Destailleur
4017a96aef Debug website 2018-09-08 14:30:27 +02:00
Laurent Destailleur
ba71648c2d Code comment 2018-09-08 14:10:29 +02:00
Laurent Destailleur
a5edd530d2 Fix delete of website 2018-09-08 14:10:07 +02:00
Laurent Destailleur
391bb9efc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-08 13:55:38 +02:00
Laurent Destailleur
538a2cc647 NEW Add first template of website 2018-09-08 13:55:15 +02:00
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +02:00
Philippe GRAND
bd3315d5e7 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-07 19:48:13 +02:00
Laurent Destailleur
f0dafb7ae2
Merge pull request #9414 from grandoc/new_branch_03_09_2018
Standardize and update code
2018-09-07 19:40:14 +02:00
Laurent Destailleur
86cf289f14
Merge pull request #9430 from grandoc/new_branch_07_09_2018
New branch 07 09 2018
2018-09-07 19:38:57 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0
FIX : Homepage links were using wrong topmenus
2018-09-07 19:35:10 +02:00
Laurent Destailleur
e2df3fd4ad
Merge pull request #9423 from ptibogxiv/patch-55
Fix error when delete stripe customer
2018-09-07 19:34:45 +02:00
Laurent Destailleur
aa562c9c69
Merge pull request #9420 from frederic34/patch-5
Update holiday.class.php
2018-09-07 19:32:36 +02:00
Laurent Destailleur
33f71be6ef Fix gradient ok for webview 2018-09-07 19:03:53 +02:00