Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,319 Commits 36 Branches 189 Tags
2bc93b9748604e474ee7d0f0e6421c424f996746
Commit Graph

581 Commits

Author SHA1 Message Date
Frédéric FRANCE
39462742e2 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6 Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
3b245f1b30 Merge pull request #9247 from frederic34/missingReturn 
return comment
 2018-08-16 00:35:39 +02:00
Frédéric FRANCE
54a078149a function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
a0a6afc224 return comment 2018-08-14 12:23:10 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
51effef629 Reset pagination when current page too high 2018-08-02 18:22:08 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
fa2de55109 test include 2018-07-26 11:50:54 +02:00
Laurent Destailleur
e72e56ce2d Merge pull request #9041 from grandoc/new_branch_02_07_2018 
update description code
 2018-07-16 10:03:54 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
872895c0b6 Code comment 2018-07-12 11:17:21 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
2023a58397 fix : Typo 2018-07-02 17:32:42 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
edd2e12b8d css 2018-06-30 14:35:33 +02:00
Laurent Destailleur
e4388e63fa Merge pull request #8891 from inoveaconseil/develop 
NEW: ADD url to see the last version of a external module
 2018-06-30 01:17:10 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10 
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
edd7499375 Fix clone with new architecture 2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593 Clean code 2018-06-19 08:51:25 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
bc0080b945 Merge pull request #8945 from bafbes/abb7009 
Fix: Do not activate module if errors found on execution of module SQL queries
 2018-06-13 21:28:04 +02:00
Laurent Destailleur
98ae8e18df Update modMyModule.class.php 2018-06-13 21:27:57 +02:00
Laurent Destailleur
e69b0102a5 Merge pull request #8935 from inoveaconseil/modulebuilder 
Fix include for older version
 2018-06-13 20:43:38 +02:00
Laurent Destailleur
4be069a3b5 Update setup.php 2018-06-13 20:43:02 +02:00
Abbes Bahfir
2f759e0c18 Fix: Do not activate module if errors on module SQL queries execution 2018-06-12 00:43:01 +01:00
Inovea Conseil
75bb5c1624 Fix include for older version 2018-06-08 16:01:09 +02:00
Laurent Destailleur
485dc9a57a Clean code 2018-06-08 15:37:25 +02:00
Laurent Destailleur
6e62727c37 Fix scrutinizer bug 2018-06-06 18:18:50 +02:00
Laurent Destailleur
9730138845 Code comment 2018-06-05 11:06:44 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Inovea Conseil
78b3067de3 NEW: ADD admin page for modulebuilder 
ADD custom README
ADD choice to generate about page and documentation folder
 2018-05-30 13:54:43 +02:00
Inovea Conseil
7c57b360a3 Auto stash before merge of "develop" and "Dolibarr/develop" 2018-05-30 13:45:17 +02:00
Inovea Conseil
9391ec4951 Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-05-30 13:44:00 +02:00
Laurent Destailleur
c1f5c6becf Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Inovea Conseil
e0c1e33012 NEW: ADD url to see the last version of a external module 2018-05-30 00:20:31 +02:00
Inovea Conseil
fc7b88e5e6 Fix missing substitution 
Missing substitution for object
 2018-05-29 23:04:35 +02:00
Frédéric FRANCE
055508f343 remove one warning 2018-05-27 20:56:45 +02:00
Frédéric FRANCE
58e5715ac3 loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
1b69c2357f typo 2018-05-23 17:16:58 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00