Commit Graph

11089 Commits

Author SHA1 Message Date
Laurent Destailleur
40b412728f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-28 11:49:10 +01:00
Laurent Destailleur
43a6366f1b Fix security audit was not triggered. 2017-02-28 11:48:46 +01:00
Laurent Destailleur
79c9745442 Fix size of fields 2017-02-28 11:00:11 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
d12caab69a The hook getNodeList has been replaced by a normalized 'addreplace' hook
getDirList.
2017-02-27 02:04:47 +01:00
Laurent Destailleur
74e8fb9c19 NEW Can set number of dump to keep with job "local database backup" 2017-02-27 02:04:25 +01:00
Laurent Destailleur
43f3e46aac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-27 01:23:48 +01:00
Laurent Destailleur
4f24613de0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8 Fix parameters 2017-02-27 00:22:11 +01:00
Ion
320da17c78 Add object extrafields to mail form 2017-02-26 03:42:42 +01:00
Laurent Destailleur
08915d88d0 FIX the dolCopyDir fails if target dir does not exists. 2017-02-25 11:53:50 +01:00
Laurent Destailleur
bf591f5f91 Work on module website 2017-02-24 21:13:40 +01:00
Laurent Destailleur
63bee0c2d0 Doxygen 2017-02-24 16:23:43 +01:00
Laurent Destailleur
d0ee8c0e2d Merge pull request #6458 from defrance/patch-83
inverted value between FRST & RECUR
2017-02-24 15:27:32 +01:00
Laurent Destailleur
1ef899dacc Prepare database to follow supplier discounts 2017-02-24 15:22:32 +01:00
Laurent Destailleur
47ea9b57e8 Fix Remove debug var_dump 2017-02-24 14:41:12 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
7673aff3ba Fix js errors 2017-02-23 02:51:26 +01:00
Laurent Destailleur
a79903a2fc Fix responsive design 2017-02-23 01:29:35 +01:00
Laurent Destailleur
fbecb1b2d8 Work on removal of jmobile 2017-02-23 00:45:27 +01:00
Laurent Destailleur
d7e1a6e4f0 Fix no timer for browser notification if on login page 2017-02-22 21:18:34 +01:00
Laurent Destailleur
1e45e64a9a Files sent from ECM module are also indexed in database. 2017-02-22 20:35:42 +01:00
Laurent Destailleur
b66ba6c57c Fix warning 2017-02-22 19:48:15 +01:00
Laurent Destailleur
64721d73b6 Remove not so usefull plugin jquery layout (prepare js upgrades) 2017-02-22 19:36:57 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
BENKE Charlie
299551f851 inverted value between FRST & RECUR 2017-02-22 15:59:10 +01:00
Laurent Destailleur
24c2675705 Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
NEW : Can send email to multiple destinaries from mail form
2017-02-22 14:39:35 +01:00
Laurent Destailleur
ba03b17354 Fix css 2017-02-22 14:30:39 +01:00
Laurent Destailleur
a0fb53d5b1 Merge branch 'develop' into NEW_pdf_supplier_payment 2017-02-22 14:20:47 +01:00
Laurent Destailleur
cbe855370b Merge pull request #6451 from laudeco/feature/list_user_by_firstname
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-22 14:17:00 +01:00
Laurent Destailleur
3f3b82ed64 Merge pull request #6454 from atm-florian/dev_fix_unittrad
fix unit trad
2017-02-22 14:16:28 +01:00
Laurent Destailleur
89b52e24f6 Fix menu navigation 2017-02-22 02:41:21 +01:00
Laurent Destailleur
d5bb208957 Clean admin menu entries 2017-02-22 02:19:50 +01:00
Laurent Destailleur
bb72121179 Fix menu loading 2017-02-22 01:47:22 +01:00
Laurent Destailleur
1681445427 Remove useless line 2017-02-22 00:08:25 +01:00
Laurent Destailleur
32678015c9 FIX protection against infinite loop on hierarchy 2017-02-21 23:52:13 +01:00
florian HENRY
c8de648924 fix unit trad 2017-02-21 19:07:57 +01:00
Laurent Destailleur
7ab600781d NEW Move login information on home page into a widget 2017-02-21 11:57:52 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
De Coninck Laurent
33d1d78329 FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users 2017-02-21 09:22:50 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
702ad5bcde Fix menus 2017-02-20 11:29:30 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not
admin user.
2017-02-20 11:21:38 +01:00
arnaud
842859c394 FIX travis bis 2017-02-20 10:16:28 +01:00
arnaud
26b8112d4e FIX travis check 2017-02-20 09:22:57 +01:00
Laurent Destailleur
2dbae7b808 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00