Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

5873 Commits

Author SHA1 Message Date
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
eb7886ecff Update ldap.class.php 2018-03-19 12:37:53 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
e91ffa00eb NEW Can crop image files attached in "document" tabs of a member 2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
dc0fc73931 Code comment 2018-03-17 12:15:32 +01:00
Laurent Destailleur
e323084cf8 Better template 2018-03-16 19:03:16 +01:00
Laurent Destailleur
2bbf738cb8 FIX Sql escape 2018-03-16 18:20:28 +01:00
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +01:00
Laurent Destailleur
5392218806 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/translate.class.php
 2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
Laurent Destailleur
cc9a6ee6e0 Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
a86da671ba Remove verbose log 2018-03-13 18:13:31 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +01:00
Frédéric FRANCE
d6e98d3b05 Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +01:00
Frédéric FRANCE
683486eaf1 Update html.formticketsup.class.php 2018-03-11 21:00:39 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Laurent Destailleur
baf6fc6a8b Merge pull request #8343 from atm-maxime/develop 
Fix mail send
 2018-03-11 18:11:37 +01:00
Maxime Kohlhaas
df185de6ae Fix mail send 2018-03-11 15:09:25 +01:00
jfefe
0f96575b41 Fix PHPCS errors with ticketsup module 2018-03-11 12:06:57 +01:00
Laurent Destailleur
0ac1d8b226 Dolibarize 2018-03-11 11:33:24 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
72bccd9c6b Merge branch 'develop' into bug-6980 2018-03-10 22:27:07 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6 Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked 
Fix commonobject isInt for module builder capabilities
 2018-03-10 18:59:12 +01:00
Laurent Destailleur
b2677c35e2 Merge pull request #8317 from frederic34/swifmailer 
Add dkim signing with Swiftmailer
 2018-03-10 18:48:08 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00