Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
aspangaro
b571cc86ff
Add a yn form in user card to know if the user is also an employee
2015-10-09 07:30:48 +02:00
Laurent Destailleur
9f2bcf0e4f
FIX The admin flag is mising.
2015-10-05 23:53:49 +02:00
Laurent Destailleur
7b2fbdd638
FIX Can't change the admin with default setup
2015-10-05 10:04:34 +02:00
Juanjo Menent
7bc6f14736
Merge pull request #3608 from All-3kcis/develop-patch-7
...
fix dangerous sql injection
2015-10-03 23:16:04 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
All-3kcis
2a84afeee4
fix dangerous sql injection #3327
2015-09-25 16:31:55 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
23f6464999
Work on CSS
2015-09-22 01:25:06 +02:00
Laurent Destailleur
58a734cb17
Firstname only on login
2015-09-21 17:28:11 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
7f60abdf7b
FIX #3524
2015-09-16 21:05:02 +02:00
Laurent Destailleur
5ffab9720f
More complete connexion profile
2015-09-07 12:38:39 +02:00
Laurent Destailleur
18f064cc69
Fix login is a mandatory field.
2015-08-20 15:18:36 +02:00
Laurent Destailleur
923203802c
fix dangerous sql injection #3327
2015-08-12 23:33:09 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
4f5e8e2480
Fix: missing context before calling trigger.
...
Clean demo file with list of triggers.
2015-07-19 15:24:54 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
5584acddbd
Content of popup tooltip on contact and login link
2015-06-26 17:21:03 +02:00
Laurent Destailleur
2c5ef858d0
NEW Filter "active" by default on user list.
...
Fix label of permission of project module
2015-06-20 20:35:57 +02:00
Laurent Destailleur
ef5ff2f218
Use the complete popup on user in user list and hierarchy view.
2015-06-16 15:08:20 +02:00
jfefe
190ee35e86
Merge branch 'develop' into api_rest
...
Conflicts:
htdocs/user/card.php
htdocs/user/class/user.class.php
2015-06-15 14:29:34 +02:00
Regis Houssin
c21156dd13
Fix: strict mode hunter
2015-06-10 18:58:42 +02:00
Laurent Destailleur
4a18b730b5
Fix: Avoid warning in expense report validation
...
Fix: navigation in expense report
2015-06-08 13:49:09 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
331ebbdd73
Fix behaviour on grey/visible menu must be same everywhere on
...
application.
2015-06-04 11:42:24 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
523b04a315
Work on finishing
2015-05-31 17:31:15 +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
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
13b78f9c17
NEW Add gender property managed on user card
...
FIX Better error messages when uploading photo of user when permission
to write are not granted
2015-05-30 02:17:05 +02:00
jfefe
a618274760
Allow modify API key from user card
2015-05-29 16:05:52 +02:00
Laurent Destailleur
fe3f701928
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
Laurent Destailleur
0e1cf72c43
Fix bad order for firstname, lasname
2015-05-16 13:59:48 +02:00
Laurent Destailleur
b0d73ee674
FIX Bad link to login page into email for password renewal.
2015-05-12 23:47:28 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
f0fb6f1b2c
Work on md theme
2015-03-24 22:24:15 +01:00
Laurent Destailleur
49824a0e56
Method colorStringToArray can accept the #
...
Method monthArray can return short label of month
2015-03-22 18:17:25 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +01:00
Laurent Destailleur
968b2b433b
Better position for username
2015-02-01 01:43:19 +01:00
Laurent Destailleur
52222ecdfe
Avoid tooltip into tooltip
2015-02-01 01:28:15 +01:00
Laurent Destailleur
1e38227c2d
Reduce number of new to save memory usage.
...
Fight table to replace with div
2015-02-01 00:54:26 +01:00
frederic34
c1943f989b
Tooltip
2015-01-31 10:58:03 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
