Laurent Destailleur
|
6d1799eb25
|
Merge branch 'develop' into fixphpcs_2020_12
|
2020-12-21 18:08:20 +01:00 |
|
Laurent Destailleur
|
f8ff8c63b6
|
Update init demo
|
2020-12-21 01:50:16 +01:00 |
|
Laurent Destailleur
|
d3bd709ad6
|
Fix phpcs
|
2020-12-20 18:51:17 +01:00 |
|
Frédéric FRANCE
|
f9ea75df3d
|
fix phpcs
|
2020-12-20 10:28:06 +01:00 |
|
Laurent Destailleur
|
30b55ef038
|
Move files
|
2020-12-19 16:29:46 +01:00 |
|
Laurent Destailleur
|
3b8947dadd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
|
2020-12-17 21:50:05 +01:00 |
|
Laurent Destailleur
|
c97fcaec87
|
Better fix select2 bug https://github.com/select2/select2/issues/5832
|
2020-12-17 21:41:39 +01:00 |
|
Alexandre SPANGARO
|
38df864b98
|
Module Intracommreport - Add manual
|
2020-12-17 06:14:41 +01:00 |
|
Alexandre SPANGARO
|
86de12d4d3
|
Module Intracommreport - Add schema xsd
|
2020-12-17 06:13:33 +01:00 |
|
Laurent Destailleur
|
eef218aa6b
|
Fix message
|
2020-12-13 19:33:48 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +01:00 |
|
Laurent Destailleur
|
5f476e7e7e
|
Compatibility of nusoap with PHP8
|
2020-12-12 15:37:15 +01:00 |
|
Laurent Destailleur
|
6e465afb03
|
Remove data
|
2020-12-10 15:47:34 +01:00 |
|
Laurent Destailleur
|
59938147b6
|
Prepare v13
|
2020-12-10 13:38:12 +01:00 |
|
Laurent Destailleur
|
ebacb45239
|
File was moved into wiki
|
2020-12-06 19:21:47 +01:00 |
|
Laurent Destailleur
|
c31cf08431
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modCategorie.class.php
|
2020-12-04 21:55:57 +01:00 |
|
Laurent Destailleur
|
f90ba80488
|
Merge pull request #15510 from dolibit-ut/patch-44
Update autotranslator.php
|
2020-11-25 12:57:03 +01:00 |
|
UT from dolibit
|
1b6bc2a86d
|
Update README
|
2020-11-24 18:46:37 +01:00 |
|
stickler-ci
|
c74e952f64
|
Fixing style errors.
|
2020-11-24 17:40:28 +00:00 |
|
UT from dolibit
|
c789b2d6e6
|
Update autotranslator.php
these sites are defunct:
- http://code.google.com/intl/fr/apis/language/translate/overview.html
- http://translate.google.com/translate_tools
this site http://www.google.com/language_tools is now https://translate.google.com
|
2020-11-24 18:37:32 +01:00 |
|
Laurent Destailleur
|
74126e97f3
|
Add doc file
|
2020-11-22 00:32:41 +01:00 |
|
Laurent Destailleur
|
2da6fc1ef0
|
Remove warning
|
2020-11-07 12:06:14 +01:00 |
|
Laurent Destailleur
|
ea4ad24ac5
|
Fix doc
|
2020-11-07 02:14:17 +01:00 |
|
Frédéric FRANCE
|
545f39aacf
|
add work
|
2020-11-05 19:00:45 +01:00 |
|
Frédéric FRANCE
|
5fa13533ee
|
make choice required
|
2020-10-30 21:41:41 +01:00 |
|
Frédéric FRANCE
|
e0184f66d3
|
zapier on ticket create
|
2020-10-30 21:09:39 +01:00 |
|
Frédéric FRANCE
|
5afab4ba90
|
zapier on ticket create
|
2020-10-30 20:57:43 +01:00 |
|
Frédéric FRANCE
|
41e8f0085c
|
zapier on ticket create
|
2020-10-30 20:37:23 +01:00 |
|
Frédéric FRANCE
|
c41459abe4
|
fields
|
2020-10-29 23:42:51 +01:00 |
|
Frédéric FRANCE
|
e049eb960d
|
add trigger user create
|
2020-10-29 20:53:28 +01:00 |
|
Frédéric FRANCE
|
5d0ac98c34
|
work on zapier
|
2020-10-29 00:34:41 +01:00 |
|
Frédéric FRANCE
|
7a7a6f8018
|
fix phpcs
|
2020-10-27 21:28:26 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Laurent Destailleur
|
859fea626d
|
Use more generic domain
|
2020-10-25 15:22:23 +01:00 |
|
Frédéric FRANCE
|
8d08157018
|
add zapier readme
|
2020-10-25 09:26:48 +01:00 |
|
Frédéric FRANCE
|
ec033ff101
|
add zapier readme
|
2020-10-25 09:22:51 +01:00 |
|
Alexandre SPANGARO
|
ca7ad35342
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-09 06:39:42 +02:00 |
|
Regis Houssin
|
111f73bd86
|
FIX add default value of timestamp for avoid error
|
2020-10-08 12:29:01 +02:00 |
|
Aurélien
|
140200213e
|
change table into DB and ref #14697
|
2020-10-06 11:04:31 +02:00 |
|
Laurent Destailleur
|
d3add1b718
|
Remove false postivie exakat error
|
2020-10-04 11:20:53 +02:00 |
|
Laurent Destailleur
|
380fe1acb7
|
Fix doc
|
2020-09-17 12:13:32 +02:00 |
|
Laurent Destailleur
|
8a10617c0c
|
Update script
|
2020-09-17 12:12:49 +02:00 |
|
Laurent Destailleur
|
bdc30cc50b
|
Update script
|
2020-09-17 12:10:54 +02:00 |
|
Laurent Destailleur
|
d41a813e0e
|
Add script to reinit pass of the demo
|
2020-09-17 12:05:52 +02:00 |
|
Laurent Destailleur
|
b5376d3322
|
Upgrade lib for phpdebugbar
|
2020-09-07 21:18:26 +02:00 |
|
Laurent Destailleur
|
66f9f37f41
|
Minor code and doc enhancement
|
2020-08-20 19:00:43 +02:00 |
|
Laurent Destailleur
|
bd65e5612f
|
Fix duplicate id
|
2020-08-17 20:06:01 +02:00 |
|
Laurent Destailleur
|
4c0785e996
|
FIX #14469
|
2020-08-16 23:13:27 +02:00 |
|
Alexandre SPANGARO
|
27c36713d3
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-08-16 22:10:02 +02:00 |
|
Laurent Destailleur
|
fb811a1656
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
|
2020-08-03 14:44:01 +02:00 |
|
Laurent Destailleur
|
e64b8eaf40
|
Fix debug credit transfer module
|
2020-08-03 11:21:13 +02:00 |
|
Laurent Destailleur
|
2687666579
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-07-29 13:54:12 +02:00 |
|
Laurent Destailleur
|
8045cff888
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/expedition/class/expedition.class.php
|
2020-07-29 13:53:09 +02:00 |
|
Laurent Destailleur
|
6bd450dcd0
|
Doc
|
2020-07-29 13:10:31 +02:00 |
|
Laurent Destailleur
|
91a50038ff
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
|
2020-07-27 19:35:34 +02:00 |
|
Laurent Destailleur
|
8c06e3577d
|
Fix several trouble with diret debit module and credit transfer module
|
2020-07-27 19:33:24 +02:00 |
|
Laurent Destailleur
|
988e9e5817
|
Update to jquery 3.5.1
|
2020-07-27 13:52:19 +02:00 |
|
Alexandre SPANGARO
|
59ee22537d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-07-06 03:24:27 +02:00 |
|
Laurent Destailleur
|
6c6a64db66
|
Fix phpcs
|
2020-06-26 19:55:35 +02:00 |
|
Laurent Destailleur
|
9bbe004e96
|
Add test tool
|
2020-06-26 01:14:39 +02:00 |
|
Laurent Destailleur
|
fd6af312e9
|
Fix tool
|
2020-06-18 03:49:35 +02:00 |
|
Laurent Destailleur
|
b763b40d8c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-12 19:37:27 +02:00 |
|
Laurent Destailleur
|
2c327aae66
|
Prepare v12
|
2020-06-12 19:30:23 +02:00 |
|
Laurent Destailleur
|
8492272a08
|
Fix initdemo
|
2020-06-12 19:11:00 +02:00 |
|
Laurent Destailleur
|
a995bf97eb
|
Fix tools
|
2020-06-06 15:35:50 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Laurent Destailleur
|
2b963479a8
|
Sync transifex
|
2020-05-23 23:50:00 +02:00 |
|
Laurent Destailleur
|
02d5359749
|
Fix transifex sync
|
2020-05-23 23:30:52 +02:00 |
|
Laurent Destailleur
|
3dca55661c
|
Fix Add unit test to avoid the big % instead of comon % char.
|
2020-05-23 22:01:17 +02:00 |
|
Frédéric FRANCE
|
674b0e38c8
|
add new rule
|
2020-05-21 15:13:31 +02:00 |
|
Frédéric FRANCE
|
d9f42f85d1
|
add new rule
|
2020-05-21 15:08:14 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ba8cf2b398
|
add new rule
|
2020-05-21 09:21:30 +02:00 |
|
Frédéric FRANCE
|
def53338de
|
add new rule
|
2020-05-21 09:07:10 +02:00 |
|
Frédéric FRANCE
|
a636f81eac
|
add new rule
|
2020-05-21 02:17:21 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Frédéric FRANCE
|
43dcd9beb5
|
add new rule
|
2020-05-21 00:02:33 +02:00 |
|
Laurent Destailleur
|
22301d63d8
|
Replace a ZEND phpcs rule with a PSR2 rule
|
2020-05-13 00:35:10 +02:00 |
|
Laurent Destailleur
|
b5f3be4599
|
Clean phpcs rule file
|
2020-05-13 00:29:46 +02:00 |
|
Alexandre SPANGARO
|
640158ea4c
|
NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta
|
2020-05-08 13:50:26 +02:00 |
|
Laurent Destailleur
|
4d6a45d491
|
Major doxygen fix
|
2020-05-03 22:48:35 +02:00 |
|
Laurent Destailleur
|
a88ab40384
|
Clean phpcs
|
2020-05-02 15:18:59 +02:00 |
|
Laurent Destailleur
|
6bc7085297
|
Check more phpcs rules
|
2020-05-02 13:02:58 +02:00 |
|
Laurent Destailleur
|
b20d85b198
|
Fix phpcs
|
2020-04-26 23:06:52 +02:00 |
|
Laurent Destailleur
|
6caa872280
|
Enable more PHPCS rules
|
2020-04-25 19:27:42 +02:00 |
|
Laurent Destailleur
|
068a890c36
|
Enable more PHPCS rules
|
2020-04-25 19:13:20 +02:00 |
|
Laurent Destailleur
|
5c18404083
|
Move to jquery 4.0.13 with fix in reponsive
Restore some files modified by error.
|
2020-04-18 15:15:35 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
Laurent Destailleur
|
b540bb29e0
|
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
FIX viewstatut to search status
|
2020-04-16 00:48:12 +02:00 |
|
Laurent Destailleur
|
86eaa78f1e
|
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
|
2020-04-15 20:00:27 +02:00 |
|
atm-quentin
|
5b96066bf4
|
FIX keep viewstatut for doli 3.5
|
2020-04-15 15:07:11 +02:00 |
|
atm-quentin
|
f7c07640dd
|
viewstatut to search_status
|
2020-04-15 15:01:00 +02:00 |
|
Laurent Destailleur
|
f7726cd366
|
Try to disable a not expected rule
|
2020-04-10 13:04:30 +02:00 |
|
Frédéric FRANCE
|
fc34b5a4cb
|
compress png with zopflipng
|
2020-04-06 19:03:48 +02:00 |
|
Laurent Destailleur
|
e0d713bbef
|
Update demo
|
2020-03-31 12:56:21 +02:00 |
|
Laurent Destailleur
|
2b725ad5d5
|
Update year in demo data
|
2020-03-30 14:57:56 +02:00 |
|
Laurent Destailleur
|
ead99c5976
|
Enhance updatedemo
|
2020-03-30 12:12:23 +02:00 |
|
Laurent Destailleur
|
6d732c9ea4
|
Update demo
|
2020-03-30 11:39:02 +02:00 |
|
Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
56e4fa1bb3
|
Trans
|
2020-03-18 14:01:11 +01:00 |
|
Laurent Destailleur
|
5ac038419d
|
Merge pull request #13217 from dolibit-ut/patch-14
http -> https:
|
2020-02-26 16:20:24 +01:00 |
|
Laurent Destailleur
|
f28278d3d4
|
Merge pull request #13216 from dolibit-ut/patch-13
licence -> license
|
2020-02-26 16:20:05 +01:00 |
|
Laurent Destailleur
|
7d242b6a40
|
Merge pull request #13215 from dolibit-ut/patch-12
http to https
|
2020-02-26 16:19:46 +01:00 |
|
Laurent Destailleur
|
3164857223
|
Merge pull request #13213 from dolibit-ut/patch-11
Update
|
2020-02-26 16:19:15 +01:00 |
|
UT from dolibit
|
4c4050c06e
|
http -> https:
add: for Linux OS
|
2020-02-26 12:35:17 +01:00 |
|
UT from dolibit
|
ec3c3f0165
|
licence -> license
|
2020-02-26 12:25:25 +01:00 |
|
UT from dolibit
|
5e51369e64
|
http to https
|
2020-02-26 12:22:12 +01:00 |
|
UT from dolibit
|
9be050765d
|
Update
changed Mon organisation to my organisation
|
2020-02-26 11:42:59 +01:00 |
|
UT from dolibit
|
21f1de2dea
|
update
changed mon organsiation to my organsiation
|
2020-02-26 11:39:49 +01:00 |
|
UT from dolibit
|
028287d8fa
|
Update erp_comparison_translation.txt
|
2020-02-25 14:41:18 +01:00 |
|
Laurent Destailleur
|
b995dc87fa
|
NEW Add profile for PSR12 for Eclipse
|
2020-02-25 12:57:26 +01:00 |
|
Laurent Destailleur
|
55bef402c4
|
Fix remove a lot of warnings on Eclipse
|
2020-02-21 17:47:36 +01:00 |
|
Laurent Destailleur
|
ec09e7222d
|
Fix remove a lot of warnings on Eclipse
|
2020-02-21 17:31:37 +01:00 |
|
Laurent Destailleur
|
1dd5ba093d
|
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
|
2020-02-19 12:11:16 +01:00 |
|
Laurent Destailleur
|
4b5cda5cd2
|
Code comment on OAUth ahtent
|
2020-02-16 21:16:00 +01:00 |
|
Laurent Destailleur
|
878026ebc5
|
Fix phpcs
|
2020-02-11 14:44:53 +01:00 |
|
Laurent Destailleur
|
5533526331
|
Fix phpcs
|
2020-02-11 11:48:10 +01:00 |
|
Laurent Destailleur
|
2756dc156d
|
Add tool to convert pgdump into mysql dump
|
2020-02-10 20:35:18 +01:00 |
|
Alexandre SPANGARO
|
d6d3fff9dc
|
Merge branch 'develop' into 10.0_intracommreport
|
2020-02-03 21:15:07 +01:00 |
|
Laurent Destailleur
|
87f84e5b17
|
FIX #12973
|
2020-02-03 06:29:40 +01:00 |
|
Laurent Destailleur
|
8957a29990
|
FIX #12973
|
2020-02-03 06:28:04 +01:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
a02a2a6def
|
Sync transifex
|
2020-01-27 16:07:53 +01:00 |
|
Laurent Destailleur
|
a9790f355d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-21 11:32:40 +01:00 |
|
Laurent Destailleur
|
faf289cd13
|
Update demo
|
2020-01-21 11:32:17 +01:00 |
|
Laurent Destailleur
|
62b84810bd
|
Exclude includes in dev
|
2020-01-15 14:25:16 +01:00 |
|
Laurent Destailleur
|
d771efe37c
|
Fix phpcs
|
2020-01-15 13:08:29 +01:00 |
|
Laurent Destailleur
|
82757e6d03
|
Move files
|
2020-01-15 12:23:14 +01:00 |
|
stickler-ci
|
ece3face5e
|
Fixing style errors.
|
2020-01-14 14:34:36 +00:00 |
|
Norbert Penel
|
43aa5ec658
|
Dbf -> Db & import from table
1 Import a BIG DBF (aka excel openoffice) into a new table
then you can see and search content easily
2 Create thirdparties or products from a table
|
2020-01-14 15:31:41 +01:00 |
|
Laurent Destailleur
|
a7496c16cb
|
Doc
|
2020-01-12 22:00:23 +01:00 |
|
Laurent Destailleur
|
a6bae97826
|
Sync from transifex
|
2020-01-12 21:28:09 +01:00 |
|
Laurent Destailleur
|
6508ee03bf
|
Fix for en_US
|
2020-01-12 21:27:43 +01:00 |
|
Laurent Destailleur
|
e52ca6f1b5
|
Fix script
|
2020-01-08 13:35:38 +01:00 |
|
Laurent Destailleur
|
027d88d3ce
|
Fix purge script
|
2020-01-08 13:35:17 +01:00 |
|
Alexandre SPANGARO
|
c664a1e42d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-12-31 08:34:37 +01:00 |
|
Laurent Destailleur
|
c6d50ff786
|
Update demo sql file
|
2019-12-21 17:48:29 +01:00 |
|
Laurent Destailleur
|
2e2c9562e8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-05 18:30:37 +01:00 |
|
Laurent Destailleur
|
4ae26be878
|
Work whatever is running dir
|
2019-12-05 18:30:26 +01:00 |
|
Laurent Destailleur
|
599ca6cae2
|
Demo
|
2019-12-05 13:01:02 +01:00 |
|
Laurent Destailleur
|
25546f64b8
|
Update demo
|
2019-12-05 12:09:52 +01:00 |
|
Laurent Destailleur
|
590d2cda17
|
Complete #12556
|
2019-12-01 18:56:34 +01:00 |
|
Laurent Destailleur
|
fc2fc81bb0
|
Fix image
|
2019-12-01 18:22:08 +01:00 |
|
Laurent Destailleur
|
958ffa6ec8
|
FIX Images in TCPDF are removed by TCPDF when it should not
|
2019-11-30 17:19:25 +01:00 |
|
Laurent Destailleur
|
cb2bf00ef8
|
Add sql
|
2019-11-30 11:50:49 +01:00 |
|
Laurent Destailleur
|
268535a320
|
Update demo
|
2019-11-29 10:05:46 +01:00 |
|
Laurent Destailleur
|
3148f6a9fa
|
Add file for demo v11
|
2019-11-28 16:44:05 +01:00 |
|
Laurent Destailleur
|
1636d341c7
|
Debug module BOM
Enhance demo data for TakePOS
|
2019-11-28 15:18:14 +01:00 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
Frédéric FRANCE
|
5006001753
|
clean indent
|
2019-10-27 08:50:32 +01:00 |
|
Frédéric FRANCE
|
7f3f48be0f
|
clean indent in theme directory
|
2019-10-26 21:11:36 +02:00 |
|
Frédéric FRANCE
|
a7797ba1da
|
clean indent in variants directory
|
2019-10-26 20:53:39 +02:00 |
|
Frédéric FRANCE
|
635306c084
|
restore original rules to be mergeable without errors
|
2019-10-26 18:23:51 +02:00 |
|
Frédéric FRANCE
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Frédéric FRANCE
|
79825e2193
|
start clean indent in compta directory
|
2019-10-26 14:42:25 +02:00 |
|
Frédéric FRANCE
|
1a10b30a76
|
clean indent in comm directory
|
2019-10-26 14:28:40 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
0ede817588
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 16:56:47 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
9f59656589
|
fix typo inspired by grandoc
|
2019-10-11 23:08:33 +02:00 |
|
Laurent Destailleur
|
5d64cec354
|
Exclude medias from fixdosfiles
|
2019-10-10 10:52:06 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Laurent Destailleur
|
1c105718b9
|
Update demo
|
2019-10-08 21:06:09 +02:00 |
|
Laurent Destailleur
|
0cf014b01f
|
Update Restler to 3.0RC6 (last bug fixes of branch v3)
|
2019-10-08 11:14:53 +02:00 |
|
Laurent Destailleur
|
44025ce4c2
|
Update TCPDF to 6.3.2
|
2019-10-08 09:59:17 +02:00 |
|
Laurent Destailleur
|
539f4355c3
|
Try to fix stickler
|
2019-10-07 20:48:44 +02:00 |
|
Laurent Destailleur
|
8904ce5732
|
Removed warning we don't want
|
2019-10-03 16:57:12 +02:00 |
|
stickler-ci
|
3cad71f2c1
|
Fixing style errors.
|
2019-10-03 08:00:38 +00:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
33754f1951
|
Update demo
|
2019-09-26 14:36:23 +02:00 |
|
Laurent Destailleur
|
24e5b6ab79
|
Fix default filename of dump
|
2019-09-26 14:35:50 +02:00 |
|
Laurent Destailleur
|
0e5d0a7784
|
Add data for tickets
|
2019-09-26 14:14:01 +02:00 |
|
Laurent Destailleur
|
b0615d477e
|
Update demo
|
2019-09-26 13:58:43 +02:00 |
|
Laurent Destailleur
|
280219843e
|
Update demo
|
2019-09-26 13:58:30 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Frédéric FRANCE
|
9e18f5243a
|
jshint
|
2019-09-11 18:21:59 +02:00 |
|
Frédéric FRANCE
|
638362f373
|
jshint
|
2019-09-11 18:17:12 +02:00 |
|
Frédéric FRANCE
|
d37dd4ed3c
|
jshint
|
2019-09-11 18:07:21 +02:00 |
|
Frédéric FRANCE
|
c6a02312a9
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-07 14:19:07 +02:00 |
|
Laurent Destailleur
|
8891fd4981
|
Exclude namespacemig
|
2019-08-21 14:59:48 +02:00 |
|
Laurent Destailleur
|
d82e60adb7
|
Work on namespaces test
|
2019-08-20 20:31:46 +02:00 |
|
Jean Traullé
|
c739b95666
|
Fix codestyle
lessc.class.php should be excluded from ruleset as it is an external lib
|
2019-08-14 23:33:06 +02:00 |
|
Laurent Destailleur
|
6df36866e1
|
Remove mentions to register_globals
|
2019-08-14 15:30:03 +02:00 |
|
Alexandre SPANGARO
|
8b8aaafc05
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-07-20 05:47:31 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
ea349de081
|
FIX #11498
|
2019-07-15 23:25:42 +02:00 |
|
Alexandre SPANGARO
|
9da91c06ed
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-26 15:11:43 +02:00 |
|
Philippe GRAND
|
9e905901d1
|
all http addresses should be https now
|
2019-06-23 15:35:12 +02:00 |
|
Philippe GRAND
|
eef9b2867b
|
all http addresses should be https now
|
2019-06-23 15:33:04 +02:00 |
|
Philippe GRAND
|
8dd7e15193
|
all http addresses should be https now
|
2019-06-23 15:32:29 +02:00 |
|
Philippe GRAND
|
2348d499a2
|
all http addresses should be https now
|
2019-06-23 15:30:35 +02:00 |
|
Alexandre SPANGARO
|
abfb708044
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-19 21:43:40 +02:00 |
|
Laurent Destailleur
|
1189abdef8
|
Clean demo file
|
2019-06-05 11:59:01 +02:00 |
|
Laurent Destailleur
|
8ef7a3abf2
|
Clean demofile for v10
|
2019-06-05 11:56:57 +02:00 |
|
Laurent Destailleur
|
ba7b601387
|
Fix phpcs
|
2019-05-23 14:29:37 +02:00 |
|
Laurent Destailleur
|
e8ba312d2a
|
Fix phpcs
|
2019-05-23 14:25:16 +02:00 |
|
Laurent Destailleur
|
5f639f611a
|
Try to introduce rules on tab
|
2019-05-23 13:12:04 +02:00 |
|