Laurent Destailleur
678e55f9da
We must add a viewport meta to have font visible on mobile
2015-04-04 04:11:54 +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
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
dd82ad69fe
printLeftBlock is now compliant with hook development rules. It is an
...
"addreplace" hook so you must return content by doing
->resprints='mycontent' and not by doing return 'mycontent'
2015-03-18 12:30:49 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Laurent Destailleur
bc3f9bf800
Fix: the visible version was not enough to know version of dolibarr. We
...
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
c36f92396b
Add navigation into the new timesheet week page.
...
Fix bad merge
2015-03-05 11:13:44 +01:00
Marcos García de La Fuente
ce916f3bcb
Better practice in getBrowserInfo
2015-02-22 12:35:51 +01:00
Laurent Destailleur
968b2b433b
Better position for username
2015-02-01 01:43:19 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
8cd46e4830
Introduce option MAIN_HTML_TITLE to start to control format of html
...
title content.
2015-01-17 14:34:16 +01:00
Laurent Destailleur
90add2fa96
Fix: amarok is a bugged theme making dolidroid failed. We swith to
...
eldy automatically with dolidroid.
2015-01-10 17:23:52 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
410c8e56c6
Better fix
2014-12-30 04:30:32 +01:00
Laurent Destailleur
8abbac564b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/main.inc.php
2014-12-30 04:28:09 +01:00
Marcos García de La Fuente
9f6f90275a
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
2014-12-26 12:03:29 +01:00
Frédéric FRANCE
275ba0e3de
Typo
2014-12-09 22:21:51 +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
Frédéric FRANCE
3e3dbb1280
Update main.inc.php
2014-11-30 23:53:51 +01:00
Frédéric FRANCE
b3418b92a3
Update main.inc.php
2014-11-30 23:05:30 +01:00
Frédéric FRANCE
ca3f4a09f4
Update main.inc.php
2014-11-30 13:07:13 +01:00
Laurent Destailleur
278cdf72d6
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-29 12:41:26 +01:00
Laurent Destailleur
cdd256e206
Add info to help understand debug
2014-11-29 12:00:42 +01:00
aspangaro
30bff7ef28
Need to enable MAIN_ACTIVATE_HTML5 to insert meta balise viewport
2014-11-29 07:12:12 +01:00
aspangaro
64260cde72
Add button in admin->GUISetup to activate Html5
2014-11-29 07:07:27 +01:00
aspangaro
1c89186652
Merge remote-tracking branch 'Upstream/develop' into develop-html5
2014-11-28 06:20:01 +01:00
Laurent Destailleur
f36a30f9fe
Fixed: W3C. An id must be unique inside a page.
2014-11-27 23:25:29 +01:00
Frédéric FRANCE
5a97ee1f95
Rearrange Help Block in left menu
2014-11-27 23:20:13 +01:00
aspangaro
92c093055c
Add meta balise for viewport & scale
2014-11-27 05:41:57 +01:00
aspangaro
ea70159a7e
Activate the HTML5 Doctype
2014-11-27 05:07:39 +01:00
Frédéric FRANCE
6cc79c2dd7
Put label into div
2014-11-23 18:42:48 +01:00
Laurent Destailleur
d4ad7236e5
Clean old code for multiselect (replaced with select2 plugin).
2014-11-16 00:46:27 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
425a853e07
- New: Match other auth system: Login can be done entering login or
...
user email (this open the road for SSO).
2014-11-14 11:56:05 +01:00
Laurent Destailleur
0b41df7c35
Clean code to manage multiselect jquery: All code is centralized
...
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
Laurent Destailleur
9c51effe5c
Ajout plus d'info dans description audit.
2014-10-31 15:42:35 +01:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
844b5f30df
Minor look enhancement
2014-10-03 12:54:29 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Laurent Destailleur
d801bcc690
Fix: When jmobile is forced, we force enable of javascript.
2014-08-08 14:37:51 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
