Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Laurent Destailleur
|
963d5eeddf
|
Merge pull request #9387 from frederic34/camelCaps2
start changing phpcs:ignore
|
2018-09-12 21:14:34 +02:00 |
|
Laurent Destailleur
|
9d9e2bc3e3
|
Merge pull request #9405 from fmarcet/develop
NEW: Highlight lines on lists when they are checked
|
2018-09-12 20:50:42 +02:00 |
|
Frédéric FRANCE
|
ce76a2e714
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 20:21:35 +02:00 |
|
Laurent Destailleur
|
7d726f9734
|
Merge pull request #9457 from frederic34/selectbarcodetype
Selectbarcodetype
|
2018-09-12 19:02:41 +02:00 |
|
Frédéric FRANCE
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +02:00 |
|
Frédéric FRANCE
|
998b67fa98
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 18:32:15 +02:00 |
|
Laurent Destailleur
|
358bc7ab1b
|
Merge pull request #9454 from frederic34/patch-16
Update dolreceiptprinter.class.php
|
2018-09-12 18:28:10 +02:00 |
|
Laurent Destailleur
|
64d99dd302
|
Merge pull request #9459 from frederic34/patch-18
Completely comment unused code
|
2018-09-12 18:21:51 +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
|
53da80a79f
|
FIX Missing translation in predefined email to membership renewal
|
2018-09-12 12:55:10 +02:00 |
|
Philippe GRAND
|
b4cbb0561d
|
Standardize and update code
|
2018-09-11 10:36:39 +02:00 |
|
Frédéric FRANCE
|
2995208e5b
|
Completely comment unused code
|
2018-09-11 00:36:44 +02:00 |
|
Frédéric FRANCE
|
a36f41728f
|
deprecate formbarcode:form_barcode_type
|
2018-09-10 23:58:57 +02:00 |
|
Frédéric FRANCE
|
312a606345
|
deprecate formbarcode:select_barcode_type
|
2018-09-10 23:50:48 +02:00 |
|
Laurent Destailleur
|
d011204624
|
Fix switch of extrafields between all and only one entity
|
2018-09-10 17:36:46 +02:00 |
|
Frédéric FRANCE
|
2589b23464
|
Update dolreceiptprinter.class.php
|
2018-09-10 17:25:35 +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
|
8249756726
|
replace select_date
|
2018-09-09 10:40:00 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
ac8f568604
|
replace select_date by selectDate
|
2018-09-08 12:47:27 +02:00 |
|
Frédéric FRANCE
|
cb97a29fc0
|
introduce seletDate
|
2018-09-08 12:00:11 +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
|
70ba223788
|
move phpcs:ignore
|
2018-09-06 21:27:18 +02:00 |
|
Philippe GRAND
|
97c740f510
|
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
|
2018-09-06 19:28:10 +02:00 |
|
Frédéric FRANCE
|
3ecf788438
|
move phpcs:ignore
|
2018-09-06 18:29:01 +02:00 |
|
Frédéric FRANCE
|
4cbfa2073a
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 21:02:16 +02:00 |
|
Frédéric FRANCE
|
85df267a5b
|
move phpcs:ignore
|
2018-09-05 20:36:44 +02:00 |
|
Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Frédéric FRANCE
|
f7c3ca9d20
|
move phpcs:ignore
|
2018-09-05 18:49:06 +02:00 |
|
Laurent Destailleur
|
cb89942bfb
|
Add option capture on input file for photo
|
2018-09-05 16:03:10 +02:00 |
|
Frédéric FRANCE
|
ecc6c118a6
|
move phpcs:ignore
|
2018-09-04 23:26:37 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +02:00 |
|
Frédéric FRANCE
|
3847df1de6
|
move phpcs:ignore
|
2018-09-04 21:53:53 +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 |
|
Frédéric FRANCE
|
fd6281b364
|
move phpcs:ignore
|
2018-09-04 20:00:09 +02:00 |
|
Philippe Grand
|
c32c67ca57
|
Merge branch 'develop' into develop
|
2018-09-04 16:58:59 +02:00 |
|
Philippe GRAND
|
50a26aaf16
|
fix merge
|
2018-09-04 14:33:34 +02:00 |
|
Philippe GRAND
|
42565e722e
|
Standardize and update code
|
2018-09-04 13:37:00 +02:00 |
|
Philippe GRAND
|
0492492df1
|
fix merge
|
2018-09-04 12:30:06 +02:00 |
|
Ferran Marcet
|
b658626e21
|
NEW: Highlight lines on lists when they are checked
|
2018-09-04 11:54:13 +02:00 |
|
Laurent Destailleur
|
f2ec94e9fd
|
FIX #9353 Bug: html error - div inside span on graphs
|
2018-09-04 11:13:54 +02:00 |
|
Laurent Destailleur
|
c59b0f95e6
|
FIX #9403
|
2018-09-04 10:10:47 +02:00 |
|
Frédéric FRANCE
|
d08b68e8ed
|
move phpcs:ignore
|
2018-09-03 20:38:52 +02:00 |
|
Frédéric FRANCE
|
7288335c6d
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-03 19:01:11 +02:00 |
|
Philippe GRAND
|
7a0c19485e
|
fix merge
|
2018-09-03 09:34:08 +02:00 |
|
Regis Houssin
|
912c05774b
|
FIX remove deprecated triggers USER_LOG*
|
2018-09-03 09:30:36 +02:00 |
|
Frédéric FRANCE
|
e4946cc8eb
|
move phpcs:ignore
|
2018-09-03 00:03:17 +02:00 |
|