Frédéric FRANCE
|
d8bf4a0ecf
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-25 09:07:04 +02:00 |
|
Laurent Destailleur
|
e67e32c023
|
Add forcecombo on select language
|
2018-08-24 15:25:18 +02:00 |
|
Laurent Destailleur
|
b22d9db1a5
|
Fix tdclass
|
2018-08-24 15:18:19 +02:00 |
|
Laurent Destailleur
|
4885e61240
|
Fix tdclass
|
2018-08-24 15:16:03 +02:00 |
|
Laurent Destailleur
|
9f92974e98
|
Fix tdclass
|
2018-08-24 15:13:34 +02:00 |
|
Laurent Destailleur
|
32bde2c375
|
Add tdclass to form confirm for more control
|
2018-08-24 15:12:47 +02:00 |
|
Laurent Destailleur
|
d2a7c9976b
|
Fix syntax error
|
2018-08-24 15:05:57 +02:00 |
|
Laurent Destailleur
|
07407f46a7
|
Remove colspan
|
2018-08-24 15:02:19 +02:00 |
|
Laurent Destailleur
|
7a35b560a6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-23 19:51:52 +02:00 |
|
Laurent Destailleur
|
499d93b8c4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
|
2018-08-23 19:50:58 +02:00 |
|
Philippe GRAND
|
215677c972
|
Standardize and update code
|
2018-08-23 18:17:09 +02:00 |
|
Frédéric FRANCE
|
6abd5d478a
|
Update functions.lib.php
|
2018-08-23 17:15:14 +02:00 |
|
Philippe GRAND
|
74ce0bfea6
|
Standardize and update code
|
2018-08-23 16:54:24 +02:00 |
|
Philippe GRAND
|
80b7229174
|
Standardize and update code
|
2018-08-23 11:34:55 +02:00 |
|
Philippe GRAND
|
9e900e583d
|
Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018
|
2018-08-23 11:13:54 +02:00 |
|
Philippe GRAND
|
aafa16afa5
|
Update and standardize code
|
2018-08-23 11:11:46 +02:00 |
|
Philippe Grand
|
e09f7bedd0
|
Update commonobject.class.php
|
2018-08-23 09:57:19 +02:00 |
|
Frédéric FRANCE
|
692352e0e4
|
Update propal.lib.php
|
2018-08-22 22:55:12 +02:00 |
|
Philippe GRAND
|
504b0e3d16
|
Update and standardize code
|
2018-08-22 18:34:50 +02:00 |
|
Frédéric FRANCE
|
96f16b7497
|
Update commondocgenerator.class.php
|
2018-08-22 17:29:05 +02:00 |
|
Laurent Destailleur
|
b650f7ac17
|
Fix tab
|
2018-08-22 13:37:18 +02:00 |
|
Laurent Destailleur
|
c7a241a5db
|
FIX Get templates in a forced language
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2018-08-22 13:22:49 +02:00 |
|
Laurent Destailleur
|
c20d556265
|
FIX Get templates in a forced language
|
2018-08-22 13:16:55 +02:00 |
|
Frédéric FRANCE
|
d1d6d81f8f
|
Update antivir.class.php
|
2018-08-22 11:53:08 +02:00 |
|
Philippe GRAND
|
95349365ba
|
Update and standardize code
|
2018-08-22 11:39:37 +02:00 |
|
Philippe GRAND
|
0ffad50974
|
Update and standardize code
|
2018-08-22 11:24:31 +02:00 |
|
Philippe GRAND
|
d91b1fd895
|
Update and standardize code
|
2018-08-22 11:06:34 +02:00 |
|
Philippe GRAND
|
29f15b4ae6
|
Update and standardize code
|
2018-08-22 10:51:55 +02:00 |
|
Philippe GRAND
|
a669830427
|
Update and standardize code
|
2018-08-22 10:37:16 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
c76a33fb4f
|
remove superfluous spaces
|
2018-08-21 20:12:27 +02:00 |
|
Frédéric FRANCE
|
0fbccce9a7
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 19:59:07 +02:00 |
|
Laurent Destailleur
|
db3c17668e
|
Fix coding style
|
2018-08-21 19:08:11 +02:00 |
|
Laurent Destailleur
|
3f4714416d
|
Clean comment
|
2018-08-21 18:58:10 +02:00 |
|
Laurent Destailleur
|
f8b3ec7b87
|
Fix PHPCS
|
2018-08-21 18:57:34 +02:00 |
|
Laurent Destailleur
|
cd09052e80
|
FIX badge on time spent on project and tasks
|
2018-08-21 14:52:22 +02:00 |
|
Laurent Destailleur
|
21a9fd625f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-21 14:15:22 +02:00 |
|
Laurent Destailleur
|
5f6c165fb6
|
Module builder is stable
|
2018-08-21 14:14:27 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
9dbb0eaab0
|
Fix cron task label
|
2018-08-21 14:01:03 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|
Laurent Destailleur
|
289f194641
|
Merge pull request #9058 from defrance/patch-123
New : Add total price on dashboard
|
2018-08-21 13:33:33 +02:00 |
|
Frédéric FRANCE
|
9a5f839e63
|
Update actions_printing.inc.php
|
2018-08-21 12:54:02 +02:00 |
|
Laurent Destailleur
|
a414aeb29e
|
Merge pull request #9266 from frederic34/patch-21
Update propal.lib.php
|
2018-08-21 12:53:37 +02:00 |
|
Laurent Destailleur
|
866f9c4cf7
|
Merge pull request #9259 from frederic34/patch-18
Update actions_printing.inc.php
|
2018-08-21 12:52:54 +02:00 |
|
Laurent Destailleur
|
b40e32b8c3
|
Merge pull request #9264 from grandoc/new_branch_17_08_2018
standardize code
|
2018-08-21 12:52:34 +02:00 |
|
Laurent Destailleur
|
26d34422b0
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-19 03:01:26 +02:00 |
|
Laurent Destailleur
|
795b2f3d58
|
FIX Delete file on smartphone
|
2018-08-19 03:00:11 +02:00 |
|
Laurent Destailleur
|
d8365e9260
|
Module DAV
|
2018-08-19 02:17:12 +02:00 |
|