Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
5f0951dcda
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:20:40 +02:00
Laurent Destailleur
51e941b9b4
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:07:55 +02:00
Laurent Destailleur
fabd74169f
Fix: missing 'Maximize' button on full toolbar set of ckeditor.
2016-07-14 11:46:32 +02:00
florian HENRY
96172a5910
better syntax
2016-07-07 09:49:27 +02:00
florian HENRY
240dcc78fb
fix php warning introduce by 97eedb866b
...
urlencode cannot deal with array
2016-07-07 09:47:12 +02:00
Alexis Algoud
97eedb866b
FIX add POST key on print link (avoid action in case of)
...
in order to keep filter on list and other case
2016-07-06 10:36:58 +02:00
Laurent Destailleur
34c741bf0d
FIX CSS and responsive behaviour (feature with a menu hider is on on
...
smarpthone)
2016-06-17 16:28:16 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
cda17da8b1
Fix security: A password must NEVER be stored as cookie. GETPOST must
...
analyse POST only.
2016-06-12 21:41:16 +02:00
Laurent Destailleur
65cbf1623b
Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER
2016-06-12 20:24:05 +02:00
Juanjo Menent
5dec8f1935
Fix: Bad encoding and use original function 'implode' instead aliases 'join'
2016-05-27 10:56:39 +02:00
Laurent Destailleur
426454a67b
Prepare the hide left menu icon
2016-05-22 19:32:08 +02:00
Laurent Destailleur
1032583b02
Better support for accessiblity
2016-05-09 14:59:59 +02:00
Laurent Destailleur
8065e00795
FIX #5142
2016-05-05 22:30:08 +02:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
6a123c91b5
Solve warnings that appears because code is using statically a mehtod
...
that can't be static yet.
2016-04-30 19:30:28 +02:00
Laurent Destailleur
cb1772b527
Fix too much code removed. We still need JQUERY LAYOUT for ECM module.
2016-04-19 01:45:45 +02:00
Laurent Destailleur
7ce82aaf16
Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be
...
implemented with pure CSS/Jquery so no more need of not maintained
external library.
2016-04-12 13:38:41 +02:00
Laurent Destailleur
83644dcb93
Fix errors reported by scrutinizer
2016-04-09 15:38:15 +02:00
Laurent Destailleur
a36abd43fd
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-30 16:27:14 +02:00
Laurent Destailleur
fce54e9c48
Fix tooltip too large
2016-03-29 12:49:41 +02:00
Florian HENRY
371e593da3
better includes externel library
2016-03-18 10:56:55 +01:00
Florian HENRY
28391a4e4d
Last version of JQuery 1.12 and DataTables Componenent with working
...
export Excel,CVS,PDF, etc..
2016-03-15 11:57:53 +01:00
Laurent Destailleur
144c410b52
Add var commented into conf file
...
Fix disabled of module for demo
2016-03-05 01:38:14 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
a26f880843
Fix missing declarion of form
...
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
2016-03-01 00:59:42 +01:00
Raphaël Doursenaud
d7304e516a
Added Github templates
2016-02-22 12:32:24 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
Laurent Destailleur
69e0f1ebc3
Add log to help debug
2016-02-04 17:55:30 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
64514b38da
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b
Fix bad management of option MAIN_HTML_TITLE
2016-02-01 01:19:37 +01:00
Laurent Destailleur
8d41cc3660
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-25 16:02:15 +01:00
Laurent Destailleur
0f70ccad50
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-25 15:39:16 +01:00
Laurent Destailleur
667651860d
Fix sql injection #4341
2016-01-25 15:24:31 +01:00
Laurent Destailleur
7c96194750
NEW Hidden option MAIN_LANDING_PAGE to choose the first page to show
...
after login works as a "global" option (llx_const) and as a "per user"
option (llx_user_param).
2016-01-24 17:40:07 +01:00
Laurent Destailleur
2259cf2340
Merge remote-tracking branch 'origin/3.8' into develop
2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:45:53 +01:00
Laurent Destailleur
a26a6c2449
Fix sql injection even when code is on several lines
2016-01-08 14:43:04 +01:00
Laurent Destailleur
36dc8b1ce7
FIX #4341
2016-01-08 13:57:53 +01:00
Laurent Destailleur
1e1d6d4955
Fix to be able to use dolibarr with a smartphone
2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565
Fix search forms
2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Laurent Destailleur
d5fa91f7ba
Fix several bugs in css and in jmobile usage
2016-01-02 20:48:19 +01:00
Laurent Destailleur
1ae4bef04b
Fix conflict with the div #dialog used for popup cut and paste of
...
address.
2016-01-02 00:27:14 +01:00
philippe grand
5e3c89fdbd
[Qual] Uniformize code
2015-12-21 22:59:12 +01:00
Raphaël Doursenaud
3e2309d0e6
NEW Factorized price2numjs into lib_head.js.php
...
Used public domain code from the MDN to provide a robust decimal
rounding implementation.
Warning for developers: the path of the javascript file has changed.
Please update your scripts.
2015-12-10 17:03:00 +01:00
Laurent Destailleur
4a2bda3491
Look enhancement
2015-12-04 23:25:34 +01:00
Laurent Destailleur
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +01:00
Laurent Destailleur
1bea9917c4
Introduce version on resource link, so no cache effect after upgrading
2015-11-21 00:52:20 +01:00
Laurent Destailleur
c2ec4a4fd2
Move online help link at a better place (top right). Link is also always
...
visible.
2015-11-14 22:49:34 +01:00
Laurent Destailleur
682842f15f
Fix into title of login page, we must report the tru dolibarr version
...
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
Laurent Destailleur
f49a33b600
Try a change for better compatibility with old search form
2015-11-12 12:22:21 +01:00
Laurent Destailleur
57e162d7f8
The component selectAjaxArray can return javascript part into a global
...
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Laurent Destailleur
6a9342f5a3
Move default application name into one place (as a constant)
2015-11-04 14:54:17 +01:00
Laurent Destailleur
3726b127a1
Remove duplicated code or useless code
2015-11-04 14:44:11 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
055fe5e275
FIX #3786 Translation of select box.
2015-11-02 19:17:22 +01:00
Laurent Destailleur
2c682022cf
NEW The search box and the bookmarks are now rendered by the menu
...
manager.
2015-10-30 09:36:57 +01:00
Laurent Destailleur
4b2db78c3a
Keep deprecated options to show or not forms for blind people.
2015-10-26 12:50:32 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
48ed8d4408
FIX The thumb of user into top menu was using the image in full size.
...
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
43c80bec7d
A better responsive menu for very small screen
2015-10-24 13:52:35 +02:00
Laurent Destailleur
8df59134a9
Merge pull request #3705 from aspangaro/develop-hrm
...
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
56ef1c7338
Fix missing )
2015-10-22 17:05:28 +02:00
Laurent Destailleur
77c43ebb26
FIX #3558
2015-10-22 14:08:19 +02:00
Laurent Destailleur
fd72b4a400
Work on the new selectArrayAjax widget
2015-10-21 20:43:11 +02:00
Laurent Destailleur
fa138ca526
Fix color of text
2015-10-20 02:31:24 +02:00
Laurent Destailleur
e70bb28be7
If firstname not define, use lastname
2015-10-20 00:47:35 +02:00
aspangaro
aac88519de
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
...
Conflicts:
htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +02:00
Laurent Destailleur
225313d8ac
NEW Introduce hidden option MAIN_LANDING_PAGE to decide the home page
...
visible just after login.
2015-10-14 17:18:26 +02:00
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