Commit Graph

64727 Commits

Author SHA1 Message Date
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
e70ca9f67e fix travis errors 2019-03-04 11:21:26 +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
34c179ab2b Fix responsive 2019-03-04 10:42:09 +01:00
Laurent Destailleur
d502d10da4 CSS 2019-03-03 21:05:33 +01:00
Laurent Destailleur
15a6da1a8c Fix alignement css 2019-03-03 17:03:09 +01:00
Laurent Destailleur
83fc10e917 css 2019-03-03 13:38:45 +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
cccad3416e Look and feel v10 2019-03-03 12:41:08 +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
Laurent Destailleur
66d8b8e7a1 Fix phpcs 2019-03-02 21:04:44 +01:00
Laurent Destailleur
4cb5c9ef35 Var not initialized 2019-03-02 19:26:01 +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
aea5abd9a1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:58 +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
4d5372e98f
Merge pull request #10716 from frederic34/patch-3
Update doc in categorie.class.php
2019-03-02 18:36:27 +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
dfc3cf0888
Merge pull request #10715 from frederic34/patch-2
The property $fk_doc was declared of type integer
2019-03-02 18:25:07 +01:00
Laurent Destailleur
50f6bbefe7
Merge pull request #10720 from frederic34/patch-5
Update facture-rec.class.php
2019-03-02 18:23:26 +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
73740bc10e
autoloader for egulias lib needed by swiftmailer 2019-03-02 14:35:05 +01:00
Frédéric FRANCE
8c23b41f9a
autoloader for egulias lib needed by swiftmailer 2019-03-02 14:32:52 +01:00
Laurent Destailleur
6b5083bb23 Remove useless html code 2019-03-02 14:10:21 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +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
Laurent Destailleur
47ad3e8198 NEW Upgrade jquery lib to 3.3.1 2019-03-02 12:07:52 +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
728a3fcbba
Update facture-rec.class.php 2019-03-02 08:43:09 +01:00
Frédéric FRANCE
4fcde0eaa3
Update facture-rec.class.php 2019-03-02 01:37:49 +01:00
Frédéric FRANCE
ec48289e7e
Update html.formfile.class.php 2019-03-02 00:45:55 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
be8db31388
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-01 19:24:27 +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
Laurent Destailleur
2e128a786b NEW Can change the customer account of an instance 2019-03-01 15:38:15 +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