Commit Graph

70854 Commits

Author SHA1 Message Date
Frédéric FRANCE
4f9e995163
Update index.php 2019-11-05 08:17:57 +01:00
Laurent Destailleur
a8b1a75ea3
Merge pull request #12325 from frederic34/patch-6
fix indent in card-rec.php
2019-11-04 21:11:34 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
aeb2361d2d
Merge pull request #12324 from frederic34/patch-13
replace societe_id by socid
2019-11-04 20:57:43 +01:00
Laurent Destailleur
8d1cbab51a
Merge pull request #12323 from frederic34/patch-11
replace societe_id by socid
2019-11-04 20:54:21 +01:00
Laurent Destailleur
31936a0ffe
Merge pull request #12304 from frederic34/patch-3
css
2019-11-04 20:54:02 +01:00
Laurent Destailleur
bdbec58461
Merge pull request #12309 from ptibogxiv/patch-274
NEW change duration membertype
2019-11-04 20:53:42 +01:00
Laurent Destailleur
562e219cc5
Merge pull request #12314 from frederic34/patch-7
add thirdparty email in box_propales
2019-11-04 20:51:57 +01:00
Laurent Destailleur
149fcfbe3c
Merge pull request #12322 from frederic34/patch-8
Fix external/internal status in user tooltip list
2019-11-04 20:51:38 +01:00
Laurent Destailleur
e61f28ed17
Merge pull request #12318 from grandoc/new_branch_04_11_2019
fix translation
2019-11-04 20:50:58 +01:00
Frédéric FRANCE
ac783b303d
Update card-rec.php 2019-11-04 20:47:25 +01:00
Laurent Destailleur
17ea978cea
Merge pull request #12306 from frederic34/escpos
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
4566159e69
Merge pull request #12313 from frederic34/patch-6
Update list.php
2019-11-04 20:38:21 +01:00
Laurent Destailleur
c276659acd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Frédéric FRANCE
88ad997eec
Update home.php 2019-11-04 20:29:33 +01:00
Frédéric FRANCE
f6aa9bf220
Update hierarchy.php 2019-11-04 20:28:10 +01:00
Frédéric FRANCE
1c8e9fffbe
Update payout.php 2019-11-04 20:26:52 +01:00
Frédéric FRANCE
dacd7227bc
replace societe_id by socid 2019-11-04 20:23:21 +01:00
Frédéric FRANCE
4df406c985
replace societe_id by socid 2019-11-04 20:20:38 +01:00
Frédéric FRANCE
d59b0a33f3
Fix external/internal status in user tooltip list 2019-11-04 20:16:34 +01:00
Laurent Destailleur
dbb90914bc Better Trans 2019-11-04 19:53:27 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
1e44d4ec83 Fix css 2019-11-04 18:38:49 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
a0db0fccbe Debug BOM 2019-11-04 15:56:45 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
stickler-ci
4480d7dd88 Fixing style errors. 2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e fix translation 2019-11-04 15:08:43 +01:00
Laurent Destailleur
e67a1a8118 Debug 2019-11-04 14:20:42 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166 Fix look and feel v11 2019-11-04 13:32:34 +01:00
Laurent Destailleur
e2bae297ea Look and feel v11 2019-11-04 13:27:01 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Laurent Destailleur
d934f5e920 Fix wrap 2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae Fix css 2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103 css 2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843 css 2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6 Responsive 2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc
Update box_propales.php 2019-11-03 23:55:04 +01:00
Frédéric FRANCE
317ba9c047
Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-03 23:49:36 +01:00
Frédéric FRANCE
0de1c5b69d
Update list.php
Invalid argument supplied for foreach() in /htdocs/asset/list.php on line 410
2019-11-03 23:29:28 +01:00
Frédéric FRANCE
7ecdfa7c96
oups 2019-11-03 22:51:42 +01:00
Frédéric FRANCE
569c543ca0
search 2019-11-03 22:34:57 +01:00
Laurent Destailleur
4909a21f8a Fix css 2019-11-03 22:09:20 +01:00