Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
852bf8dab7
dolibarr/htdocs
History
Laurent Destailleur 852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
..
accountancy Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
adherents Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
admin Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
api Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
asterisk
barcode Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
blockedlog Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
bookmarks Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
cashdesk Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
categories Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 16:37:17 +01:00
collab
comm Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
commande Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
compta Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
conf NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
contact Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 19:09:57 +01:00
contrat Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
core Fix Sqli 2018-03-15 01:55:47 +01:00
cron NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
custom
don Fix: syntax error 2018-03-08 11:57:38 +01:00
ecm Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
expedition Translation 2018-03-11 21:34:38 +01:00
expensereport Translation 2018-03-11 21:34:38 +01:00
exports NEW Can export leave requests 2018-02-09 16:08:28 +01:00
externalsite Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
fichinter Translation 2018-03-11 21:34:38 +01:00
fourn Translation 2018-03-11 21:34:38 +01:00
ftp Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
holiday Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
hrm Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
imports Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 12:21:10 +01:00
includes Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
install Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
langs Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
livraison FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
loan Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
mailmanspip
margin Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
modulebuilder Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
multicurrency/class
opensurvey Fix for multicompany 2018-02-06 10:57:53 +01:00
paybox NEW Accept anonmymous events (no user assigned) 2018-03-04 19:39:46 +01:00
paypal NEW Online payment of invoice and subscription record the payment 2018-03-06 00:12:23 +01:00
printing Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
product More fa image to replace png picto 2018-03-14 20:08:44 +01:00
projet Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
public Rename var to avoid conflicts 2018-03-14 23:37:14 +01:00
resource Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
societe Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 01:57:35 +01:00
stripe Can create card from dolibarr 2018-03-15 00:40:29 +01:00
supplier_proposal Translation 2018-03-11 21:34:38 +01:00
support Fix debian package 2018-02-16 18:21:18 +01:00
theme More fa image to replace png picto 2018-03-14 20:08:44 +01:00
ticketsup More fa image to replace png picto 2018-03-14 20:08:44 +01:00
user Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 13:06:29 +01:00
variants Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
webservices Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
website Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
.gitignore
cache.manifest
document.php fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00
favicon.ico
filefunc.inc.php Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-17 01:19:17 +01:00
index.php CSS 2018-03-04 10:47:35 +01:00
main.inc.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
master.inc.php
robots.txt
viewimage.php fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00