Commit Graph

2061 Commits

Author SHA1 Message Date
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce
duplicate code and avoid users to be lost.
2015-06-19 11:19:13 +02:00
Laurent Destailleur
a2e9ebe2d1 Fix hover is ok on boxes array too. 2015-06-18 14:25:13 +02:00
Laurent Destailleur
b7c777dc07 Css fix 2015-06-16 15:14:33 +02:00
Laurent Destailleur
a52be15722 Enhance look for left menu seach form when HTML5 is on 2015-06-16 13:09:46 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
1c280a9219 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/theme/eldy/style.css.php
2015-06-12 16:29:50 +02:00
Laurent Destailleur
f58bd37067 Css 2015-06-12 16:22:32 +02:00
Laurent Destailleur
1a2bde14fb FIX Better management error into the color conversion functions 2015-06-12 14:37:27 +02:00
Laurent Destailleur
4a726f6315 Fix css 2015-06-12 13:44:03 +02:00
Laurent Destailleur
ed0e6753e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-12 13:09:32 +02:00
Laurent Destailleur
3678a12767 NEW Can assign a task to yourself to have it appear on timesheet 2015-06-11 18:27:59 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying
Fix #2985
2015-06-08 17:23:02 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product
Enhance also the prototype test_arrays to include select form before
table.
2015-06-08 15:07:37 +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
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2
New: Add object ot the company & Add picture cerfa logo
2015-06-05 15:58:47 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become
officialy visible into setup.
2015-06-04 13:32:21 +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
Laurent Destailleur
76865c00b5 NEW The line where mouse is over can be highlight with option
THEME_ELDY_USE_HOVER (on by default)
2015-06-03 16:49:22 +02:00
Laurent Destailleur
f7eaf35d30 NEW When creating order, proposal or invoice from thirdparty card, the
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +02:00
aspangaro
aa9951948b New: Add logo cerfa in common themes files 2015-06-03 06:02:52 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile.
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +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
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
Laurent Destailleur
b14b1c1b12 Use dedicated picto 2015-05-30 15:21:48 +02:00
Laurent Destailleur
afd7366459 Css 2015-05-26 09:22:34 +02:00
Laurent Destailleur
bf334d8711 NEW Thumbs for statistics on main page are fully clicable (not only link
inside the thumb)
2015-05-26 09:13:48 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
97ba2cf0e9 Replace ol icon for delete with new one 2015-05-22 12:21:55 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is
visible (for both external and internal users).
2015-05-22 12:21:36 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +02:00
Laurent Destailleur
e075fce5eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae Enhance style 2015-05-21 01:32:56 +02:00
aspangaro
63b0dbd47b Add pagination style in every template 2015-05-19 21:59:44 +02:00
Laurent Destailleur
684686e0f6 Fix restore compatibility of new navigation style with jmobile 2015-05-18 08:59:58 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +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
976211b70f Look enhancement 2015-05-15 12:53:14 +02:00
Laurent Destailleur
4931401188 Fix new pagination style was not working correctly. 2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437 Merge pull request #2774 from aspangaro/develop-pagination
NEW Use larger button for navigation
2015-05-15 03:57:29 +02:00
Laurent Destailleur
34fb863fc5 Merge pull request #2831 from aspangaro/develop-md
Md_exp: Deactivate gradient into div.liste_titre & Attenuate lines #ddd -> #f4f4f4
2015-05-15 03:53:23 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
aspangaro
304a6936a5 Attenuate lines #ddd -> #f4f4f4 2015-05-12 06:58:29 +02:00
aspangaro
02d7c1cf01 Deactivate Gradient into div.liste_titre 2015-05-12 06:44:14 +02:00
Laurent Destailleur
8075a92d5b FIX Bad logo for status "Do not contact" of thirdparty. 2015-05-12 02:40:21 +02:00
aspangaro
fece843091 Theme Md: Change font & divide by two the border-radius 2015-05-10 15:08:53 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
Laurent Destailleur
db63a9783e More responsive design 2015-05-06 00:29:39 +02:00
Laurent Destailleur
a4675010ac Fix label 2015-05-05 22:08:53 +02:00
aspangaro
d06f1db7d0 Merge remote-tracking branch 'Upstream/develop' into develop-pagination 2015-05-05 21:42:34 +02:00
aspangaro
f092be58c8 New: Add visual pagination for use on tablet 2015-05-05 21:41:08 +02:00
Laurent Destailleur
ac4bd7d441 Uniformize code 2015-05-04 11:41:30 +02:00
Laurent Destailleur
0ba2ae6d32 Some fix in css 2015-05-03 21:31:09 +02:00
Laurent Destailleur
333a29683c uniformize look 2015-05-03 21:15:08 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
f0b10c14d7 NEW Add a new component to select categories/tags from the main edit
page of product. The dedicated tab is also removed.
2015-05-03 15:51:55 +02:00
Laurent Destailleur
4e04f75c66 Fix css 2015-04-27 02:33:44 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is
black on white (better contrast).
Fix editfieldval for date.
2015-04-25 22:20:10 +02:00
Laurent Destailleur
0e141f2c1b Fix css 2015-04-23 15:35:32 +02:00
Laurent Destailleur
5a9c40eb59 Fix minor look and security errors 2015-04-21 12:03:51 +02:00
Laurent Destailleur
207b372930 CSS 2015-04-19 12:06:21 +02:00
jfefe
c90801c0ad Add home picto for index page title 2015-04-19 00:41:29 +02:00
jfefe
c9d377f07f Modify generic picto 2015-04-19 00:38:29 +02:00
jfefe
c3e81c2d21 Modify accountancy picto for titles 2015-04-19 00:33:36 +02:00
jfefe
57d04c601f Add title picto for project section 2015-04-18 23:39:04 +02:00
jfefe
73ef3d73c2 Change size of generic title picto 2015-04-18 23:28:20 +02:00
jfefe
23e5bc4f53 Add title image for bank section 2015-04-18 23:17:47 +02:00
jfefe
22c3406498 Change title images for accountancy section 2015-04-18 23:17:47 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
jfefe
4f0829d4ea Adjust CSS : missing color for input, textarea and select list 2015-04-18 19:01:33 +02:00
jfefe
c5b191d590 Adjust CSS properties for tables 2015-04-18 18:57:13 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
2b071a6091 NEW: For a contract line, price is no more mandatory. 2015-04-10 10:17:20 +02:00
Juanjo Menent
a0de33912e Closes #2545 Bug: Missing object_margin.png in Amarok theme
Conflicts:
	ChangeLog
