lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,197 Commits 43 Branches 150 Tags 886 MiB
d7304e516a
Commit Graph

1295 Commits

Author SHA1 Message Date
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
Laurent Destailleur
b45f5039ed Fix syntax error 2015-10-05 09:02:03 +02:00
Laurent Destailleur
b5ec3b7085 Merge pull request #3546 from GPCsolutions/badincludepath 
Fix Do not always append htdocs to include path
 2015-10-04 20:14:13 +02:00
aspangaro
0b266a8ee5 Fix : remove viewport for mobile device already declared 2015-09-27 14:15:09 +02:00
Raphaël Doursenaud
65340667b6 [Qual] Replaced deprecated dol_microtime_float() 2015-09-24 18:42:35 +02:00
Laurent Destailleur
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
23f6464999 Work on CSS 2015-09-22 01:25:06 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Raphaël Doursenaud
d9acf32861 Fix Do not always append htdocs to include path 
Serving the htdocs directly is a best practice. The old code generates
a bogus include path in that case.
This code mitigates the issue by setting an include path only when needed.
 2015-09-21 09:47:25 +02:00
Raphaël Doursenaud
92c08c77fd Qual: Don't attempt HTTPS redirect if already using HTTPS 2015-09-07 16:43:17 +02:00
Laurent Destailleur
a44ab5168c Save memory. 2015-09-07 12:43:25 +02:00
Raphaël Doursenaud
a6ef289470 New Added client-side Sentry logging 
Using Raven.js allows logging client-side javascript errors to the
configured Sentry server.
 2015-09-04 19:10:46 +02:00
Raphaël Doursenaud
7d934db183 Install CKEditor from composer 2015-09-04 19:06:01 +02:00
Juanjo Menent
95e8148f78 Merge pull request #3294 from GPCsolutions/totalvalidator 
Totalvalidator
 2015-08-10 20:56:31 +02:00
Florian HENRY
d78292b9af FIX : if multicompany enabled, call to undifend method _setCookie 
instead of setCookie
 2015-07-27 22:08:33 +02:00
Raphaël Doursenaud
58acc31591 Qual: & should not be used in attributes 2015-07-20 20:48:49 +02:00
Florian HENRY
7ce5424f9a NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 2015-07-20 08:41:18 +02:00
Laurent Destailleur
705245d70d Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 #3258" 2015-07-19 18:07:26 +02:00
Laurent Destailleur
c05900aece Merge pull request #3212 from FHenry/3.8 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7  #3258
 2015-07-19 16:02:59 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Florian HENRY
4f9be3ba7e NEW : upgrade jQuery Component datable 1.10.7 2015-07-16 16:32:38 +02:00
Regis Houssin
1804dff0b8 Fix: for avoid jquery error in ECM module 2015-07-14 14:40:20 +02:00
Regis Houssin
e82f4c474b Fix: for avoid error with main context hooks, with $langs object for 
example.
 2015-07-03 22:14:34 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
b25d2ff00a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/main.inc.php
 2015-06-27 22:00:56 +02:00
Laurent Destailleur
0a2bafaa6d The trigger USER_LOGIN* are deprecated. They are still working but you 
should prefer use the hook afterLogin or afterLoginFailed instead.
 2015-06-27 21:52:23 +02:00
Regis Houssin
ab558f8ea9 Fix: Use hooks (Multicompany) 2015-06-27 16:32:01 +02:00
Laurent Destailleur
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
Laurent Destailleur
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +02:00
Laurent Destailleur
1cb9d3b2eb Fix nohover for lines to add lines 2015-06-20 17:40:36 +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
87e07a3038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/virement.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/card.php
	htdocs/societe/soc.php
 2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
 2015-06-14 17:11:36 +02:00
Laurent Destailleur
14a8a2269b FIX End log must use same level then start log. 2015-06-14 16:59:35 +02:00
Regis Houssin
c21156dd13 Fix: strict mode hunter 2015-06-10 18:58:42 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +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
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +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
phf
a5f2617166 FIX : "script" balise with wrong syntax 2015-05-25 15:52:41 +02:00
Laurent Destailleur
f35c41cc7e Introduce hidden option "MAIN_FIX_FLASH_ON_CHROME" to solve a strange 
behaviour of chrome making page to be flashed before rendered.
 2015-05-22 01:48:36 +02:00
Laurent Destailleur
26a74ba3cc Add constant to allow a module to disable injection scan for its pages. 2015-05-19 22:08:51 +02:00
Raphaël Doursenaud
c219d4a336 [Qual] Fix form label id reference 2015-05-07 14:21:13 +02:00
Laurent Destailleur
b0071a7c6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/main.inc.php
 2015-04-28 21:14:17 +02:00
Juanjo Menent
6cfd8d64f5 Change bugtracker to github in all maintened versions 2015-04-27 20:34:52 +02:00
Juanjo Menent
cfaaf56428 Change bugtracker to github in all maintened versions 2015-04-27 20:34:26 +02:00
Raphaël Doursenaud
f07c174c9c FIX: moved built-in bug report system to GitHub Issues 
Improved environment informations and presentation
 2015-04-23 18:43:32 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
a690276060 Fix js warnings, select2 css was not loaded. 2015-04-21 12:08:36 +02:00
Marcos García de La Fuente
ad5dd8e70f [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on 2015-04-20 01:36:48 +02:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
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