Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,163 Commits 36 Branches 190 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

4155 Commits

Author SHA1 Message Date
Laurent Destailleur
8c03fdd51f NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:26:06 +01:00
Laurent Destailleur
b9f1695b34 NEW Upgrade of Stripe lib to 6.4.1 2018-03-07 19:25:05 +01:00
Laurent Destailleur
3ebf01e0c6 Update .travis.yml 2018-03-07 13:21:07 +01:00
Laurent Destailleur
d060cf840d Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
ptibogxiv
613e92e5e8 update stripe php 2018-03-06 13:52:56 +01:00
ptibogxiv
f35606e434 FIX update stripe php librairy 2018-03-06 13:50:42 +01:00
Gerhard Stephan
520f581481 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
Laurent Destailleur
9965a25eaa Code comment 2018-02-15 13:23:13 +01:00
Laurent Destailleur
0172ecb425 Code comment 2018-02-15 13:21:58 +01:00
Laurent Destailleur
d547d1a9cf Suggest better change for #8196. To be tested. 2018-02-15 13:16:54 +01:00
Gerhard Stephan
51028c845d Export to PDF using LibreOffice 5 command line 2018-02-15 10:15:27 +01:00
Laurent Destailleur
fb8326a9bb Css use roboto but files does not exists 2017-12-22 12:56:29 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
 2017-12-20 13:28:41 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
61798d1af0 FIX list of module not complete when module mb_strlen not available 
Conflicts:
	dev/dolibarr_changes.txt
 2017-11-25 02:34:24 +01:00
Laurent Destailleur
bdecef56f9 FIX list of module not complete when module mb_strlen not available 2017-11-25 02:32:25 +01:00
Laurent Destailleur
62da0160e1 Merge pull request #7780 from fappels/develop_update_tablednd 
FIX #3551 and #6823 table drag and drop not working.
 2017-11-22 11:22:14 +01:00
fappels
8d318337d9 Check hound barking 2017-11-20 14:56:12 +01:00
fappels
37caa28e7e Update tablednd to v1.0 RC 2017-11-20 10:25:02 +01:00
Laurent Destailleur
bbf755f0b1 Fix for PHP7.2 2017-11-17 18:20:24 +01:00
Laurent Destailleur
776f999b71 Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +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
fappels
6ef72a033b Update tablednd jquery plugin to latest git master 2017-11-07 16:15:59 +01:00
Laurent Destailleur
5df4912324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2017-11-02 09:45:13 +01:00
Laurent Destailleur
3db101ffdd Clean packager 2017-10-31 01:06:07 +01:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
475db3172a NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
Laurent Destailleur
dbcf3ddbe8 NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
Laurent Destailleur
a16f0e4356 NEW The gantt diagram is now sensitive to hours 
NEW Add a group task line for tasks on same level on gantt diagram
 2017-10-20 04:15:44 +02:00
Laurent Destailleur
a818422302 Update jsgantt to 1.7.5.4 2017-10-18 21:24:17 +02:00
Laurent Destailleur
d404d8be9f Debug to make MAIN_ODT_AS_PDF workign with unoconv 2017-10-10 18:54:30 +02:00
Laurent Destailleur
5980651103 Merge branch 'develop' into develop 2017-09-21 11:41:30 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
aba907d1a8 FIX #7420 2017-09-18 15:49:21 +02:00
Laurent Destailleur
2d7916f77d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/json.lib.php
 2017-09-14 11:49:02 +02:00
Laurent Destailleur
7d5dc08a0a Fix PHP7.2 2017-09-14 11:47:27 +02:00
Laurent Destailleur
e2ccac68c5 Fix PHP7.2 2017-09-08 14:45:11 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
25f9d782dc NEW Add non intrusive js library to make syntaxic coloring of textarea 2017-07-12 12:30:07 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
mikee2
6a35047020 Updated to use dolibarr timme functions 
Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.

Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
 2017-06-14 12:53:29 +02:00
Laurent Destailleur
f011197e00 Update swagger to 2.0.24 2017-05-24 15:12:45 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00