Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,955 Commits 36 Branches 189 Tags
8b718d0cb1ea04aecf4723625f1750d940f5c38a
Commit Graph

262 Commits

Author SHA1 Message Date
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
a31c4aff52 Fix picto for status of cron task 2018-12-12 12:21:02 +01:00
Laurent Destailleur
c09d454938 Fix status in cron task list 2018-12-12 12:16:57 +01:00
Laurent Destailleur
f0ab6e60ec FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
c2f73ddf13 Standardize and update code 2018-10-10 09:20:50 +02:00
Philippe GRAND
da560289e3 Standardize code 2018-10-05 15:48:38 +02:00
Philippe GRAND
15ff9f8917 Standardize and update code 2018-09-28 14:44:47 +02:00
Laurent Destailleur
86bc1c813c Fix warnings 2018-09-18 23:45:22 +02:00
Laurent Destailleur
7dba51c9a8 Fix warning 2018-09-18 23:39:49 +02:00
Laurent Destailleur
8a43fe22cc FIX warning picto when next run date passed 2018-09-18 23:25:38 +02:00
Frédéric FRANCE
0e0197f246 reduce complexity of cronjob class 2018-09-16 19:26:49 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a3fa13994b replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Frédéric FRANCE
4e619dd0ed Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Laurent Destailleur
94c05fbd84 Look and feel v8 2018-09-04 00:29:31 +02:00
Frédéric FRANCE
3e723af018 start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Frédéric FRANCE
cbdc669ba9 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
1842a4bb41 Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Philippe GRAND
06da7f54a2 Update and standardize code 2018-08-22 18:48:53 +02:00
Laurent Destailleur
b86d54cab3 Trad 2018-08-21 14:05:53 +02:00
Laurent Destailleur
243cbbc11d Fix missing trans 2018-08-21 13:58:24 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
dcd43b715a Fix look and feel v8 2018-06-16 23:51:30 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
b8e927d347 Merge pull request #8915 from grandoc/new_branch_04_06_2018 
clean and update code
 2018-06-13 20:16:19 +02:00
Laurent Destailleur
186df884fa Trans 2018-06-07 09:37:12 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00