2015-04-07 18:57:45 +02:00
Juanjo Menent
2dfaf08f61 Closes #2545 Bug: Missing object_margin.png in Amarok theme
Conflicts:
	ChangeLog
2015-04-07 18:54:38 +02:00
Juanjo Menent
345b609ff0 Closes #2545 Bug: Missing object_margin.png in Amarok theme 2015-04-07 18:41:40 +02:00
Laurent Destailleur
e6c9e07de4 NEW Backup and restore tool is easier to use 2015-04-03 17:17:02 +02:00
Florian HENRY
092dd38851 FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets 2015-04-03 15:33:41 +02:00
Laurent Destailleur
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
f7b8a2b036 Restore align=right 2015-03-25 18:13:53 +01:00
Laurent Destailleur
f0fb6f1b2c Work on md theme 2015-03-24 22:24:15 +01:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
Laurent Destailleur
72ce60ff36 Enhance themes 2015-03-23 14:53:21 +01:00
Laurent Destailleur
994606dbc9 More space for tables (=> to follow css bootsrap rules) 2015-03-23 05:09:55 +01:00
Laurent Destailleur
5c36bb94f2 Work on theme material design 2015-03-22 22:29:52 +01:00
Laurent Destailleur
3ed0cf6a75 css fix 2015-03-22 22:25:26 +01:00
Laurent Destailleur
1a1959b52c Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
2015-03-22 21:18:25 +01:00
Laurent Destailleur
d678b554e0 Fix css 2015-03-22 18:39:05 +01:00
Laurent Destailleur
809690fad7 Saved logo in black int menu eldy.
Start new dev theme based on material design.
2015-03-22 18:09:22 +01:00
Laurent Destailleur
b44f87f548 Clean css 2015-03-22 15:38:50 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
2015-03-13 17:46:31 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
with 3.6
2015-03-13 15:20:08 +01:00
Laurent Destailleur
279e16a811 grey disabled 2015-03-13 14:24:32 +01:00
Laurent Destailleur
7c08f33fe1 Missing style buttonRefused 2015-03-08 02:26:41 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
2015-03-08 02:08:26 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
dba050fd43 Fix: tags h correctly supported 2015-02-20 15:55:55 +01:00
Laurent Destailleur
dec277f30f Accept h tags 2015-02-20 15:53:19 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
2015-02-15 19:51:49 +01:00
Laurent Destailleur
c596fa1475 Introduce a protection to avoid migration if database has critical bugs
making data lost.
2015-02-14 12:24:16 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
6770e0415a [CORE] assainissement du code (#new_ask_price). 2015-02-04 10:06:03 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
2015-01-30 15:53:06 +01:00
phf
60be0193b0 [CORE] Initialisation global du module askpricesupplier (#new_ask_price). 2015-01-26 17:21:35 +01:00
Laurent Destailleur
8fb6ade27a Fix drag and drop in agenda view 2015-01-25 17:49:11 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
d72d056e02 Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
Laurent Destailleur
8e613764c5 Merge pull request #2165 from defrance69/patch-35
Patch 35
2014-12-22 09:53:36 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
e6d2bc0bff Maj icon 2014-12-22 03:12:01 +01:00
Laurent Destailleur
46fdd19389 Update image for menu 2014-12-22 02:54:38 +01:00
Laurent Destailleur
c9db04985e Update image for menu 2014-12-22 02:53:33 +01:00
Laurent Destailleur
a519df5d00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2014-12-22 01:43:20 +01:00
BENKE Charles
7cca53ed04 Update style.css.php 2014-12-21 14:26:46 +01:00
BENKE Charles
e802b934fa Update style.css.php 2014-12-21 14:26:22 +01:00
BENKE Charles
7e9596c971 Update style.css.php 2014-12-21 14:25:54 +01:00
BENKE Charles
932fadbdbd Update style.css.php
harmonisation with eldy theme for tabs feature
2014-12-21 14:24:55 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
849628f020 Fix: Typo and translation 2014-12-17 01:56:36 +01:00
Laurent Destailleur
0cd29b3343 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-15 23:24:47 +01:00
Laurent Destailleur
bdf8189d20 Fixed: CSS 2014-12-15 10:40:39 +01:00
Laurent Destailleur
a8c6417604 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-15 10:33:14 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
a0112ba724 Better position of elements 2014-12-11 21:38:53 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
e95160c218 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/user/agenda_extsites.php
2014-12-08 17:51:36 +01:00
Laurent Destailleur
4d7f3cb741 Fixed: Pb of wrapping login page
New: Use placeholder
2014-12-08 02:41:21 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
ec0c7476fb Work on select2 prototype. 2014-12-07 23:51:36 +01:00
Laurent Destailleur
20e76aa4e6 Fixed: Use constant to hide a feature that will probably be broken. Also
it is a superfluous feature.
2014-11-30 02:05:45 +01:00
aspangaro
b98c0a3208 Login - Better presentation with RWD 2014-11-27 20:32:29 +01:00
Laurent Destailleur
2264009247 Fix: css 2014-11-20 11:24:06 +01:00
Laurent Destailleur
a3ab22e27d Fix: css 2014-11-15 00:16:59 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
6762b98c00 Minor look enhancement during debug 2014-11-07 23:25:39 +01:00
Laurent Destailleur
0559e29c92 Prepare freeze 2014-11-07 21:52:50 +01:00
Laurent Destailleur
17b372a4b9 css generic 2014-11-03 16:29:45 +01:00
Laurent Destailleur
762eb1cd48 Style were lost 2014-11-01 20:04:01 +01:00
Laurent Destailleur
1bbdd3798e Better contrast 2014-10-24 00:53:41 +02:00
Laurent Destailleur
8d937d2d36 Uniformize position of "Create link" on categories. 2014-10-19 20:37:46 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or
error of images.
2014-10-18 14:56:06 +02:00
Laurent Destailleur
fb04b1aedb More spaced cells 2014-10-17 14:47:17 +02:00
Laurent Destailleur
536b579b35 Clean code 2014-10-14 00:27:23 +02:00
Laurent Destailleur
e42ab9ea84 Add legend on peruser view. 2014-10-13 17:45:52 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
Laurent Destailleur
86d25146cc Qual: Indentation muse be done with css and not using multiple  
spaces.
2014-10-13 00:17:37 +02:00
Laurent Destailleur
bba6dc6398 Better contrast 2014-10-12 14:11:16 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Laurent Destailleur
cbd48f5129 Add missing picto 2014-10-03 12:48:24 +02:00
Laurent Destailleur
bc1279ccfa Brighter button. We use CSS and no more image. 2014-10-03 11:27:12 +02:00
Laurent Destailleur
494e6786b3 Fix: Translation 2014-10-03 03:52:50 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral
background (nearest bootstrap). Remove image background.
2014-10-03 01:48:14 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module.
Can filter on date of event.
Local calendar renamed into Internal calendar.
2014-09-09 12:28:35 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
b63cfccf49 On peruser agenda view, use different color if event is busy or not for
user.
2014-09-08 10:24:16 +02:00
Laurent Destailleur
cbaa7816bf New: add css style "cursorpointer".
Start to work on clicable links into peruser agenda view.
2014-09-06 00:32:54 +02:00
Laurent Destailleur
be0f091474 css for agenda view per user 2014-09-05 21:47:16 +02:00
Laurent Destailleur
a86de9b685 Work on agenda per user. 2014-09-05 21:12:01 +02:00
Florian HENRY
b536c8a10c Add missing image into amarok theme 2014-09-03 10:24:41 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting
Integration of module Accounting Expert
2014-09-02 19:14:21 +02:00
Laurent Destailleur
38233ca05d Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/limits.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
c21b389462 Fix: Pb with focus position with ckeditor 2014-08-21 14:17:27 +02:00
Raphaël Doursenaud
3b8fefdb2a Optimized theme images 2014-08-19 12:39:25 +02:00
Laurent Destailleur
e7a8de18bf Fix: Minimum size for captcha 2014-08-17 15:05:42 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/theme/eldy/graph-color.php
2014-08-15 02:28:16 +02:00
Laurent Destailleur
4c0059266c Prepare to remove pair and impair css style. 2014-08-14 13:26:59 +02:00
Laurent Destailleur
91900f54c2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-14 01:54:23 +02:00
Laurent Destailleur
387c123229 Fix: List of colors was too low. 2014-08-14 01:53:54 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
bcc0f244f0 Fix: Used wrong image 2014-08-13 19:21:31 +02:00
Laurent Destailleur
2bfde7ba30 Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
0834178bf5 Add more colors to fix pb with agenda 2014-08-04 00:15:08 +02:00
Laurent Destailleur
12ff7a8af5 Look: Refresh install style with more neutral colors. Select line style
is now stored into css. Removed all images for install process.
2014-08-03 11:18:32 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
bf9313dd87 getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser.
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6.
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
a74b65df0e Fix: Add max height to solve pb with very large logo. 2014-07-20 04:29:47 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
a8e4391887 Prepare calendars to be able to show calendars with selection on several
users.
2014-06-28 18:04:32 +02:00
Laurent Destailleur
e5a06635dc Fix css for agenda box
Make different view of agenda into different tabs.
2014-06-27 20:50:46 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
8dad341ed4 Fix: css 2014-05-27 00:57:34 +02:00
Laurent Destailleur
f34aadef3d Fix: css 2014-05-23 21:06:53 +02:00
Laurent Destailleur
179583f79a More info into comment 2014-05-13 18:30:51 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +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
Laurent Destailleur
ba9dc57912 Fix: Avoid wrapping 2014-04-27 01:49:57 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
c1e349d110 Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
Laurent Destailleur
2b191b6ef8 Uniformization and simplification of code. 2014-04-22 23:49:33 +02:00
Laurent Destailleur
76b5659d4c Optimize for small screen 2014-04-22 00:04:31 +02:00
philippe
2ffe4f589e style enhancement 2014-04-18 10:54:21 +02:00
Laurent Destailleur
262efb997f Fix: paddingrightonly must use $right and $left to be compatible with
LTR languages.
2014-04-02 18:45:59 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
c506e59d8c Look: Minor fix to not have calendar picto to glue to input 2014-03-30 15:58:41 +02:00
Laurent Destailleur
0ca250c6d9 Minor css fixes. 2014-03-29 05:02:02 +01:00
Laurent Destailleur
81b8961dab Qual: Dead code war 2014-03-17 11:13:53 +01:00
Laurent Destailleur
932b421d1d Merge remote-tracking branch 'origin/3.5' into develop 2014-03-11 09:46:51 +01:00
Laurent Destailleur
21bf279248 Fix: css 2014-03-10 16:17:55 +01:00
Laurent Destailleur
7071e233d3 Fix css for ckeditor 4. 2014-03-08 13:36:42 +01:00
Laurent Destailleur
2c0f1340d5 New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
8bd72cc21f Fix: wrapping into combo 2014-03-01 20:05:08 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
df2eb95882 Fix: Right to left support 2014-02-26 15:42:32 +01:00
Laurent Destailleur
0918fd21b0 Fix: Css errors 2014-02-26 14:48:53 +01:00
Laurent Destailleur
d4d69e41b1 Fix: Right to left support 2014-02-25 19:14:58 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations
Corrected export translations
2014-02-25 14:11:40 +01:00
Laurent Destailleur
8a71245186 Look: Use higher menu entries with jmobile. 2014-02-25 10:00:57 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Laurent Destailleur
5a29b3d546 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
3a4161fdf7 Fix: css 2014-02-18 19:49:36 +01:00
Laurent Destailleur
05c4961a36 Better css 2014-02-12 00:10:49 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
549f5c8426 Fix: Not existing file 2014-01-26 17:01:14 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
4f1df33e51 Fix: thumb image was not up to date compared to new skin. 2014-01-14 22:18:44 +01:00
Laurent Destailleur
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
9a6f22a86e Fix: W3C no form into table.
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
7d6779bd4a Merge remote-tracking branch 'origin/3.5' into develop 2013-12-27 18:09:31 +01:00
Laurent Destailleur
d07c767f25 Fix: Alignement of element into block login 2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2 Fix: Alignement of element into block login 2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2 Fix: Missing translation.
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
87db1d880b Fix: css 2013-12-06 21:03:59 +01:00
Laurent Destailleur
598a241366 Fix: minor css.
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
Laurent Destailleur
f60f5b2751 Fix: css 2013-12-06 10:04:53 +01:00
Laurent Destailleur
f2ba1a538b Fix: Useless css styles make jmobile wrong 2013-12-03 20:54:27 +01:00
Laurent Destailleur
202c6b728e Fix: Useless css styles make jmobile wrong 2013-12-03 20:53:39 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Laurent Destailleur
38e695b960 Look: Better support for jmobile 2013-12-02 07:38:37 +01:00
Laurent Destailleur
b12fb56be4 Fix regression 2013-12-02 05:59:11 +01:00
Laurent Destailleur
f45a31969b Fix regression 2013-12-02 05:52:41 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
e9e94b9e47 Fix: Alignement 2013-12-01 19:39:21 +01:00
Laurent Destailleur
abec634960 Look: Better support for jmobile 2013-11-30 02:31:17 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
8496b1787c Color too agressive 2013-11-23 14:46:46 +01:00
Laurent Destailleur
e63542d8a6 Fix: avoid scroll 2013-11-13 20:37:05 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Laurent Destailleur
656bf480ac Fix: look with jmobile 2013-10-27 00:04:57 +02:00
Laurent Destailleur
1752616f1c Title menu more visible when using jmobile 2013-10-26 18:46:30 +02:00
Laurent Destailleur
bcd63d2466 Look: Remove useless array title bar 2013-10-25 18:01:45 +02:00
Laurent Destailleur
d542576d23 Fix: Menu entry into getmenu_div is clicable on all line. 2013-10-22 18:43:57 +02:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Laurent Destailleur
c35135b62b Fix: use css3 2013-10-07 16:59:38 +02:00
Laurent Destailleur
fb60dc9338 Look: Minor enhancement 2013-09-25 12:58:29 +02:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty
value.
2013-08-20 11:51:24 +02:00
Laurent Destailleur
5c2e626338 More css3 2013-08-10 12:06:18 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
9f25b457ad Fix: CSS 2013-08-01 05:23:15 +02:00
Laurent Destailleur
70eef21bc8 Fix: Style with jmobile 2013-08-01 04:36:54 +02:00
Laurent Destailleur
57ce331833 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9 Fix: grip and close for title must differ from grip and close used for
other styles.
2013-07-30 17:22:52 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
2013-07-29 19:12:04 +02:00
Laurent Destailleur
741fb7f03a Beautify style 2013-07-29 11:47:10 +02:00
Laurent Destailleur
1791a3188d Simplify theme 2013-07-29 11:30:54 +02:00
Laurent Destailleur
0997274c45 Refinement of module eldy and removed not used file. 2013-07-29 10:14:36 +02:00
Laurent Destailleur
36c73c4798 Look: Beautify backup page. 2013-07-28 17:25:58 +02:00
Laurent Destailleur
579851a605 Fix: for css "print" mode. 2013-07-28 17:07:27 +02:00
Laurent Destailleur
00f39f9bfd Fix: tons of bugs into css.
Qual: Remove table for login informations.
Fix: Restore compatibility with IE 8+.
2013-07-28 17:02:13 +02:00
Laurent Destailleur
843478317e Qual: Reduce CSS size by mutualizings styles. 2013-07-27 18:21:35 +02:00
Laurent Destailleur
b4d2c8f76d Fix: Resore lost ability to have a background defined by theme onto
login page.
2013-07-27 12:05:32 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
2013-07-26 14:59:18 +02:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00
Laurent Destailleur
15c4c5d6b9 Some fixes into css 2013-07-23 20:48:37 +02:00
Laurent Destailleur
22b8fcfe63 Style 2013-07-19 18:01:49 +02:00
Laurent Destailleur
91b51f1f58 Fix: Some td cells must not have hover styles. 2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636 New: A more responsive desgin for statistic box of home page
Qual: Hook for statistics now match specifications.
2013-07-19 15:29:40 +02:00
simnandez
6180b6c0a6 Fix: Amarok Tab visu. 2013-07-03 12:16:32 +02:00
simnandez
c9fd070bba Fix: Amarok Tab visu. 2013-07-02 18:53:42 +02:00
Laurent Destailleur
cb68924f34 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-07-02 01:10:06 +02:00
Laurent Destailleur
154daa0657 Fix: css 2013-07-01 21:52:09 +02:00
Laurent Destailleur
606b60b17c Minor fixes into css 2013-06-29 04:01:54 +02:00
Laurent Destailleur
4b00da5fa8 Work on boxes with graph 2013-06-29 02:23:23 +02:00
Laurent Destailleur
ee8f3cbbe5 Fix: css when using checkbox into label 2013-06-28 17:50:10 +02:00
Laurent Destailleur
f02fa8a41d Fix: css when using checkbox into label 2013-06-26 17:58:34 +02:00
Laurent Destailleur
9a5b55219a Fix: CSS 2013-06-26 14:40:29 +02:00
Laurent Destailleur
1de8ab3785 Fix: CSS 2013-06-26 14:38:56 +02:00
Laurent Destailleur
5f67142fc1 Start prototype for datatable 2013-06-26 11:58:01 +02:00
Laurent Destailleur
8311b83861 Fix: css 2013-06-26 11:41:18 +02:00
Laurent Destailleur
882d34fa88 Fix: css 2013-06-26 11:40:29 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Laurent Destailleur
eb07c6b2e7 Fix: Missing left padding 2013-06-24 19:45:29 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7bfdec7993 Fix: css 2013-06-23 18:53:40 +02:00
Laurent Destailleur
db48acddb4 Fix: css 2013-06-23 18:51:49 +02:00
Laurent Destailleur
e1bb3bafb7 Fix: css 2013-06-23 18:01:10 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00
Laurent Destailleur
f2c268f72c Fix: Missing theme for autofill 2013-06-23 12:43:06 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
a1f9b22210 Fix: Missing icon 2013-06-20 16:21:54 +02:00
Laurent Destailleur
a749e2bfaa Fix: Still working on css debug. bureau2crea and cameleo are too
bugged. I disable them with jmobile to have things working correctly.

Conflicts:
	htdocs/theme/bureau2crea/style.css.php
2013-06-20 16:20:31 +02:00
Laurent Destailleur
b477272082 Fix: Still working on css debug. bureau2crea and cameleo are too
bugged. I disable them with jmobile to have things working correctly.
2013-06-20 16:13:42 +02:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00