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

379 Commits

Author SHA1 Message Date
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
fce9baddf0 New: Add substitution key into emailing module to include securitykey 
used for paypal links into email.
 2014-01-15 17:21:13 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
2f47b0fcfd Fix: picto for status8 is a flash red icon to report a critical error 
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
 2013-11-04 23:56:15 +01:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Marcos García
f25731b748 CR Fix 
Git required me to commit these changes
 2013-06-12 22:36:30 +02:00
Laurent Destailleur
977cd8ca4c Fix: filtering was deleting data ! 2013-06-12 22:12:06 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
5090cfee54 Fix: Clear of list broken 2013-05-27 16:12:33 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
22731788c5 Qual: Remove duplicate script. Enhance old one. 2013-04-14 20:15:55 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
f3adcc311d Qual: Removed useless table 2013-04-10 18:34:19 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8 Uniformize usage of extrafields methods 2013-04-01 19:43:26 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
85cafee19f New: Add substitutions keys in view 2013-03-24 19:06:20 +01:00
Laurent Destailleur
b3d4811b6f New: Another method to allow style tags into email. 
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
 2013-03-24 19:00:58 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
Laurent Destailleur
298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
 2013-03-15 01:10:56 +01:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function 
New: ajax constant on off can be reversed
 2013-03-13 23:05:34 +01:00
fhenry
d4621c3921 Fix syntax error 2013-03-13 10:15:37 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
255bd565fb Removed warning 2012-11-17 00:58:43 +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
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Marcos García
be174c6b46 Fixed problem with accentuated strings 2012-09-12 17:32:14 +02:00
Marcos García
d5fc2a9488 Fixed incorrect BackToList link 2012-09-12 16:11:16 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515 
Mko515
 2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
FHenry
6fc9bf5143 Correct mail tag __UNSUSCRIBE__ to __UNSUBSCRIBE__ 2012-07-24 10:18:17 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Laurent Destailleur
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Regis Houssin
2e22ac895f Fix: change smtps for have the same email structure of phpmail 2012-06-17 18:43:30 +02:00
Regis Houssin
cf7872497e New: add EXTERNAL_USERS_ARE_AUTHORIZED for bypass security access for 
external users
 2012-06-15 16:53:44 +02:00
Regis Houssin
c6d703de54 Fix: convert lines delimiters 2012-06-15 11:20:09 +02:00
Regis Houssin
a7e45ae10d Fix: missing urlfrom 2012-06-15 11:18:44 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Regis Houssin
515d8278bc Fix: wrong method 2012-06-14 09:44:27 +02:00
Regis Houssin
159206d52c Fix: $id and $rowid conflict 2012-06-14 09:27:16 +02:00
Regis Houssin
7644fa96dc Fix: uniformize code and add specific rights 2012-06-13 21:48:59 +02:00
Regis Houssin
0d6004588e Fix: adjust user rights and change status icon 2012-06-13 21:48:38 +02:00
Regis Houssin
6246228544 New: add extraparams, hooks and extrafields for emailing card 2012-06-13 09:28:59 +02:00
Laurent Destailleur
d9efb88d35 Fix: Can edit emailing even when validated. 2012-05-30 21:40:32 +02:00
Laurent Destailleur
7213ae09fe Checkstyle 2012-05-29 00:08:00 +02:00
Laurent Destailleur
6b2faf02d9 Checkstyle 2012-05-23 23:34:00 +02:00
Laurent Destailleur
ed93e5cc7c Qual: Serious clean of code of formconfirm method. This also solve bugs 
of ecm module when using ajax.
 2012-05-23 23:23:57 +02:00
FHenry
63f6707a7b correct bug #410 
Conflicts:
	htdocs/comm/mailing/cibles.php
 2012-05-21 16:16:24 +02:00
Laurent Destailleur
d0c0a0a42c Fix: Bad warning 2012-05-09 18:16:09 +02:00
Laurent Destailleur
8823f9234f Fix: Bad warning 2012-05-09 17:58:38 +02:00
Laurent Destailleur
cc2ce60312 Fix: Validate broken, missing warning on bad email. 2012-05-09 17:15:44 +02:00
Laurent Destailleur
34f433ee4b Uniformize code 2012-05-09 17:14:46 +02:00
Laurent Destailleur
aa6eb25f85 Qual: Uniformize code 2012-05-09 16:40:54 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01: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
5ed77c8d40 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to 
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
 2012-04-22 11:19:04 +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
Regis Houssin
533d862470 Fix: wrong var name and multi-line function call not indented correctly 2012-04-06 08:34:33 +02:00
Laurent Destailleur
befaf655aa Fix: Disable feature by default. Need option MAIN_SOCIETE_UNSUBSCRIBE to 
enable because feature is a security hole.
 2012-04-05 21:02:00 +02:00
FHenry
6f7773d7e2 Correction lien desincription et mailto:email 2012-04-05 16:45:41 +02:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et 
desinscription
 2012-04-04 15:23:32 +02:00
Laurent Destailleur
c77bc5adf5 Doxygen 2012-03-31 15:42:33 +02:00
Regis Houssin
83272dfd69 Fix: compatibility with edit in place 2012-03-23 21:22:47 +01:00
Regis Houssin
d5aad28768 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/comm/mailing/fiche.php
 2012-03-23 20:06:11 +01:00
Regis Houssin
8c7f405ac9 Fix: uniformize code 2012-03-23 20:03:57 +01:00