Laurent Destailleur
e5a945ba5b
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
fhenry
2440513007
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/opensurvey/fonctions.php
htdocs/opensurvey/public/choix_date.php
htdocs/opensurvey/public/create_survey.php
htdocs/opensurvey/public/exportcsv.php
htdocs/public/paybox/paymentko.php
Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
2013-04-11 10:04:27 +02:00
Laurent Destailleur
76c180aaaf
Fix: encoding at wrong place
2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4
Fix: bad url
2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73
Fix: demo modules list
2013-04-10 23:06:38 +02:00
fhenry
98ddd02a32
Qual : PHP Code_Sniffer
2013-04-10 19:55:21 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
Laurent Destailleur
25ec7eed6d
New: Can send email to warn when payment for subscription is payed.
2013-04-06 16:14:28 +02:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
c3589e9785
Some debug into cron module:
...
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
7703537b96
New: Work on cron module
2013-03-17 19:39:53 +01:00
Grand Philippe
e1baf806b9
change birth instead of naiss
2013-03-13 22:17:03 +01:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Laurent Destailleur
b43fffafa9
Fix: Regression after renaming of fields
2013-03-08 01:31:45 +01:00
Laurent Destailleur
1d76b3153e
Start to work onto payment return
2013-02-28 17:37:07 +01:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
4f9f32eb3e
english language standardization
2013-02-23 16:37:17 +01:00
Grand Philippe
9400d9897a
english standardization
2013-02-23 10:35:46 +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
fa2e9cbd4f
Exclude external modules
2013-01-24 10:06:39 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +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
Cedric GROSS
ff3231045b
Fix: A better fix for escaping data: escape for database must be done
...
during sql request forging. Also renamed tag to tag.
Merge:
Security fix emailing read and
unsubscribe
unsubscribe can lead to email disclosure
Conflicts:
htdocs/public/emailing/mailing-unsubscribe.php
2013-01-04 18:08:34 +01:00
Laurent Destailleur
86645d8be9
Fix: Field birthday must be hidden for moral members
2013-01-04 00:23:46 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
1722d58196
Fix: Selection of choice in demo page
2012-12-28 22:05:36 +01:00
Laurent Destailleur
5cf07a214c
Fix: Close db at wrong place
2012-12-16 19:42:58 +01:00
Regis Houssin
b09a44701e
Fix: wrong EOL
2012-12-13 13:08:03 +01:00
Regis Houssin
5f41174cfa
Fix: bad path for photo and uniformize code
2012-12-13 11:42:59 +01:00
Laurent Destailleur
bdb112c820
Fix: Using bad root url.
2012-12-12 14:46:13 +01:00
Laurent Destailleur
2c2465ffad
Comment to make test
2012-12-12 13:14:28 +01:00
Laurent Destailleur
caf897cfa7
Clean code to help debug pb with payment methods.
2012-12-12 01:49:23 +01:00
Laurent Destailleur
e53f6a383d
Fix: Removed a hard coded error code.
2012-11-20 11:23:34 +01:00
fhenry
e12999bcfd
Correct fix
2012-11-06 15:39:47 +01:00
fhenry
3651b8895e
Fix bug on mass mailling unsubsscribe fonctionnality
2012-11-06 14:21:17 +01:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Laurent Destailleur
29b4e1f57a
Removed not available module from demo
2012-09-13 09:19:45 +02:00
Laurent Destailleur
41078019dd
Make demo of foundation at end
2012-09-12 17:24:39 +02:00
Laurent Destailleur
0cf89eac08
Doxygen
2012-09-08 02:17:08 +02:00
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
Laurent Destailleur
26b05212c7
Fix: Missing include
2012-08-28 09:33:43 +02:00
Laurent Destailleur
bdaaa1d038
New: [ task #494 ] Send an email to foundation when a new member has
...
auto-subscribed
2012-08-26 22:33:27 +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
