Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 03:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 36 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

36 Commits

Author SHA1 Message Date
Laurent Destailleur
2480a8dc2a Ignore 2018-11-18 15:57:20 +01:00
Laurent Destailleur
22b2af6911 Exclude dir 2018-11-18 15:46:37 +01:00
Laurent Destailleur
b22817c237 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2017-05-29 10:25:07 +02:00
Laurent Destailleur
2a9c6d9387 Complete ignore file 2017-05-20 21:11:31 +02:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
e7385c9e4f Try to solve side effect of this fuck... autoload creating a big mess in 
a lot of features.
 2016-05-18 11:57:13 +02:00
Laurent Destailleur
5785744d5a Add ignore 2016-01-08 13:06:38 +01:00
yassine belkaid
1075940e93 ignore conf/conf.php file 2015-12-05 00:37:32 +00:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
 2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Laurent Destailleur
2ce43dc0d8 Update ignore to secure 2015-09-22 15:40:17 +02:00
Laurent Destailleur
398e9bad94 Add ignore 
Conflicts:
	htdocs/.gitignore
 2015-09-04 23:22:38 +02:00
Laurent Destailleur
f992c2091f Add ignore 2015-09-04 18:35:18 +02:00
Laurent Destailleur
55752610dc Exclude dir 2015-09-04 18:27:25 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Laurent Destailleur
faccb3666e Avoid to include tested module 2015-06-27 02:34:28 +02:00
Laurent Destailleur
f54e90c9cf Better doc to install external modules. 
Custom dir will be installed by default.
 2015-01-09 13:00:10 +01:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Laurent Destailleur
75a46030de Complete ignore 2014-08-14 15:09:17 +02:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
29759a1cba Protect to avoid commiting into main source 2013-07-10 17:36:56 +02:00
Laurent Destailleur
40d7eca4bc Protect to avoid commiting into main source 2013-07-10 17:36:14 +02:00
Laurent Destailleur
5597e1b5c2 Protection to avoid not desired modules into packages 2013-01-19 18:47:35 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
03cacbcd1d Ignore external modules 2012-12-09 18:44:31 +01:00
Laurent Destailleur
2ff87a2c1c Exclude dir 2012-09-05 20:41:58 +02:00
Laurent Destailleur
2803c1cbfd Add custom to ignore 2011-11-30 18:49:45 +01:00
Laurent Destailleur
2caf178882 Enhance protection 2011-11-09 14:10:49 +01:00