Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,078 Commits 35 Branches 179 Tags 1.7 GiB
b8b56e2d26
Commit Graph

409 Commits

Author SHA1 Message Date
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
ea310efba5 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger
 2014-07-02 19:57:18 +02:00
Laurent Destailleur
2537a9d35f Fix: Error if module multicompany was removed without being disabled. 2014-07-02 19:44:25 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue 
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
 2014-06-09 12:34:10 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
4a96fd0d77 Fix: No error once multicompany module has been removed. 2014-05-30 13:08:01 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
e5012a1670 Fix: Bad parameter type 2014-04-28 04:27:49 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
e0e64af18c Fix: Hierarchical user not saved. 2014-04-08 23:51:50 +02:00
aspangaro
cd910b30c9 Problem of presentation when skype module is enabled 2014-02-28 07:20:15 +01:00
aspangaro
6a86c31067 Update Skype Module 2013-11-07 13:17:08 +01:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
74ce3fe738 Fix: rowspan 2013-07-23 19:48:21 +02:00
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
fhenry
6427129480 Fix extrafields update/save on User/fiche.php 2013-05-07 12:25:32 +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
3ecb61f18e Fix: Using div 2013-04-25 20:36:38 +02:00
Laurent Destailleur
f7aa90b3b3 Add user help 2013-04-24 12:43:23 +02:00
Laurent Destailleur
a8ea2a9d06 Prepare code for small screens 2013-04-24 04:06:13 +02:00
Laurent Destailleur
263e9098fa Fix: group name not visible 2013-04-14 02:54:54 +02:00
Laurent Destailleur
b52ca834a0 Optimize size of area 2013-04-11 10:23:35 +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
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Maxime Kohlhaas
d8090ba994 Fix : "Firstname" was used as var instead of "firstname" 2013-03-29 18:47:53 +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
fhenry
9e46a55bbf Taking account remark on pull request 2013-03-17 22:26:06 +01:00
fhenry
07bc0cd09e Taking account remark 
1f5ebb594a
 2013-03-16 17:01:17 +01:00
fhenry
1f5ebb594a [ task #769 ] WYSIWYG for user signature 2013-03-16 09:43:09 +01:00
Laurent Destailleur
fdbd3bf36b Fix: lastname 2013-03-11 17:41:38 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00
Grand Philippe
869a014d32 english standardization 2013-02-23 11:42:12 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
 2013-02-18 15:01:00 +01:00
Laurent Destailleur
50decdd941 Fix: When creating user on other entity, no way to read user 
after creation.
 2013-02-16 21:06:15 +01:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Laurent Destailleur
145573ea79 Qual: Removed useless code for old modules. There is hook now to do same 
job.
 2013-02-15 17:37:30 +01:00
Laurent Destailleur
6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
 2013-02-12 15:17:22 +01:00
Laurent Destailleur
26c66a11ed Fix: Bug 701 2013-01-31 10:21:34 +01:00
Maxime Kohlhaas
66376f1c83 Bug # 701 : A user can only be set admin by an admin 2013-01-31 09:56:52 +01:00
Laurent Destailleur
2300b9d3db Merge remote-tracking branch 'origin/3.3' into develop 2013-01-30 15:25:02 +01:00