Frédéric FRANCE
|
d8bf4a0ecf
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-25 09:07:04 +02:00 |
|
Laurent Destailleur
|
a896fb419f
|
Fix preselected language
|
2018-08-24 15:28:53 +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
|
32594e8048
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-24 10:47:10 +02:00 |
|
Laurent Destailleur
|
a82d86cec4
|
FIX warning for late template invoices to remove when suspended
|
2018-08-24 10:46:47 +02:00 |
|
Laurent Destailleur
|
64427dafb6
|
Fix back to page when canceling an edit in the module template
|
2018-08-23 20:21:27 +02:00 |
|
Laurent Destailleur
|
781a55429a
|
FIX API template to delete a record
|
2018-08-23 20:03:41 +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 |
|
Laurent Destailleur
|
62b2981e42
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-08-23 19:47:31 +02:00 |
|
Laurent Destailleur
|
019ff534a0
|
FIX api template for list in module builder
|
2018-08-23 19:46:08 +02:00 |
|
Laurent Destailleur
|
8757392e6b
|
FIX remove internal property isextrafieldmanaged from API returns
|
2018-08-23 19:24:00 +02:00 |
|
Laurent Destailleur
|
e6acacee4b
|
Fix cleandata method of modulebuilder template of AAPI
|
2018-08-23 19:19:25 +02:00 |
|
Laurent Destailleur
|
e2e09f8534
|
Fix hookmanager var
|
2018-08-23 17:56:16 +02:00 |
|
Laurent Destailleur
|
61ced8220b
|
Fix sample doc
|
2018-08-23 17:49:14 +02:00 |
|
Laurent Destailleur
|
b650f7ac17
|
Fix tab
|
2018-08-22 13:37:18 +02:00 |
|
Laurent Destailleur
|
de2cdfc70f
|
FIX Language selection lost if error during creation of email template
|
2018-08-22 13:23:46 +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
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +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
|
4d8e5ab0e6
|
Fix PHPCS
|
2018-08-21 14:58:20 +02:00 |
|
Laurent Destailleur
|
cd09052e80
|
FIX badge on time spent on project and tasks
|
2018-08-21 14:52:22 +02:00 |
|
Laurent Destailleur
|
3cfc47a732
|
Fix urls in project module
|
2018-08-21 14:41:59 +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
|
4379d6b49d
|
Prepare 9.0
|
2018-08-21 14:15:01 +02:00 |
|
Laurent Destailleur
|
5f6c165fb6
|
Module builder is stable
|
2018-08-21 14:14:27 +02:00 |
|
Laurent Destailleur
|
b86d54cab3
|
Trad
|
2018-08-21 14:05:53 +02:00 |
|
Laurent Destailleur
|
9dbb0eaab0
|
Fix cron task label
|
2018-08-21 14:01:03 +02:00 |
|
Laurent Destailleur
|
243cbbc11d
|
Fix missing trans
|
2018-08-21 13:58:24 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
4fdd521d61
|
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
FIX : Fetch task will now fetch comments
|
2018-08-21 13:36:20 +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 |
|
Laurent Destailleur
|
edb210d7cc
|
Update index.php
|
2018-08-21 13:33:07 +02:00 |
|
Laurent Destailleur
|
39f7d4a011
|
Merge pull request #8975 from atm-greg/Add_hook_on_replenish
add hooks on stock replenish
|
2018-08-21 13:28:18 +02:00 |
|
Laurent Destailleur
|
0ee7befa19
|
Update replenish.php
|
2018-08-21 13:27:49 +02:00 |
|
Laurent Destailleur
|
5effcd222f
|
Merge pull request #9150 from frederic34/variant
code cleaning
|
2018-08-21 13:21:11 +02:00 |
|
Laurent Destailleur
|
5e09d5160f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-21 13:17:20 +02:00 |
|
Laurent Destailleur
|
0f1e5a78c6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-21 13:17:11 +02:00 |
|
Laurent Destailleur
|
7103bfd7aa
|
Merge pull request #9253 from frederic34/patch-11
Update list.php
|
2018-08-21 13:11:26 +02:00 |
|
Laurent Destailleur
|
009424cd67
|
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
|
2018-08-21 13:11:00 +02:00 |
|
Laurent Destailleur
|
91bfa4be6c
|
Update project.class.php
|
2018-08-21 13:10:20 +02:00 |
|