Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,625 Commits 36 Branches 189 Tags
a4f44d61a88e787527b34a6d71fc3a2bc6af24d4
Commit Graph

79 Commits

Author SHA1 Message Date
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
fd192f10c4 Merge pull request #10341 from hregis/8.0_bug 
FIX security broken with Multicompany
 2019-01-26 14:28:13 +01:00
Regis Houssin
ffeeb782b0 FIX check is moved to restrictedArea() function 2019-01-16 19:25:19 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
f365a987c4 FIX restore last seach criteria 
FIX filter on employee
 2018-10-09 14:20:53 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
Frédéric FRANCE
e87ff4d9b0 loadlangs 2018-05-26 16:24:54 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Regis Houssin
ef44dfc472 Fix: move transversal mode management in multicompany module 2017-11-04 15:40:35 +01:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
44bdf91715 Add badge with nb of imported calendard on user tab 2017-05-06 12:43:45 +02:00
Laurent Destailleur
d53654e64f Look and feel v6 2017-05-05 20:45:06 +02:00
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
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
Marcos García de La Fuente
74f0ae5bbb FIX #6623 User card shows "Return to list" link even if the user has no rights to list users 
Close #6623
 2017-04-09 14:09:33 +02:00
Laurent Destailleur
ed89852807 Work on look and feel v6 2017-04-01 13:49:17 +02:00
BENKE Charlie
5bc3107c5d Update note.php 2016-12-10 23:30:31 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00
Marcos García de La Fuente
87ad6e7941 Merge branch 'develop' into doactions-usercard 
# Conflicts:
#	htdocs/user/agenda_extsites.php
 2015-10-13 09:49:19 +02:00
Laurent Destailleur
b24d609ecc New banner tab is available on all tab of user object 2015-10-11 16:12:12 +02:00
Marcos García de La Fuente
3fd626705f NEW Added doActions hooks to user cards 
Close #3394
 2015-10-10 22:31:01 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00
Laurent Destailleur
9b4ab63c7d Fix style 2015-05-30 20:07:44 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
Laurent Destailleur
653d9d4167 Fix: ckeditor area is at wrong place 2014-09-09 15:33:41 +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
Raphaël Doursenaud
052d75321f Fixed user note with new update note API 2013-04-20 06:43:13 +02: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
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
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01: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
b670de36a9 Fix: add entity 0 for users and groups 2012-01-11 22:08:25 +08:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Regis Houssin
0c8e4b8f1b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/user/index.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
 2011-11-02 20:29:27 +01:00
Regis Houssin
921a379740 Fix: security 2011-11-02 20:24:51 +01:00