Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,240 Commits 36 Branches 191 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

1770 Commits

Author SHA1 Message Date
Laurent Destailleur
9b90e7aa09 Minor fix 2017-05-06 02:24:52 +02:00
Laurent Destailleur
56140ae572 Work on default focus 2017-05-06 01:09:22 +02:00
Laurent Destailleur
8730add15f Better message for api key return 2017-05-01 16:38:15 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
65fec95458 Fix debian package 2017-04-24 04:17:59 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
1cffa8c9fc Fix for debian 8 2017-04-13 15:03:12 +02:00
Laurent Destailleur
17bd393965 Fix typo 2017-04-03 12:48:09 +02:00
Laurent Destailleur
e8767122b0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/societe/list.php
 2017-04-03 11:05:19 +02:00
Laurent Destailleur
f942ba543e Fix php dependencies 2017-04-01 01:06:23 +02:00
Laurent Destailleur
9a85e5ef00 Enhance the file checker 2017-03-26 01:45:09 +01:00
Laurent Destailleur
3c9d336148 Fix error message 2017-03-25 17:05:27 +01:00
Alexandre SPANGARO
05e50e1027 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-02-28 05:52:43 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Alexandre SPANGARO
942b58efaf New : Integration of Stripe 2017-02-22 06:33:52 +01:00
Laurent Destailleur
5de0d81dff Can force option according to country 2017-02-13 10:59:33 +01:00
Laurent Destailleur
44ab6ad9b7 NEW Can control constants values into file integrity checker 2017-02-10 17:05:45 +01:00
Laurent Destailleur
2184eabe2f Fix english 2017-02-09 22:02:37 +01:00
Laurent Destailleur
6f3f0a826f Fix pad files 2017-02-09 11:24:01 +01:00
Laurent Destailleur
56d7fe1bf6 Pad files with https 2017-02-09 10:23:44 +01:00
Laurent Destailleur
9220a638b5 NEW Filechecker can include custom dir and report added files. 2017-02-06 15:29:07 +01:00
Laurent Destailleur
a42ad74a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 23:22:34 +01:00
Laurent Destailleur
b4c97e2279 Update pad files 2017-02-02 23:14:51 +01:00
Laurent Destailleur
c3e5e0dd3f Update doc 2017-01-12 21:50:35 +01:00
Laurent Destailleur
cb7cd3baaf Use mariadb as default to be debian compliant with 
https://wiki.debian.org/Teams/MySQL/virtual-mysql-server
 2017-01-10 10:23:50 +01:00
Laurent Destailleur
c5850d29e7 Fix checksum integrity. Also add a global checksum. 2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9 Fix filecheck tool. 2016-12-26 19:01:24 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Laurent Destailleur
b42a2616bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-12-11 02:34:59 +01:00
Laurent Destailleur
521eb3a520 Prepare 5.0 2016-12-08 12:44:58 +01:00
Laurent Destailleur
da92be1a9f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/fourn/facture/card.php
 2016-11-22 20:55:57 +01:00
Laurent Destailleur
cf0a9e8eb1 Push also intermediate debian files on debian package dir 2016-11-22 16:34:59 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
502819db76 Fix solve warning 2016-11-13 17:57:18 +01:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
Laurent Destailleur
ff4e61e70a Fix doc debian 2016-11-10 18:45:28 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3ff8a49e4f Fix english 2016-10-30 14:50:17 +01:00
Laurent Destailleur
748dacd444 Update doc 2016-10-30 14:28:30 +01:00
Laurent Destailleur
f3a35c0045 Fix: do not publish files 'none' to Sourceforge 2016-10-30 14:14:10 +01:00
Laurent Destailleur
de52106265 Fix: do not publish files 'none' to Sourceforge 2016-10-30 14:11:08 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
8c8acc6406 Remove deprecated files 2016-10-28 17:27:21 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00