Laurent Destailleur
|
7946f4a612
|
Merge pull request #7817 from grandoc/new_branch_15_11_17
better handle of errors
|
2017-11-17 13:09:35 +01:00 |
|
Laurent Destailleur
|
2077f7ad96
|
Update expensereport.class.php
|
2017-11-17 13:09:03 +01:00 |
|
Laurent Destailleur
|
acc2fcbddd
|
Update expensereport.class.php
|
2017-11-17 13:04:33 +01:00 |
|
Laurent Destailleur
|
d326641072
|
Merge pull request #7813 from hregis/develop_ldap
Fix: missing encrypt datafor llx_const
|
2017-11-17 13:03:22 +01:00 |
|
Laurent Destailleur
|
481b810fd2
|
Merge pull request #7810 from frederic34/patch-1
fix trigger when module not enabled
|
2017-11-17 12:59:59 +01:00 |
|
Laurent Destailleur
|
3b3b017226
|
Merge pull request #7809 from defrance/patch-102
Expensereport Normalize link and generate document
|
2017-11-17 12:58:30 +01:00 |
|
Laurent Destailleur
|
f33b5067ad
|
Upgrade branch 3.0 of RESTLER (still 3.0.0 RC6)
This upgrade Swagger from 1.2 to 2.0
|
2017-11-17 12:55:27 +01:00 |
|
Laurent Destailleur
|
a5a9b9b23f
|
Removed deprecated REST API
Prepare code to be compatible with swagger v2
|
2017-11-17 12:50:34 +01:00 |
|
Laurent Destailleur
|
92753273b9
|
Fix upload api for invoices and bad id for bank account
|
2017-11-17 11:44:52 +01:00 |
|
Laurent Destailleur
|
ba372bfc5c
|
Fix typo
|
2017-11-16 23:11:49 +01:00 |
|
Laurent Destailleur
|
f708450276
|
Fix sql error
|
2017-11-16 22:57:25 +01:00 |
|
Laurent Destailleur
|
e06087888b
|
NEW Show line "other filtered task" when using filter on timesheet.
|
2017-11-16 22:55:04 +01:00 |
|
Laurent Destailleur
|
f153d9c9ff
|
Fix time spent counted twice
|
2017-11-16 19:41:31 +01:00 |
|
Laurent Destailleur
|
0d192df1fd
|
Standardize interface
|
2017-11-16 18:33:56 +01:00 |
|
Laurent Destailleur
|
4f25bc5e3b
|
NEW detection of edge browser
|
2017-11-16 14:44:55 +01:00 |
|
Frédéric FRANCE
|
0d79cc50b0
|
Merge remote-tracking branch 'upstream/develop' into patch-1
|
2017-11-16 13:41:24 +01:00 |
|
Laurent Destailleur
|
a7aa3ee438
|
Rename file
|
2017-11-16 12:21:21 +01:00 |
|
Laurent Destailleur
|
d7f512311b
|
Doc
|
2017-11-16 12:19:31 +01:00 |
|
Laurent Destailleur
|
c527189088
|
Standardize page name
|
2017-11-16 12:18:25 +01:00 |
|
Laurent Destailleur
|
19d0283b63
|
Fix doxygen
|
2017-11-16 12:13:23 +01:00 |
|
Laurent Destailleur
|
4d198534a2
|
Clean CSS files
|
2017-11-16 12:09:34 +01:00 |
|
Laurent Destailleur
|
e6d02cebe7
|
Complete templates
|
2017-11-16 12:09:17 +01:00 |
|
Laurent Destailleur
|
612dfb91ff
|
Add more img templates for medias dir
|
2017-11-15 21:01:05 +01:00 |
|
Laurent Destailleur
|
d4d26eac9b
|
More templates into medias directory
|
2017-11-15 20:41:04 +01:00 |
|
Laurent Destailleur
|
5c3d8acfbb
|
Work on website
|
2017-11-15 19:47:07 +01:00 |
|
Laurent Destailleur
|
e760568a78
|
Test prerequisite in DLL before unzip files
|
2017-11-15 13:21:56 +01:00 |
|
Laurent Destailleur
|
07c0b5d616
|
Code comment
|
2017-11-15 13:15:08 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Laurent Destailleur
|
33910b9cc9
|
Add the trackid for emails sent from leave request card.
|
2017-11-15 11:29:22 +01:00 |
|
Philippe GRAND
|
5615416d1a
|
better handle of errors
|
2017-11-15 11:09:18 +01:00 |
|
Laurent Destailleur
|
f37320590d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-15 10:40:53 +01:00 |
|
Laurent Destailleur
|
924cf871a7
|
FIX CSS for IE10
|
2017-11-15 10:40:24 +01:00 |
|
Laurent Destailleur
|
c85acbfc11
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
|
2017-11-14 19:47:33 +01:00 |
|
Laurent Destailleur
|
366ade4030
|
Code comment
|
2017-11-14 19:42:34 +01:00 |
|
Laurent Destailleur
|
77b6ef7396
|
Code comment
|
2017-11-14 19:41:57 +01:00 |
|
Laurent Destailleur
|
388b90a94c
|
Fix repair of utf8
|
2017-11-14 19:00:52 +01:00 |
|
Laurent Destailleur
|
501f5b8292
|
Merge duplicate translation key
|
2017-11-14 18:26:39 +01:00 |
|
Laurent Destailleur
|
f789714f14
|
Fix translation
|
2017-11-14 18:16:01 +01:00 |
|
Laurent Destailleur
|
451d3ed8ed
|
NEW Add API to activate/unactivate a contract
|
2017-11-14 17:51:04 +01:00 |
|
Regis Houssin
|
a4b96f00df
|
Fix: missing encrypt datafor llx_const
|
2017-11-14 16:00:34 +01:00 |
|
Laurent Destailleur
|
e37252d83a
|
Fix div not closed
|
2017-11-14 15:17:10 +01:00 |
|
Laurent Destailleur
|
a50589c3c9
|
NEW Better behaviour when using a text browser
|
2017-11-14 15:10:46 +01:00 |
|
Frédéric FRANCE
|
4dca97401d
|
Update llx_actioncomm.sql
|
2017-11-14 13:18:31 +01:00 |
|
Laurent Destailleur
|
0e2f64af72
|
CSS
|
2017-11-14 12:18:02 +01:00 |
|
Laurent Destailleur
|
fa92c53ff6
|
Fix pb when showing dictionaries
|
2017-11-14 11:13:24 +01:00 |
|
Frédéric FRANCE
|
96031b0787
|
Update listactions.php
|
2017-11-14 11:05:58 +01:00 |
|
Frédéric FRANCE
|
7a76a3f497
|
fix trigger when module not enabled
|
2017-11-14 10:20:43 +01:00 |
|
BENKE Charlene
|
0553e331fe
|
Update card.php
Normalize link and generate document
|
2017-11-14 08:48:41 +01:00 |
|
Laurent Destailleur
|
11cb9c0d81
|
Code simpler
|
2017-11-14 01:57:50 +01:00 |
|
Laurent Destailleur
|
d0d1d646fd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-14 01:35:16 +01:00 |
|