Commit Graph

81180 Commits

Author SHA1 Message Date
Laurent Destailleur
e6af288fb3 Merge pull request #12328 from frederic34/patch-6
fix missing newtoken in form
2019-11-05 10:04:16 +01:00
Laurent Destailleur
57a7370f22 Merge pull request #12327 from frederic34/patch-3
config file doesn't exists
2019-11-05 10:04:01 +01:00
Philippe GRAND
4acc107191 fix bad setEventMessages 2019-11-05 10:01:21 +01:00
Laurent Destailleur
b4d72e3e96 Fix link to setup of social network module 2019-11-05 10:00:46 +01:00
Laurent Destailleur
c472754035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-05 09:52:43 +01:00
Laurent Destailleur
747113551b Debug pagination of bookmark list 2019-11-05 09:52:33 +01:00
Laurent Destailleur
fc73b50f0c Merge pull request #12326 from c3do/patch-1
API Get the list of ordering methods
2019-11-05 09:23:28 +01:00
Frédéric FRANCE
4f9e995163 Update index.php 2019-11-05 08:17:57 +01:00
Frédéric FRANCE
06e551af88 css 2019-11-05 08:14:35 +01:00
O. Libre
441eadb883 Check if mysqli to avoid perturbing PostgreSQL with "SET SQL_BIG_SELECTS=1" 2019-11-05 06:21:35 +01:00
O. Libre
729ed78063 FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305 2019-11-05 06:21:26 +01:00
Frédéric FRANCE
c6c7d1f5e1 missing newtoken 2019-11-04 23:08:00 +01:00
Frédéric FRANCE
5d2386228b missing newtoken 2019-11-04 23:04:30 +01:00
Frédéric FRANCE
77b05553d4 Update agenda_reminder.php 2019-11-04 23:02:43 +01:00
Frédéric FRANCE
96556dfd04 missing newtoken 2019-11-04 23:01:28 +01:00
Frédéric FRANCE
f81ac3a388 Update type.php 2019-11-04 22:57:46 +01:00
Frédéric FRANCE
b0d0e306d1 missing newtoken for csrf 2019-11-04 22:54:34 +01:00
Frédéric FRANCE
d059df1348 Update thirdparty_lettering_supplier.php 2019-11-04 22:51:15 +01:00
Frédéric FRANCE
5113e5e570 fix missing newtoken 2019-11-04 22:50:19 +01:00
Frédéric FRANCE
3a729f9e7b fix missing newtoken in form 2019-11-04 22:45:20 +01:00
Frédéric FRANCE
d035aefd40 config file doesn't exists 2019-11-04 21:58:40 +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
stickler-ci
50e5185297 Fixing style errors. 2019-11-04 20:02:11 +00:00
Cédric
f05463b239 API Get the list of ordering methods 2019-11-04 21:01:30 +01:00
Laurent Destailleur
2047f50b10 Merge pull request #12246 from mapiolca/patch-12
Fix Multicompany Filter
2019-11-04 21:01:26 +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
6857e0d7a7 Merge pull request #12312 from frederic34/patch-5
fix
2019-11-04 20:52:42 +01:00
Laurent Destailleur
1f42d66793 Merge branch 'develop' into patch-5 2019-11-04 20:52:36 +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
Frédéric FRANCE
5e9b02955b Merge branch 'develop' into patch-5 2019-11-04 20:33:02 +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