Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
6444c7378f Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 16:40:23 +02:00
Frédéric FRANCE
e5417cccd8 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:40:00 +02:00
Laurent Destailleur
ace9eb9b3e Merge pull request #11870 from hregis/10.0_mc 
FIX avoid non numeric warning
 2019-09-14 16:39:40 +02:00
Laurent Destailleur
1d865a250e Merge pull request #11866 from bafbes/abb100076 
fix: repetition in error message
 2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14 Update ldap.class.php 2019-09-14 16:39:08 +02:00
Laurent Destailleur
4d1d689fc8 Merge pull request #11868 from bafbes/abb100077 
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
 2019-09-14 16:37:16 +02:00
Frédéric FRANCE
c9c7d60fc0 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
d380ef1812 Update usergroup.class.php 2019-09-14 16:37:07 +02:00
Laurent Destailleur
9934f73574 Update ldap_groups.php 2019-09-14 16:36:04 +02:00
Frédéric FRANCE
ccaa4cc1f3 work on contact 2019-09-14 16:35:18 +02:00
Laurent Destailleur
7965804a34 Update ldap_groups.php 2019-09-14 16:35:00 +02:00
Laurent Destailleur
e7d01f98cf Merge pull request #11890 from atm-florian/10.0 
fix: fill id for links (document tab)
 2019-09-14 16:33:20 +02:00
Laurent Destailleur
7aac67f79c Merge pull request #11884 from frederic34/patch-10 
fix colspan in show_project
 2019-09-14 16:33:02 +02:00
Laurent Destailleur
618874a670 Merge pull request #11886 from frederic34/patch-13 
Update .editorconfig
 2019-09-14 16:32:50 +02:00
Laurent Destailleur
935e84d985 Merge pull request #11885 from frederic34/patch-12 
Create .stickler.yml
 2019-09-14 16:32:25 +02:00
Laurent Destailleur
fbb8808f29 Merge pull request #11887 from frederic34/patch-14 
Update index.php
 2019-09-14 16:32:11 +02:00
Laurent Destailleur
afce060a20 Merge pull request #11889 from OPEN-DSI/new-product-list-tags-multiselect 
NEW multiselect with checkbox in categories/tags search for product list
 2019-09-14 16:31:48 +02:00
Laurent Destailleur
6d890800e8 Merge pull request #11893 from frederic34/patch-15 
Delete interface_50_modIFTTT_IFTTT.class.php
 2019-09-14 16:30:47 +02:00
Laurent Destailleur
76f478dc44 Fix look and feel 2019-09-14 14:25:47 +02:00
Frédéric FRANCE
af63ac4051 work on contact 2019-09-14 13:31:26 +02:00
Frédéric FRANCE
79bd426363 work on user 2019-09-14 12:52:55 +02:00
Frédéric FRANCE
5731f74025 work on user 2019-09-14 12:00:39 +02:00
Frédéric FRANCE
1cd59cc16a work on user 2019-09-14 11:26:31 +02:00
Frédéric FRANCE
08f056a0f4 Delete interface_50_modIFTTT_IFTTT.class.php 
IFTTT has been removed
 2019-09-14 09:09:41 +02:00
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +02:00
Laurent Destailleur
aad6b003fb Add cache in fetch_optionnals() to avoid duplicate call to 
fetch_name_optionals_label
 2019-09-14 00:02:48 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
8e83615533 Add method getSetupIntent 2019-09-13 18:52:35 +02:00
Laurent Destailleur
7e923f6c1f Fix remove test code and chen paymentintent is not null 2019-09-13 18:51:03 +02:00
Laurent Destailleur
b4831f9670 Code comment 2019-09-13 17:26:07 +02:00
florian HENRY
224b4c147a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df fix: fill id for links (document tab) 2019-09-13 15:25:16 +02:00
Laurent Destailleur
70ffd6270f More details in log for CSRF error. 2019-09-13 13:51:26 +02:00
Laurent Destailleur
84544b6bdc More details in log for CSRF error. 2019-09-13 13:50:17 +02:00
VESSILLER
44fa2e4cd1 NEW multiselect with checkbox in categories/tags search for product list 2019-09-13 12:23:34 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
9e851eaa78 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:16:03 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
5137104b92 Fix responsive 2019-09-13 01:46:18 +02:00
Laurent Destailleur
48e03e1ab5 Fix responsive 2019-09-13 01:38:41 +02:00
Frédéric FRANCE
230c14e189 add social networks 2019-09-12 22:32:41 +02:00
Frédéric FRANCE
00394493eb Update index.php 2019-09-12 22:02:39 +02:00
Frédéric FRANCE
de3a67f5bd Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
165ee28823 Update .editorconfig 
editorconfig control the github online editor
 2019-09-12 21:48:00 +02:00
Frédéric FRANCE
6db7414f88 Create .stickler.yml 2019-09-12 21:45:04 +02:00
Frédéric FRANCE
0d3a2f800b fix colspan in show_project 2019-09-12 21:39:57 +02:00
stickler-ci
aed1c31158 Fixing style errors. 2019-09-12 19:19:49 +00:00