lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

185 Commits

Author SHA1 Message Date
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
4902df7e3f Work on look and feel v6 2017-04-02 19:28:38 +02:00
Laurent Destailleur
4012aeff90 Fix translation 2017-03-25 18:35:17 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
Laurent Destailleur
0a797cd12e Fix us terms. 2017-02-07 20:08:15 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Laurent Destailleur
f7e5898b4a Fix show a more accurate translation 2016-12-20 10:58:31 +01:00
Laurent Destailleur
9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-12-18 11:57:04 +01:00
Laurent Destailleur
394e284a4a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang
 2016-12-18 02:16:40 +01:00
Laurent Destailleur
73e6663230 Fix help/messages for emailing to warn users. 2016-12-17 14:47:06 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
Laurent Destailleur
e4c4ced5a3 Complete work on usin dol_banner 2016-11-11 01:55:53 +01:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
269b9ea2ea Fix translation thirdparty -> third party 2016-10-10 15:15:54 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
d72d22cda4 Fix confusing translation 2016-06-23 23:22:30 +02:00
Laurent Destailleur
f817b562ad Clean language files 2016-06-18 17:17:45 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
91d300289f Minor fix in presentation 2016-05-06 12:15:44 +02:00
Laurent Destailleur
cdbbe8d87b Minor fixes 2016-05-05 23:44:44 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not. 
Fix list of email templates must be hidden for templates of disabled
modules.
 2015-12-18 12:48:20 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
Laurent Destailleur
6df4948a73 Fix text 2015-12-01 03:12:12 +01:00
Laurent Destailleur
bc6d04e495 Typo 2015-11-26 00:08:34 +01:00
aspangaro
a1e383dafa Fix: ER Missing language key 2015-06-16 06:18:43 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
ce05837237 Translation 2015-04-27 09:55:59 +02:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +01:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Florian HENRY
596be3ae44 Trad contact card 2014-04-29 09:43:16 +02:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Laurent Destailleur
4fe4d0fcbc Fix: Translation source 2014-03-09 03:14:53 +01:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Laurent Destailleur
72aec6aa60 Better translation 2013-04-10 13:30:54 +02:00
Laurent Destailleur
b9868bf0ce Fix: units 2012-11-18 18:44:51 +01:00
Laurent Destailleur
ce10c87e09 Fix: No message to show result 
Fix: Must not overwrite property of object
 2012-11-14 18:58:55 +01:00
Marcos GarciÌa
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
Laurent Destailleur
856c829c99 New: Add a selection module for emailing to enter a recipient from 
gui.
 2012-09-05 20:41:28 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Laurent Destailleur
0eb9b105c9 Fix: Translation missing 2012-07-22 23:07:25 +02:00
FHenry
dc42e16ff1 Secure URL use to CheckRead and Unsubcribe with security key in 
configuration screen
 2012-04-30 13:49:29 +02:00
FHenry
2749117aba Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and 
unsubscribe in Admin part
 2012-04-10 14:32:54 +02:00
FHenry
0cf4619682 Emailing campaign- unsubcribe and use of md5 tag 2012-03-01 14:51:07 +01:00
FHenry
229176ea65 Read Receipt in module emailing 2012-02-22 20:49:55 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Laurent Destailleur
0f7bbdae07 Debug of new emailing modules: Add link to third party, and removed some too long statistics. 
Also I rename modules to have them sorted by theme elements.
 2011-03-23 16:31:03 +00:00
Regis Houssin
15d35ed062 patch #7443 : Emailing Plugin to add contacts by position/function 2011-03-23 11:04:30 +00:00
Regis Houssin
50b086d347 patch #7443 : Emailing Plugin to add contacts by category 2011-03-23 09:43:25 +00:00
Laurent Destailleur
8b4a8347a2 Fix: Maxi debug of emailing feature 2010-12-13 18:57:42 +00:00
Laurent Destailleur
6539f61785 Fix: Maxi debug of emailing feature 2010-12-13 18:40:04 +00:00
Laurent Destailleur
d581065f83 Fix: Message more clear. 2010-07-11 12:16:04 +00:00
Laurent Destailleur
846ed3688e EMailing edit page more user firendly 2010-04-17 09:47:25 +00:00
Philippe Grand
84c401d664 some spelling changes 2010-03-20 22:23:53 +00:00
Laurent Destailleur
3b00caf734 New: task #10113 : Show list of emailing on clicking on "number of mass emailing received" 2010-02-21 21:21:12 +00:00
Laurent Destailleur
950555a2fc New: Add list of notifications sent in notification module 2010-01-09 15:50:27 +00:00
Laurent Destailleur
dca2580ea1 Fix: EMail content can't be empty 
New: Use confirm box to send email
New: Show command line to send even if send by web is allowed
 2009-12-30 00:18:01 +00:00
Laurent Destailleur
5e977feb5e Fix translations 2009-10-28 20:37:06 +00:00
Laurent Destailleur
0ce5d8a846 Message more complete 2009-08-26 10:37:09 +00:00
Regis Houssin
40ca6cd93a adding a picto warning if the limit of MAILING_LIMIT_SENDBYWEB is exceeded 2009-08-26 09:50:00 +00:00
Laurent Destailleur
73a4dbd21f Trad: The war against typo errors 2009-08-19 19:18:26 +00:00
Laurent Destailleur
cf0e98809d Fix: Debug module notification 2009-07-29 22:03:20 +00:00
Laurent Destailleur
49eac8ee04 New: Add log tab on emailing module 2009-07-29 18:41:39 +00:00
Laurent Destailleur
bd99870694 Add a confirmation when cloning products. 2009-05-27 15:11:24 +00:00
Laurent Destailleur
c50d2cea03 Can add a field errors-to to emailings 2009-05-24 22:01:19 +00:00
Laurent Destailleur
d580670e0e New: Add a new emailing selector 2009-05-22 15:45:31 +00:00
Laurent Destailleur
a00f87a28c Can resend an emailing 2009-02-18 21:48:07 +00:00
Laurent Destailleur
e2721fd48f Enhancement in EMailing module 2009-02-16 20:30:30 +00:00
Laurent Destailleur
95d6260e87 Added support for SMTPS protocol 2009-02-09 00:04:34 +00:00
Laurent Destailleur
5b2b029f16 Can add additionnal fields in emailings selectors 2009-01-25 22:04:55 +00:00
Laurent Destailleur
fd2782edc8 Convert iso files to utf 2009-01-22 01:00:42 +00:00
Laurent Destailleur
1e464088c8 Added nl_NL in UTF8 2009-01-18 23:42:26 +00:00
Laurent Destailleur
a9b2245a0e Translation 2008-12-04 17:52:32 +00:00
Laurent Destailleur
694df3468a Add kiwi emailing selector 2008-10-15 23:36:30 +00:00
Laurent Destailleur
dea6215940 Trad: Missing translation 2008-08-06 14:50:19 +00:00
Laurent Destailleur
40418d0d38 New: Add a module to select email targets from a file in email module 2008-08-01 20:59:33 +00:00
Laurent Destailleur
0a655c9370 New: Add list of attached files in email forms 2008-05-23 19:43:28 +00:00
Laurent Destailleur
de395a8184 Look: Modif esthétiques mineurs 2008-04-04 11:48:14 +00:00
Laurent Destailleur
65fcfcf69f New: Enhancement on sending email. 2008-02-29 16:26:38 +00:00