Commit Graph

720 Commits

Author SHA1 Message Date
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
2ba6f96765
Update style.css.php 2018-10-24 02:27:59 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php 2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php 2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php 2018-10-21 09:23:33 +02:00
Laurent Destailleur
66cb06eca9 NEW Top menu is always on screen with MD theme. 2018-10-18 17:33:14 +02:00
Laurent Destailleur
8779d3043f css 2018-10-13 14:22:26 +02:00
Laurent Destailleur
1ca3a41f4f Fix login 2018-10-13 14:16:42 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Laurent Destailleur
f154139a0e Reduce length of tab title "Bank" 2018-10-04 20:22:25 +02:00
Laurent Destailleur
5f897eb7ee Clean code 2018-10-01 00:40:02 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Laurent Destailleur
09a41fd757 Look and feel v8 2018-09-19 17:33:50 +02:00
Laurent Destailleur
a8ecec68e7 css 2018-09-18 11:58:26 +02:00
Laurent Destailleur
d872beb499 Fix css 2018-09-17 12:59:43 +02:00
Laurent Destailleur
a75629e8e9 CSS 2018-09-17 12:25:49 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57:32 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +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
18125d56e5 css 2018-07-23 14:10:59 +02:00
Laurent Destailleur
174394c476 Work on website module 2018-07-23 14:08:20 +02:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
0170906524 Look and feel 2018-06-23 14:39:24 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
19e40466b1 css 2018-06-19 13:26:30 +02:00
Laurent Destailleur
187127ce6f Fix CSS 2018-06-16 21:19:50 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
a6104d18a9 CSS 2018-06-02 16:36:05 +02:00
Laurent Destailleur
3d97fa36d1 CSS 2018-05-25 11:08:05 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
39aef07c6b FIX Only voters can send comments in public survey page 2018-04-25 17:14:18 +02:00
Laurent Destailleur
271e50ccf4 CSS 2018-04-24 10:06:13 +02:00
Laurent Destailleur
9b57dadc18 css 2018-04-21 00:05:14 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
8c307987d8 css 2018-04-16 00:26:13 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Laurent Destailleur
187cc35786 Look and feel v8 2018-04-14 22:23:56 +02:00
Laurent Destailleur
2f0780a51f csss 2018-04-14 15:53:58 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
QuentinSu
803ea150cb
Update style.css.php
Line break not taken into account in the GED module
2018-04-10 17:12:26 +02:00
Laurent Destailleur
99ed9c4589 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
f659b62316 CSS 2018-04-07 17:14:23 +02:00
Laurent Destailleur
d3adbdfbbc FIX Restaure way to have empty entry menu 2018-04-06 14:04:52 +02:00
Laurent Destailleur
ff505ba148 Work on a page dedicated for external frontend (mobile, ...) 2018-03-29 11:34:01 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Laurent Destailleur
42b0a22df2 Use font-awsome for play icon 2018-03-21 13:16:05 +01:00
Laurent Destailleur
857bb6c6ee Css 2018-03-21 10:53:15 +01:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
cb1069cf0b Use font-awesome for the picto to move/transfer a line 2018-03-17 13:21:27 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec WIP to show event per hours 2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
5839cedb4c CSS 2018-03-04 10:47:35 +01:00
Laurent Destailleur
01b0336e9b Fix tooltip on delete button 2018-03-03 12:10:27 +01:00
Laurent Destailleur
471aca5180 CSS 2018-03-02 11:41:46 +01:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8 css 2018-03-01 23:51:06 +01:00
Laurent Destailleur
0a27855141 CSS 2018-03-01 18:21:47 +01:00
Laurent Destailleur
132ee2c788 CSS 2018-03-01 16:48:12 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Laurent Destailleur
6f29a574cf CSS 2018-03-01 02:37:18 +01:00
Laurent Destailleur
82a9d1797f css 2018-02-28 19:36:04 +01:00
Laurent Destailleur
1907b9c52d Fix search on dates on template invoices 2018-02-27 19:04:21 +01:00
Laurent Destailleur
7ba263c9ab Fix search on dates on template invoices 2018-02-27 19:03:14 +01:00
Laurent Destailleur
de89893d57 NEW Show total of time consumed in week in time spent entry page 2018-02-26 14:09:56 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00
Laurent Destailleur
1a6cff8fee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 01:28:14 +01:00
Laurent Destailleur
e984d7df9f NEW Add total of time spent in timespent page at top of page too. 2018-02-09 23:52:43 +01:00
Laurent Destailleur
84fd67c407 CSS 2018-02-09 15:49:49 +01:00
Laurent Destailleur
a7682eb59f CSS 2018-02-08 21:01:34 +01:00
Laurent Destailleur
0f51963600 NEW Externalsite module can accept iframe content. 2018-02-08 19:00:13 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
b56da9c11e Better balance css columns in dashboard 2018-02-08 15:11:05 +01:00
Laurent Destailleur
729cf20df7 Fix css 2018-02-07 20:53:13 +01:00
Laurent Destailleur
b1f43a14bd CSS 2018-02-07 02:29:55 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
ad621f4035 CSS 2018-02-05 23:17:05 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
18ed53b9a7 Fix css 2018-01-24 18:04:06 +01:00
Laurent Destailleur
6e906ac0e3 Clean code 2018-01-24 13:08:09 +01:00
Laurent Destailleur
f1b63d7cbf Fix css 2018-01-23 09:00:03 +01:00
Laurent Destailleur
273e88a599 Fix send into ledger for expense report. Show accounted status. 2018-01-22 03:07:11 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
3410e29755 CSS 2018-01-15 11:20:45 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
eaecb9da5e CSS 2018-01-11 20:33:09 +01:00
Laurent Destailleur
42e659e26c Fix link for online payment 2018-01-08 13:21:04 +01:00
Laurent Destailleur
3b54be5dac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/product/price.php
2017-12-22 12:55:16 +01:00
Laurent Destailleur
207730bf63 Css 2017-12-22 00:22:33 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
635917d0e6 CSS 2017-12-20 21:33:45 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d Fix look and feel v6 2017-12-20 19:30:30 +01:00
Laurent Destailleur
3f6b3b51ca Fix css 2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
b1f98b5903 Fix inline edit 2017-12-20 12:45:38 +01:00
Laurent Destailleur
8d671b2b26 Debug website module 2017-12-17 16:24:47 +01:00
Laurent Destailleur
9f2a42b67d NEW Can filter on user on unalterable log 2017-12-16 21:50:58 +01:00
Laurent Destailleur
e90a6b8c0f Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work
also with md theme.
2017-12-16 20:52:49 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
427f1490f8 Fix css 2017-12-14 13:52:32 +01:00
Laurent Destailleur
9880ef7364 Fix module website 2017-12-12 01:40:34 +01:00
Laurent Destailleur
4443c0f0a0 Fix style 2017-12-10 15:24:47 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
a15a57317b Debug accountancy module 2017-11-28 11:12:13 +01:00
Laurent Destailleur
cf274a7e3f Fix CSS 2017-11-26 22:23:21 +01:00
Laurent Destailleur
b142ac1c06 CSS 2017-11-26 22:12:11 +01:00
Laurent Destailleur
d340d7bae5 Fix CSS 2017-11-26 21:56:41 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
3db52b5f9e Debug responsive of v7 2017-11-24 14:23:25 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event.
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
Laurent Destailleur
90684750c1 CSS 2017-11-18 13:09:12 +01:00
Laurent Destailleur
56036d3024 Fix css 2017-11-18 02:03:10 +01:00
Laurent Destailleur
7ddf1669ef Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:34:20 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
0d192df1fd Standardize interface 2017-11-16 18:33:56 +01:00
Laurent Destailleur
4d198534a2 Clean CSS files 2017-11-16 12:09:34 +01:00
Laurent Destailleur
5c3d8acfbb Work on website 2017-11-15 19:47:07 +01:00
Laurent Destailleur
010e542fe4 CSS 2017-11-14 01:15:02 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd CSS 2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795 css 2017-11-10 18:27:03 +01:00
Laurent Destailleur
864e747f51 CSS 2017-11-07 19:46:28 +01:00
Laurent Destailleur
141bef0b8a Fix translation and css 2017-11-04 15:21:35 +01:00
Laurent Destailleur
cfacfab6cf NEW Show badge with nbr of shipment on shimpen tab of order
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
4220d02dd4 Debug module blocked log 2017-10-31 23:57:37 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Laurent Destailleur
1a49a2bb94 Clean css/code 2017-10-28 11:00:02 +02:00
Laurent Destailleur
815faf4c91 Fix css for website 2017-10-27 16:00:37 +02:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
caa24e1a68 Fix width of tooltips 2017-10-26 12:34:53 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
99b88265d3 Fix larger select2 combo 2017-10-21 21:05:00 +02:00
Laurent Destailleur
475db3172a NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
daa7847ab3 NEW All search boxes are available on smartphone 2017-10-20 01:18:21 +02:00
Laurent Destailleur
428c3e973d FIX for combo on rtl languages 2017-10-18 18:36:10 +02:00
Laurent Destailleur
6bcdf2ff75 Test replacement of img switcher with FA css 2017-10-17 14:03:22 +02:00
Laurent Destailleur
3f36cf23f5 NEW Break lines per project on the new timesheet page 2017-10-12 13:17:22 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
90964d25ce Fix css 2017-10-02 17:52:20 +02:00
Laurent Destailleur
0e15aef44f CSS 2017-09-30 00:30:58 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Laurent Destailleur
87a75a0ad7 CSS not bold on jnotify messages 2017-09-24 01:46:00 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Laurent Destailleur
7d580105c8 Fix css 2017-09-23 13:02:25 +02:00
Laurent Destailleur
35d00fd2ec Fix wrap on lites_total 2017-09-23 09:28:31 +02:00
Laurent Destailleur
839f3ca41d NEW Can use an url like $conf->global>-MYPARAM for menu urls 2017-09-23 03:22:48 +02:00
Laurent Destailleur
a94f2b07e1 Fix css 2017-09-23 02:46:33 +02:00
Laurent Destailleur
2f317c5834 Debug online payment using unique form 2017-09-20 19:34:14 +02:00
Laurent Destailleur
1d6213ea7d Add picto for cheque payment 2017-09-20 15:29:47 +02:00
Laurent Destailleur
5f7631a95d NEW Days where user is on vacation use different colors in timesheet. 2017-09-19 17:07:39 +02:00
Laurent Destailleur
f5bc9c08b1 Missing css 2017-09-19 11:38:28 +02:00
Laurent Destailleur
34221fc163 CSS of payment page 2017-09-11 03:38:39 +02:00
Laurent Destailleur
c5567fafd4 Enhancement for smartphone 2017-09-04 09:25:53 +02:00
Laurent Destailleur
9312005318 NEW Move accountancy features into a dedicated menu 2017-08-29 12:43:47 +02:00
Laurent Destailleur
c29d78bd0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-24 14:57:44 +02:00
Laurent Destailleur
9684c8b4bc Fix css 2017-08-24 14:54:32 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
e25a428118 Fix compatibility with Internet Explorer 2017-08-23 12:32:28 +02:00
Laurent Destailleur
b48f501a0c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 11:04:09 +02:00
Laurent Destailleur
d7be62b7da Better style 2017-08-21 11:02:24 +02:00
Laurent Destailleur
083cb33a6c Clean ecm code 2017-08-20 23:16:20 +02:00
Laurent Destailleur
2321091170 NEW Move the upload input on top right in ECM module 2017-08-20 21:23:19 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
2f9f9ac80d Fix personal conf was not loaded 2017-07-31 11:56:20 +02:00
Laurent Destailleur
80f096a9d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 02:09:15 +02:00
Laurent Destailleur
1897e3cbad Some fix for better compatibility 2017-07-30 20:43:18 +02:00