Laurent Destailleur
5318e513c1
Debug module website
2017-07-21 02:29:24 +02:00
Laurent Destailleur
3b8f60f90e
Fix pb of recursive include in website module
2017-07-20 16:49:20 +02:00
Laurent Destailleur
0ee93fb00c
Fix conflict between option login and logina and logint in agenda export
2017-07-04 10:29:38 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Laurent Destailleur
8a96260892
Fix amount not filled into email confirmation
2017-07-03 01:57:28 +02:00
Laurent Destailleur
565de9bc8d
Debug module website
2017-07-02 23:38:19 +02:00
Laurent Destailleur
4f72bd35db
Fix too much code into the NOREQUIREDB
2017-07-02 13:18:23 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Laurent Destailleur
cde0da6e12
Fix responsive
2017-06-18 12:48:58 +02:00
Laurent Destailleur
c0f46834cb
Fix demo links
2017-06-13 13:22:05 +02:00
Laurent Destailleur
20f1bb76cb
Fix memu under disabled entries, when using smartphone
2017-06-10 16:13:37 +02:00
Laurent Destailleur
b6af1f7e6e
Fix responsive design
2017-06-10 15:21:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
0458b7d38f
Fix css subscription form
2017-06-09 17:29:34 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
985a9ed8d3
FIX Redirect to payment page from member subscription page failed if a
...
unique security key was defined.
2017-06-09 12:12:12 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Laurent Destailleur
5e29817910
Init of the onlinesign
2017-06-02 20:17:08 +02:00
Laurent Destailleur
5c58ed8ca7
Add a better error message when payment link is not valid.
2017-06-02 09:13:04 +02:00
Laurent Destailleur
d0f01085d8
Add more information on stripe payment
2017-05-29 02:44:14 +02:00
Laurent Destailleur
67b3e3da99
FIX #6784
2017-05-23 15:51:39 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
b3245fb455
NEW Include an hourglass icon when we click on online payment button
2017-05-15 10:27:21 +02:00
Laurent Destailleur
caae7e4171
NEW It's easier to switch between sandbox and live for paypal
2017-05-14 17:05:13 +02:00
Laurent Destailleur
998254d9c6
Finish rewrite and debug of module Stripe.
2017-05-14 16:17:23 +02:00
Laurent Destailleur
9b550ae178
Fix migration of accountancy_journal from char to num.
2017-05-14 12:54:26 +02:00
Laurent Destailleur
9e4e72baee
Enhance module stripe
2017-05-14 05:26:19 +02:00
Laurent Destailleur
0ed4b607b2
Standardize code for payment
2017-05-13 22:17:39 +02:00
Laurent Destailleur
955c9f4217
Standardize the way online payments are working.
...
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
2017-05-13 21:10:56 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
71833f5987
Standardize code
2017-05-13 17:04:46 +02:00
Laurent Destailleur
54088f38fb
Code standardization on online payment code
2017-05-13 14:03:09 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Dinclaux
fb561bae1b
Fix recurring invoices generation when using the cron url
2017-05-10 00:58:48 +11:00
Alexandre SPANGARO
b05d2c50e8
Add mode live
2017-05-08 06:52:30 +02:00
Alexandre SPANGARO
ce62736e6b
Correct link and renamed checkout by newpayment
2017-04-29 07:57:36 +02:00
Alexandre SPANGARO
d73374cc5b
Uniformize link to stripe.lib
2017-04-29 07:34:30 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Alexandre SPANGARO
47089a4d55
Modle Stripe : Work in progress
2017-04-29 07:04:34 +02:00
Laurent Destailleur
fbdfbed02c
Add code to prepare a generic payment solution
2017-04-23 03:01:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
guillaume-uH57J9
199067e4b8
members/new.php : non-public by default
...
in the form, disable public by default, to be consistent with class Adherent's default value
2017-04-09 22:00:19 +02:00
Laurent Destailleur
43e59772e4
Merge pull request #6606 from fappels/develop_add_jqmigrate
...
Develop add jQuery-migrate
2017-03-31 17:48:01 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
fappels
527fa27fb7
Add jquery-migrate to handle jquery 3.0 removes
2017-03-29 11:18:03 +02:00
Laurent Destailleur
6bf61c677f
FIX #6586 Introduce processing status
2017-03-28 13:20:31 +02:00
Alexandre SPANGARO
05e50e1027
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-02-28 05:52:43 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
