Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
d66d4f53a5a82fc3bb040fc49ea754e9fcd32f23
dolibarr-fork/htdocs
History
Laurent Destailleur d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
2015-01-31 15:41:33 +01:00
..
accountancy
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 15:53:06 +01:00
adherents
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
admin
Merge remote branch 'upstream/develop' into tooltip
2015-01-30 16:45:24 +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
Merge remote branch 'upstream/develop' into tooltip
2015-01-31 09:58:41 +01:00
commande
Tooltip
2015-01-31 10:58:03 +01:00
compta
Merge remote branch 'upstream/develop' into tooltip
2015-01-31 09:58:41 +01:00
conf
Better doc to install external modules.
2015-01-09 13:00:10 +01:00
contact
Tooltip everywhere
2015-01-30 16:40:33 +01:00
contrat
Merge remote branch 'upstream/develop' into tooltip
2015-01-31 09:58:41 +01:00
core
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
2015-01-31 15:41:33 +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
Merge remote branch 'upstream/develop' into tooltip
2015-01-31 09:58:41 +01:00
exports
Correct
2014-11-25 20:40:00 +01:00
externalsite
Fix: syntax error
2014-12-04 01:23:39 +01:00
fichinter
Merge remote branch 'upstream/develop' into tooltip
2015-01-31 09:58:41 +01:00
fourn
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
2015-01-31 15:41:33 +01:00
ftp
Correct
2014-11-25 20:40:00 +01:00
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 'tooltip' of https://github.com/frederic34/dolibarr into
2015-01-31 15:41:33 +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
Replace <center> tags
2014-11-25 20:13:43 +01:00
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 'tooltip' of https://github.com/frederic34/dolibarr into
2015-01-31 15:41:33 +01:00
projet
Merge remote branch 'upstream/develop' into tooltip
2015-01-30 16:45:24 +01:00
public
Tooltip and cache for boxes
2015-01-23 10:51:12 +01:00
resource
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
societe
Merge remote branch 'upstream/develop' into tooltip
2015-01-30 16:45:24 +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
Tooltip
2015-01-31 10:58:03 +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
Tooltip everywhere
2015-01-30 16:40:33 +01:00
master.inc.php
…
robots.txt
…
viewimage.php
…