lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,147 Commits 43 Branches 150 Tags 886 MiB
192de503bb
Commit Graph

4225 Commits

Author SHA1 Message Date
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code 2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code 2018-11-15 20:32:51 +01:00
Frédéric FRANCE
92cda2a75c
fix cant use method return value 2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f
correctly check intl extension 2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3
replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
c266084db7
Merge pull request #9841 from laudeco/fix/9824_pdf_merge 
FIX the pdf merge
 2018-10-24 02:31:48 +02:00
De Coninck Laurent
59307165ce fix the pdf merge 
fix the pdf merge.

[See: #9824]
 2018-10-21 19:45:33 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes 
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
 2018-09-15 13:31:25 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Jean Traullé
c0f98ab4c8
New REST API Explorer branding and improvements 
- Header of REST API Explorer has been Dolibarr colored
- API Methods are now sorted alphabetically
- API endpoints with same names are now sorted in this order (GET, POST, PUT, PATCH, DELETE)
 2018-08-26 17:13:19 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Laurent Destailleur
fb8dd2f32b FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3 2018-06-08 09:37:26 +02:00
Laurent Destailleur
1f775c907d Fix translation of % column in gantt view 2018-05-04 11:01:22 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
Laurent Destailleur
b756c4a51e Upgrade to tcpdf 6.2.17 2018-03-25 19:42:34 +02:00
Laurent Destailleur
5fae930f85 Fix warnings 2018-03-25 19:22:08 +02:00
Laurent Destailleur
73273f68b3 Prepare lib to be a native class 2018-03-25 19:21:00 +02:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
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
Frédéric FRANCE
0568461a7b
swiftmailer 2018-01-25 22:03:51 +01:00
Frédéric FRANCE
a34b99f3ec
swiftmailer 2018-01-21 15:55:56 +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
mikee2
637e1a8d21 Update Segment.php 
Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
 2017-05-06 10:49:37 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
bb47c69283 Merge pull request #6685 from mikee2/develop 
Add macro replacement to ODT invoice lines
 2017-04-29 21:20:19 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
05fe0d7fcd Fix doxygen 2017-04-29 01:01:12 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
af56c85057 Fix perms on file 2017-04-24 03:11:19 +02:00
Alexandre SPANGARO
d0e27f67e7 Add plugins Stripe 2017-04-18 05:44:08 +02:00
mikee2
e6b20840a3 Update Segment.php 2017-04-14 11:49:30 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
fappels
527fa27fb7 Add jquery-migrate to handle jquery 3.0 removes 2017-03-29 11:18:03 +02:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
0b69d0143b Try jSignature 2017-03-03 15:26:51 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
559478048c Move resources for theme at a batter place 2017-02-24 14:38:20 +01:00
Laurent Destailleur
f75af2af37 Close #6146 - Let's experiment fontawesome. 2017-02-24 14:37:18 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
49d0deea39 NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12 2017-02-23 00:46:19 +01:00
Laurent Destailleur
fbecb1b2d8 Work on removal of jmobile 2017-02-23 00:45:27 +01:00
Laurent Destailleur
64721d73b6 Remove not so usefull plugin jquery layout (prepare js upgrades) 2017-02-22 19:36:57 +01:00
Laurent Destailleur
bab4f5c185 Removed useless library FPDFI. 2017-02-22 18:00:34 +01:00
Laurent Destailleur
bc43a052f4 Default usage to send token is header. 2017-02-03 12:16:13 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
Laurent Destailleur
1082997f62 FIX #5972 #5734 2016-11-11 15:19:25 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
7ceb3cb62a FIX Avoid error 500 if phpexcel is disabled 2016-10-22 16:53:22 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
03ebe769d7 Clean sources from not used libraries. 2016-10-05 00:38:17 +02:00