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
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
828fe984e8
FIX #5734
2016-09-12 00:09:46 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
9fabfe029b
Remove debug logs
2016-07-29 16:31:29 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
