lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1c7feb67ea
dolibarr/htdocs
History
Laurent Destailleur 1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
..
accountancy Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
adherents Merge remote-tracking branch 'origin/3.7' into develop 2015-01-22 21:52:55 +01:00
admin Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
asterisk Update cidlookup.php 2014-12-30 18:11:55 +01:00
barcode Bad var 2014-12-04 01:36:53 +01:00
bookmarks Merge remote-tracking branch 'origin/3.7' into develop 2014-12-04 14:52:34 +01:00
cashdesk Merge remote-tracking branch 'origin/3.7' into develop 2015-01-09 23:09:10 +01:00
categories Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
comm New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
commande Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 00:09:37 +01:00
compta Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 00:09:37 +01:00
conf Better doc to install external modules. 2015-01-09 13:00:10 +01:00
contact Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
contrat New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
core Merge branch 'dinamic-prices-product' of 2015-01-31 14:53:14 +01:00
cron Merge remote-tracking branch 'origin/3.7' into develop 2015-01-18 18:44:22 +01:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
ecm Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
expedition New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
exports
externalsite Fix: syntax error 2014-12-04 01:23:39 +01:00
fichinter New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
fourn Merge branch 'dinamic-prices-product' of 2015-01-31 14:53:14 +01:00
ftp
holiday Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
imports Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-25 12:09:00 +01:00
includes Update lib with github.com/mfly/php-ipp 2014-12-28 11:29:53 +01:00
install Merge branch 'dinamic-prices-product' of 2015-01-31 14:53:14 +01:00
langs Merge branch 'dinamic-prices-product' of 2015-01-31 14:53:14 +01:00
livraison Clean code for validate permissions. "validate" is a status to say, "now 2015-01-25 21:32:40 +01:00
mailmanspip
margin Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 2015-01-31 14:29:15 +01:00
opensurvey Merge remote-tracking branch 'origin/3.7' into develop 2015-01-09 23:09:10 +01:00
paybox
paypal Merge remote-tracking branch 'origin/3.7' into develop 2014-12-26 04:57:55 +01:00
printing WIP Printing 2014-12-13 13:53:48 +01:00
product Merge branch 'dinamic-prices-product' of 2015-01-31 14:53:14 +01:00
projet Fixed: Length of project label is no more truncated on element cards 2015-01-30 16:33:39 +01:00
public Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
resource Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
societe Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
support Fixed: missing css 2014-12-08 02:51:26 +01:00
theme Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
user Clean code for validate permissions. "validate" is a status to say, "now 2015-01-25 21:32:40 +01:00
webservices Merge remote-tracking branch 'origin/3.7' into develop 2015-01-10 01:07:55 +01:00
.gitignore Better doc to install external modules. 2015-01-09 13:00:10 +01:00
cache.manifest Fixed: bad url 2015-01-22 23:49:32 +01:00
disabled.php
document.php
favicon.ico
filefunc.inc.php Start 3.6.3 2015-01-09 22:32:25 +01:00
index.php Typo 2014-12-09 23:23:10 +01:00
main.inc.php Merge remote-tracking branch 'origin/3.7' into develop 2015-01-18 18:44:22 +01:00
master.inc.php
robots.txt
viewimage.php