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

16717 Commits

Author SHA1 Message Date
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:51 +01:00
Laurent Destailleur
a2eefab696 Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm 
FIX: actioncomm export: ORDER BY clause / event type filter
 2019-03-02 18:44:34 +01:00
Laurent Destailleur
f7daa53a2c Merge pull request #10724 from frederic34/patch-4 
Update admin_extrafields_view.tpl.php
 2019-03-02 18:42:28 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
e215bfdb66 Merge pull request #10721 from frederic34/bad-exclude-pattern 
fix exclude from phpcs
 2019-03-02 18:23:02 +01:00
Laurent Destailleur
4288a09101 Merge pull request #10723 from frederic34/swiftmailer-autoloader 
autoloader for egulias lib needed by swiftmailer
 2019-03-02 18:21:31 +01:00
Laurent Destailleur
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Frédéric FRANCE
b5def5fd59 Update admin_extrafields_view.tpl.php 2019-03-02 18:11:47 +01:00
Frédéric FRANCE
8c23b41f9a autoloader for egulias lib needed by swiftmailer 2019-03-02 14:32:52 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81 NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE 
Removed migration files
 2019-03-02 12:16:37 +01:00
Frédéric FRANCE
d04716c018 wip 2019-03-02 10:16:13 +01:00
Frédéric FRANCE
40d34940f1 fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
014f69850e add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77 add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6 add visibility 2019-03-01 18:28:51 +01:00
John BOTELLA
421c009e58 Standardise new function name 2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9 Add helper functions and little review size of badges 2019-03-01 12:01:25 +01:00
Frédéric FRANCE
796ea6f4ea add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72 add visibility 2019-02-28 22:44:12 +01:00
Frédéric FRANCE
7e31ca48d8 add visibility 2019-02-28 22:07:48 +01:00
Frédéric FRANCE
4f9e35f350 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Frédéric FRANCE
92c5c15033 add visibility 2019-02-28 20:48:07 +01:00
Marc de Lima Lucio
b96ac794e9 FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work 2019-02-28 16:15:32 +01:00
Laurent Destailleur
429da47d68 Fix default language of reminders 2019-02-28 13:11:14 +01:00
Laurent Destailleur
9b58ca8227 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-28 11:28:20 +01:00
Laurent Destailleur
488004026f Fix syntax error 2019-02-28 11:28:10 +01:00
Laurent Destailleur
cefaeb583f Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270 Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
Laurent Destailleur
7606c73fd5 Merge pull request #10704 from iouston/patch-1 
NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT
 2019-02-28 11:18:12 +01:00
Laurent Destailleur
c240c66789 Update html.formfile.class.php 2019-02-28 11:17:43 +01:00
Laurent Destailleur
4ca6b248c3 Merge pull request #10708 from wdammak/patch-33 
phpcs simplification
 2019-02-28 11:06:33 +01:00
Laurent Destailleur
c444521abc IFTTT 2019-02-28 11:00:40 +01:00
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
Frédéric FRANCE
ba4ca5d7c2 add visibility 2019-02-28 00:15:32 +01:00
Frédéric FRANCE
cc1ee2d883 add visibility 2019-02-27 23:55:18 +01:00
wdammak
8e8c68345a phpcs simplification 2019-02-27 21:41:55 +01:00
Frédéric FRANCE
9b165f6b3f add visibility 2019-02-27 20:45:07 +01:00
Laurent Destailleur
b3fb0eaf5b Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01:00
Laurent Destailleur
29cfa03fa4 Fix font awesome 5 regressions 2019-02-27 13:54:39 +01:00
Laurent Destailleur
836eff1233 Merge pull request #10698 from wdammak/patch-32 
Add parent establishment
 2019-02-27 13:34:50 +01:00
Laurent Destailleur
f2dc687202 Update html.formfile.class.php 2019-02-27 13:26:37 +01:00