Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
75,225 Commits 36 Branches 190 Tags
cfa414b2de51c08ad9c110bf7a0a3d7b51d3a093
Commit Graph

16687 Commits

Author SHA1 Message Date
Laurent Destailleur
c95c8b4dcb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/login/functions_dolibarr.php
 2019-03-04 20:17:16 +01:00
Laurent Destailleur
54b9681257 More log to help debug 2019-03-04 20:15:31 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Laurent Destailleur
0d49f27831 Code style 2019-03-04 17:36:45 +01:00
Laurent Destailleur
68bb95079a Ignore 2 rules 2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293 Fix phpcs 2019-03-04 17:31:50 +01:00
Laurent Destailleur
99e79d1750 Fix regression with private property 2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e Work on BOM 2019-03-04 14:01:30 +01:00
Laurent Destailleur
d8259f94e1 Work on BOM module 2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf Work on BOM module 2019-03-04 13:30:43 +01:00
Laurent Destailleur
1c775b7b68 Work of BOM module 2019-03-04 12:46:07 +01:00
John BOTELLA
7cadaca8fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-04 11:37:16 +01:00
John BOTELLA
74caaca827 fix travis errors 2019-03-04 11:15:01 +01:00
John BOTELLA
c420cab500 fix travis errors 2019-03-04 11:11:15 +01:00
Laurent Destailleur
15a6da1a8c Fix alignement css 2019-03-03 17:03:09 +01:00
Laurent Destailleur
481d0de010 FIX Import of service was not available in update mode 2019-03-03 13:02:20 +01:00
Laurent Destailleur
1931f43ce7 Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into 
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
 2019-03-03 00:05:07 +01:00
Frédéric FRANCE
3037e4a157 Update DolibarrModules.class.php 2019-03-02 20:49:53 +01:00
Laurent Destailleur
e91a933635 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-02 19:13:48 +01:00
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