Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,795 Commits 39 Branches 191 Tags
b68f6c0fca47a41dfe9d6d0c417bbf15de8e4e50
Commit Graph

69795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b68f6c0fca Use more generic name 2018-10-09 16:15:12 +02:00
ptibogxiv
a05bdccb06 Prepare for more stripe function 2018-09-27 10:47:58 +02:00
Laurent Destailleur
60c74a6255 Merge pull request #9582 from grandoc/new_branch_21_09_2018 
Standardize and update code from New branch 21 09 2018
 2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76 Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Laurent Destailleur
e35aed0c28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 09:36:31 +02:00
Laurent Destailleur
0004cbde96 Merge pull request #9617 from cebe/fix-german-account-rowids 
Update german accounting file to use rowid
 2018-09-27 09:36:09 +02:00
Laurent Destailleur
8e5ff64d22 Merge pull request #9615 from aljawaid/patch-1 
NEW Add more common social networks fields for business
 2018-09-27 09:33:37 +02:00
Laurent Destailleur
9630c7b5c7 Merge pull request #9614 from grandoc/new_branch_25_09_2018 
Add some code comment
 2018-09-27 09:31:19 +02:00
Philippe Grand
b7304e3d82 Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Laurent Destailleur
b8ae88cf26 Merge pull request #9602 from grandoc/new_branch_24_09_2018 
Standardize and update code
 2018-09-27 09:19:59 +02:00
Laurent Destailleur
ce141d8051 Merge pull request #9601 from frederic34/patch-9 
remove superfluous space
 2018-09-27 09:18:58 +02:00
Laurent Destailleur
7e58662c6f Merge branch 'develop' into patch-9 2018-09-27 09:18:42 +02:00
Laurent Destailleur
6f92c230aa Merge pull request #9600 from grandoc/new_branch_23_09_2018 
Translated comment
 2018-09-27 09:17:53 +02:00
Laurent Destailleur
29893daf6f Merge pull request #9599 from zeenlym/forgotten_passlink 
NEW Change forgotten password link in general parameters
 2018-09-27 09:17:28 +02:00
Laurent Destailleur
6680fca6c6 Add missing translation key 2018-09-27 09:13:28 +02:00
Laurent Destailleur
9123329800 FIX Link template invoice to contract 2018-09-26 23:44:27 +02:00
Laurent Destailleur
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Laurent Destailleur
79ade6a1af Work on website 2018-09-26 15:20:37 +02:00
Carsten Brandt
73ed340766 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-26 11:52:06 +02:00
Laurent Destailleur
0987db765c Work on export/import 2018-09-26 11:28:41 +02:00
Laurent Destailleur
0a4d80012a Support export/import of logo site in web site templates 2018-09-26 11:15:11 +02:00
IJ
68dc213601 Correct Google+ to plus 2018-09-26 07:36:22 +01:00
IJ
9fd7d98c26 Add social fields 2018-09-26 07:35:26 +01:00
IJ
d063f6fdeb Add social fields 2018-09-26 07:34:09 +01:00
IJ
c90cd4ae29 Add more social fields 2018-09-26 07:21:21 +01:00
Laurent Destailleur
f2d53e80e5 Optimize performance of cron that rotate logs 2018-09-26 01:45:24 +02:00
Laurent Destailleur
c2335c0a5e Update websote template 2018-09-26 00:17:53 +02:00
Laurent Destailleur
2ef0cb8d9b Fix cloning 2018-09-25 20:34:05 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Laurent Destailleur
eff1d1c89e Work on website module 2018-09-25 16:35:59 +02:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
b4b6e900f9 css 2018-09-25 11:42:19 +02:00
Laurent Destailleur
ba3ca550ce Fix date in text for substitution. Removed not used translation keys. 2018-09-25 11:36:40 +02:00
Laurent Destailleur
bd523973d8 Add missing translation key 2018-09-25 00:55:03 +02:00
Laurent Destailleur
b93ab79679 FIX Error messages 2018-09-25 00:39:28 +02:00
Laurent Destailleur
822db7c727 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 19:21:31 +02:00
Laurent Destailleur
f04b8eea6d Work on website module 2018-09-24 19:21:21 +02:00
Laurent Destailleur
f1b0bd2a5d Work on website module 2018-09-24 17:12:51 +02:00
Laurent Destailleur
9dc4ad4cc3 Add warning when using editinline 2018-09-24 15:38:13 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
eeda176ed6 FIX Bad position of hook formattachOptions call 2018-09-24 15:13:18 +02:00
Philippe GRAND
3f2f903e6f Specifics comments 2018-09-24 12:22:41 +02:00
Philippe GRAND
d7df74656e Standardize and update code 2018-09-24 12:03:49 +02:00
Philippe GRAND
ac31b79d9d Standardize and update code 2018-09-24 11:58:01 +02:00
Philippe GRAND
1f2493f361 Standardize and update code 2018-09-24 11:45:34 +02:00
Frédéric FRANCE
86072ad1d7 remove superfluous space 2018-09-24 10:43:57 +02:00
Laurent Destailleur
5c0e6eacf6 Use latest instead of last 2018-09-24 10:43:12 +02:00
Laurent Destailleur
436deea4c5 Code comment 2018-09-24 10:26:49 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00