Commit Graph

1393 Commits

Author SHA1 Message Date
Laurent Destailleur
9630c7b5c7 Merge pull request #9614 from grandoc/new_branch_25_09_2018
Add some code comment
2018-09-27 09:31:19 +02:00
Philippe Grand
b7304e3d82 Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Laurent Destailleur
29893daf6f Merge pull request #9599 from zeenlym/forgotten_passlink
NEW Change forgotten password link in general parameters
2018-09-27 09:17:28 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Frédéric FRANCE
a9f7bdead6 fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
2018-09-23 21:26:07 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Laurent Destailleur
5a0ffb68d7 Merge pull request #9576 from atm-john/FIX_attribute_closing
FIX attribute closing
2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e Merge pull request #9061 from delcroip/comptafiles
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
2018-09-20 19:45:46 +02:00
John BOTELLA
b59b0b0cc3 FIX attribute closing 2018-09-20 16:13:22 +02:00
Laurent Destailleur
d4ffc5e088 css 2018-09-20 00:48:00 +02:00
Laurent Destailleur
1d47569651 Brighter gradient 2018-09-19 15:06:14 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
Laurent Destailleur
ca85356b45 Merge pull request #9427 from frederic34/patch-6
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57:32 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
2018-09-12 18:11:51 +02:00
Laurent Destailleur
10becd2046 Merge pull request #9483 from ptibogxiv/patch-54
New donation module
2018-09-12 17:34:21 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Laurent Destailleur
33f71be6ef Fix gradient ok for webview 2018-09-07 19:03:53 +02:00
Laurent Destailleur
e5058a251d Use colored gradient background on login page 2018-09-07 12:27:08 +02:00
ptibogxiv
b630a97215 add payment link on admin gateway 2018-09-05 17:41:37 +02:00
Laurent Destailleur
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Laurent Destailleur
fde9c94b1c Fix regression in media editor in websites 2018-08-28 14:21:58 +02:00
Frédéric FRANCE
6113b536a0 remove superfluous spaces 2018-08-12 19:59:39 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Juanjo Menent
37a9a2df56 Merge pull request #9167 from frederic34/include
Include and co are statements
2018-08-02 11:03:44 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
77c121b15c Merge pull request #9099 from ATM-Nicolas/7.0
NEW Set contactCivName substitution key
2018-07-24 18:02:21 +02:00
Laurent Destailleur
174394c476 Work on website module 2018-07-23 14:08:20 +02:00
Laurent Destailleur
7dc552a54e Fix alignement 2018-07-17 18:10:42 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
ATM-Nicolas
3c5998e697 FIX : Refactoring 2018-07-16 11:16:55 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
ATM-Nicolas
9d60b0a8c6 Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-07-16 09:47:16 +02:00
ATM-Nicolas
de8fd3d12c NEW : Contact substitutions keys 2018-07-16 09:33:14 +02:00
Laurent Destailleur
e92052353d Merge pull request #9026 from inoveaconseil/FixExtrafieldResource
Fix extrafields resource
2018-07-15 20:13:24 +02:00
ATM-Nicolas
170a668b2b FIX : Set contactCivName substitution key 2018-07-13 11:09:56 +02:00
Laurent Destailleur
291f149a9b NEW Can set a tooltip help text on extrafields 2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
delcroix Patrick
5f7a308552 Merge branch 'develop' into comptafiles 2018-07-05 22:35:40 +02:00
delcroix Patrick
e88dd77ea5 no change 2018-07-05 21:42:34 +02:00