Laurent Destailleur
7e171c8750
FIX adding css by page if url is externam
...
Conflicts:
htdocs/main.inc.php
2019-02-15 00:48:31 +01:00
Laurent Destailleur
44c1d30f6f
FIX adding css by page if url is externam
2019-02-15 00:46:11 +01:00
Laurent Destailleur
62760bf1e2
Fix regression
2019-02-14 21:45:23 +01:00
Laurent Destailleur
2d5d2ccdc6
Merge pull request #10497 from wdammak/patch-26
...
NEW: Add the current modulepart to the Conf class
2019-02-13 16:43:46 +01:00
wdammak
32c48f0fa2
Update main.inc.php
...
break ;)
2019-02-12 19:56:55 +01:00
Laurent Destailleur
0bb59bf6cc
Fix phpcs
2019-02-12 17:03:09 +01:00
Laurent Destailleur
74f468dc91
Merge pull request #10535 from atm-quentin/FIX_multiple_sending_form
...
FIX on chrome you can send multiple form if you click more than once …
2019-02-12 13:42:37 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
0bd30b160a
Fix picto logout with fontawesome 5
2019-02-11 11:55:48 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
atm-quentin
300438b290
FIX on chrome you can send multiple form if you click more than once on button
2019-02-08 15:57:08 +01:00
wdammak
f1ffae3ac5
Update main.inc.php
...
fix travis
2019-02-04 18:27:47 +01:00
wdammak
01ba32efbc
Update main.inc.php
...
Set current modulepart
2019-02-04 17:52:15 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
torvista
07b2bb6715
Swap of align/valign/border/width for css
...
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
d814b66b36
Fix pb in token check
2019-01-15 15:04:15 +01:00
Laurent Destailleur
45a24df679
More complete message
2019-01-15 14:07:05 +01:00
Laurent Destailleur
ebf3ea39bf
Fix missing token in POST
2019-01-15 13:55:14 +01:00
Laurent Destailleur
4b32e214de
Fix phpcs
2019-01-12 18:53:50 +01:00
Laurent Destailleur
87609f3f57
NEW Add hook 'addHtmlHeader'
2019-01-12 14:35:51 +01:00
Laurent Destailleur
79e3fcc109
NEW Add constant XFRAMEOPTIONS_ALLOWALL
2019-01-11 17:03:29 +01:00
Laurent Destailleur
6e078105ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
59d6000e89
Code comment
2019-01-05 15:13:35 +01:00
ldestailleur
ab9fe1a757
Add option to use fontawesome 5 with fontawesome 4
2019-01-03 21:14:59 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
Laurent Destailleur
3cd91d7c66
Fix look and feel v9 (autofocus)
2018-12-28 00:41:05 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
af6a7446ee
Merge pull request #9871 from laudeco/feature/fontawesome_migration
...
migrate font awesome to 5.4.1
2018-12-22 19:52:39 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
a5dccd1cc3
Enable by default the test on anti CSRF token
2018-12-22 18:09:26 +01:00
Laurent Destailleur
f8b0e535fa
Code comment
2018-12-22 17:30:22 +01:00
Laurent Destailleur
718105ff86
FIX #10196
2018-12-15 16:20:36 +01:00
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Laurent Destailleur
3f912ebfff
FIX restore security event login/logout
2018-12-10 11:19:52 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
AXeL-dev
9dbb222a0a
remove useless line of code
2018-11-07 18:27:41 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
De Coninck Laurent
35bf07bab6
migrate fontawesome to 5.4.1
...
migrate the fontawesome to the latest library in the idea to use the last one (more complete) to use fontawesome icons instead of images.
Font awesome 5.4.1 is leighter than the previous loaded version.
2018-10-25 17:54:29 +02:00
AXeL-dev
361f1c3d9a
fix $heightforframes value to fit menu height on dolibarr 8
2018-09-17 16:39:58 +01:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript
2018-09-15 17:01:23 +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
Regis Houssin
912c05774b
FIX remove deprecated triggers USER_LOG*
2018-09-03 09:30:36 +02:00
Frédéric FRANCE
e0c1599bb1
whoops
2018-09-03 09:29:30 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript
2018-09-02 19:00:43 +02:00
Frédéric FRANCE
801eba74c5
deprecated test_sql_and_script
2018-09-02 18:58:11 +02:00
Laurent Destailleur
edd55fc756
Fix all TODO in main and master files
2018-09-02 16:47:58 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject
2018-09-01 17:42:16 +02:00
Laurent Destailleur
7075fdf8f5
NEW Can add autorefresh=X in any URLs to refresh page after X seconds
2018-08-16 14:47:12 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3
2018-08-09 11:31:48 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Laurent Destailleur
346bf7bdd6
Fix param dol_invisible_topmenu
...
Conflicts:
htdocs/main.inc.php
2018-06-29 00:21:14 +02:00
Laurent Destailleur
5775dced37
Fix dol_invisible_topmenu must differs from dol_hide_topmenu
2018-06-29 00:08:46 +02:00
Laurent Destailleur
66f0ee9e18
Fix hack with hook to solve a problem to let a chance of external
...
modules to be visible to android webview.
2018-06-28 22:59:53 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
83f4cf67e6
css
2018-06-22 23:21:16 +02:00
Laurent Destailleur
1e5276f420
Merge pull request #8871 from el00ruobuob/patch-1
...
Update main.inc.php with charset
2018-05-29 10:48:54 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs
2018-05-26 16:03:19 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs
2018-05-26 15:41:32 +02:00
el00ruobuob
667e4c30d6
Update main.inc.php
...
charset missing, causing display issues.
2018-05-26 12:05:39 +02:00
bafbes
739317a794
New : option to show database name in upper help menu
2018-05-02 16:53:18 +01:00
Laurent Destailleur
56be581a98
Remove deprecated header
2018-04-30 15:31:05 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
8aab183567
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-19 14:00:18 +02:00
Laurent Destailleur
b1ea34f4e7
FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie
2018-04-19 13:54:43 +02:00
Laurent Destailleur
d2f0d1f613
Add option MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY because it is hard
...
to understand how it works when list is preloaded.
2018-04-17 10:01:14 +02:00
Marc de Lima Lucio
ba50fcd130
FIX: left search form: directly display all qualified objects
2018-04-16 15:15:35 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
b1043e2a57
Update main.inc.php
2018-04-13 10:37:40 +02:00
BENKE Charlene
a7decb2173
printTopRightMenu trigger numeric never empty
...
maybe find something better
2018-04-13 02:42:19 +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
560c84be0d
FIX When clearing filter, we must not save tmp criterias in session
2018-04-08 12:40:19 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
417c07a6e8
Fix REFLECTED XSS
2018-04-06 18:33:51 +02:00
Laurent Destailleur
2d1183cbb7
FIX can bypass the CSRF protection with url with domain inside
2018-04-06 17:58:30 +02:00
Laurent Destailleur
ff505ba148
Work on a page dedicated for external frontend (mobile, ...)
2018-03-29 11:34:01 +02:00
Laurent Destailleur
0cba7fc761
Update main.inc.php
2018-03-21 20:44:32 +01:00
Laurent Destailleur
a54316ef05
Update main.inc.php
2018-03-21 20:43:26 +01:00
Marc de Lima Lucio
08fcd67e0f
FIX: travis
2018-03-21 16:23:28 +01:00
Marc de Lima Lucio
744c263c6c
NEW: selectArrayFilter() + use in left menu search
2018-03-21 15:08:20 +01:00
Laurent Destailleur
cfeb0dccfe
Better support for MAIN_AUTHENTICATION_POST_METHOD
2018-03-16 19:29:22 +01:00
Laurent Destailleur
fa1e15af02
Add constant to allow a page to accept a username on a GET parameter
2018-03-16 01:52:07 +01:00
Laurent Destailleur
362aec3e4b
NEW Add param $dolibarr_main_restrict_ip in config file to limit ips
2018-02-15 19:49:50 +01:00
Laurent Destailleur
e45d35dcb1
Fix code comment
2018-01-24 14:22:11 +01:00
Laurent Destailleur
fbeb66fedd
Fix refreshing of captcha broken if a cache-control set by server
2018-01-24 13:40:39 +01:00
Laurent Destailleur
6e906ac0e3
Clean code
2018-01-24 13:08:09 +01:00
Laurent Destailleur
90fc086814
Fix minor
2018-01-14 20:11:38 +01:00
Laurent Destailleur
6b77dc3b5d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2018-01-04 19:30:25 +01:00
Laurent Destailleur
b2feac9d90
CVE-2017-17971
2018-01-04 19:25:52 +01:00
Laurent Destailleur
d1cfbc2906
Code comment
2017-12-22 01:03:40 +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
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
4a5988accb
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 12:52:19 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +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
ca8ae3c723
Fix option MAIN_USE_JQUERY_JEDITABLE
2017-12-20 13:17:21 +01:00
Laurent Destailleur
91932838ef
Fix constant MAIN_LANG_DEFAULT not used
2017-12-19 00:24:38 +01:00
Laurent Destailleur
d4afb8300d
Fix several pb of duplicate functions in some cases
2017-12-19 00:15:22 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
0a73daba01
Security: on target=_blank, we must have rel="noopener"
2017-12-02 03:04:52 +01:00
Laurent Destailleur
9ed679d19a
FIX #7882
2017-12-01 17:22:32 +01:00
alexis Algoud
e6f7fe4ce6
fix print password is visible into link after login
2017-11-27 15:29:19 +01:00
Laurent Destailleur
62da0160e1
Merge pull request #7780 from fappels/develop_update_tablednd
...
FIX #3551 and #6823 table drag and drop not working.
2017-11-22 11:22:14 +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
bcaccb1829
Add layout into link of sub resources to solve undesired cache effect
2017-11-18 12:35:25 +01:00
Laurent Destailleur
776f999b71
Merge branch 'develop' into develop_update_tablednd
2017-11-17 15:10:09 +01:00
Laurent Destailleur
e37252d83a
Fix div not closed
2017-11-14 15:17:10 +01:00
Laurent Destailleur
a50589c3c9
NEW Better behaviour when using a text browser
2017-11-14 15:10:46 +01:00
Laurent Destailleur
beacf4225f
Work on filemanager
2017-11-10 15:44:43 +01:00
Laurent Destailleur
f6a0603fb0
Clean code/constant
2017-11-09 18:16:15 +01:00
Laurent Destailleur
9b07f33649
Clear code
2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2017-11-09 01:25:41 +01:00
Laurent Destailleur
c8a551e7de
Reorganize javascript at end of page.
2017-11-09 01:00:43 +01:00
fappels
6ef72a033b
Update tablednd jquery plugin to latest git master
2017-11-07 16:15:59 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
9e382a7f1b
Can disabled output of notify messages
2017-10-28 13:36:23 +02:00
Laurent Destailleur
82b333e423
Fix migration to select2 4.0.5
2017-10-26 14:06:23 +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
dbcf3ddbe8
NEW Upgrade jquery select2 to 4.0.4
2017-10-21 19:05:24 +02:00
Laurent Destailleur
daa7847ab3
NEW All search boxes are available on smartphone
2017-10-20 01:18:21 +02:00
Laurent Destailleur
6bcdf2ff75
Test replacement of img switcher with FA css
2017-10-17 14:03:22 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
ab280feaa5
Move datepicker vars into lib_heas.js.php
2017-10-13 22:37:46 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
9aa1f4725e
Fix scrutinizer
2017-10-13 13:22:24 +02:00
Laurent Destailleur
4677e06b3b
Better height of popup on tooltip using dialog
2017-10-13 12:05:36 +02:00
Laurent Destailleur
ec54621b62
FIX Tooltip using dialog are kept into visible screen
2017-10-13 11:08:30 +02:00
Regis Houssin
9ff0855812
Fix: datepicker.js.php is needed for the translation !!
2017-10-10 10:04:16 +02:00
Laurent Destailleur
4246cf24f3
Perf enhancement: Remove one include of js.
2017-09-24 20:36:27 +02:00
Laurent Destailleur
49e9326a6d
Code comment
2017-09-24 19:50:32 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Laurent Destailleur
a9e44a2cf5
NEW Enhance the anti XSS filter
2017-09-07 13:54:49 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +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
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Laurent Destailleur
731f826a55
NEW jquery date selector become default date selector
2017-08-22 09:23:35 +02:00
Laurent Destailleur
11be4c8632
Remove useless code
2017-08-20 21:26:18 +02:00
Laurent Destailleur
5c5c4046a1
Prepare setup for email reminder
2017-08-20 16:07:22 +02:00
Laurent Destailleur
1897e3cbad
Some fix for better compatibility
2017-07-30 20:43:18 +02:00
Laurent Destailleur
7904e994a7
FIX When disconnected, the search box jump to login instead of error.
2017-07-22 23:43:40 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
4f72bd35db
Fix too much code into the NOREQUIREDB
2017-07-02 13:18:23 +02:00
Laurent Destailleur
287e727e71
Fix detection of relative URL
2017-06-19 13:47:25 +02:00
Laurent Destailleur
a2ca6d5ef9
Add warning in log if conf file setup not correct
2017-06-19 12:50:13 +02:00
Laurent Destailleur
819656bd89
Fix security: Check _SERVER["QUERY_STRING"] is escaped.
2017-06-18 21:27:49 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Laurent Destailleur
1c8daf9700
Standardize and debug code of module BlockedLog
2017-06-16 12:46:15 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
c0f46834cb
Fix demo links
2017-06-13 13:22:05 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Laurent Destailleur
75452e6d19
Fix compatibility php 5.5-
2017-06-10 16:29:25 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
9341d5f448
FIX Line of invoices not inserted when using POS module and VAT NPR.
2017-06-09 15:35:27 +02:00
Laurent Destailleur
400b3320aa
NEW Introduction option MAIN_HTTP_CONTENT_SECURITY_POLICY
2017-05-29 15:20:50 +02:00
Laurent Destailleur
c71488e58b
Removed deprecated code
2017-05-29 15:09:13 +02:00
Laurent Destailleur
6d4c5e4b4a
Code comment
2017-05-24 11:37:44 +02:00
Laurent Destailleur
0cd030d856
NEW Introduce mass actions on contacts
2017-05-23 00:13:07 +02:00
Laurent Destailleur
ff2a268831
NEW Architecture to manage search criteria persistance (using
...
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
2017-05-19 00:52:13 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
71833f5987
Standardize code
2017-05-13 17:04:46 +02:00
Laurent Destailleur
09f6fe5a52
Fix lib_notification
2017-05-10 10:06:44 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
1dd462d947
Fix disable notification on smartphone
2017-04-30 23:39:35 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Laurent Destailleur
aabfc2f0db
Perf. Do not load personal conf of user by default.
2017-04-14 12:52:32 +02:00
Laurent Destailleur
e6e9b65594
NEW Reduce memory usage by removing deprecated constant loading.
2017-04-14 12:38:52 +02:00
Laurent Destailleur
4e021c123b
Fix travis error
2017-04-14 11:28:19 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
2903518fb1
Fix bad links
2017-03-31 18:11:01 +02:00
Laurent Destailleur
9d193924bd
Fix bad constants
2017-03-31 18:05:20 +02:00
Laurent Destailleur
ee86b7bcef
Avoid javascript warning when in stable mode.
2017-03-31 17:51:10 +02:00
Laurent Destailleur
43e59772e4
Merge pull request #6606 from fappels/develop_add_jqmigrate
...
Develop add jQuery-migrate
2017-03-31 17:48:01 +02:00
Laurent Destailleur
78cc976e9f
Work on module builder
2017-03-30 10:40:15 +02:00
Laurent Destailleur
4df8dcf980
Work on module modBlockedLog and modModuleBuilder
2017-03-29 21:50:15 +02:00
fappels
527fa27fb7
Add jquery-migrate to handle jquery 3.0 removes
2017-03-29 11:18:03 +02:00
Laurent Destailleur
b5b0eba470
Several enhancement for 6.0
2017-03-28 12:47:48 +02:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 19:20:14 +01:00
Laurent Destailleur
95da2f5d54
NEW Add font-awesome css.
2017-03-21 13:38:21 +01:00
Laurent Destailleur
5231fbf1e3
Option to hide version
2017-03-21 11:37:03 +01:00
Regis Houssin
9e944e4525
Fix: wrong user fetch when same login in different entity
2017-03-17 12:41:56 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
Laurent Destailleur
7673aff3ba
Fix js errors
2017-02-23 02:51:26 +01:00
Laurent Destailleur
fbecb1b2d8
Work on removal of jmobile
2017-02-23 00:45:27 +01:00
Laurent Destailleur
64721d73b6
Remove not so usefull plugin jquery layout (prepare js upgrades)
2017-02-22 19:36:57 +01:00
Laurent Destailleur
089aa1df33
FIX If bank module on, field must be required to register payment of
...
expense report.
2017-02-21 17:10:32 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
68ded1b4c3
Fix language
2017-02-20 19:30:34 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
Laurent Destailleur
c3d78bf1b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
2017-02-16 22:09:37 +01:00
Laurent Destailleur
0d1bb5e7eb
FIX If bank module on, field must be required to register payment of
...
expense report.
2017-02-15 23:22:47 +01:00
Laurent Destailleur
eb70d6eea1
Debug of feature for browser notifications
2017-02-14 18:20:01 +01:00
Laurent Destailleur
a673afe601
NEW Description of feature of a module into a dedicated popup
2017-02-04 14:16:17 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
45c99d9d24
Fix HTML5 error
2017-01-29 16:46:59 +01:00
Laurent Destailleur
d7c2bdba38
Fix: link was useless with a nofollow tag.
2017-01-29 16:42:59 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Laurent Destailleur
54a974cb5c
Fix position of dropdown tooltip
2017-01-15 21:03:44 +01:00
Laurent Destailleur
62a668d899
Fix https link
2017-01-09 10:02:17 +01:00
Laurent Destailleur
be3a6afb2a
Better change for #6190
2016-12-18 11:38:31 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
d32fd7aa11
FIX javascript xss injection and a translation
2016-12-15 11:55:33 +01:00
Laurent Destailleur
a8c3ce4e55
FIX A form should not be inside a table. Create javascript troubles.
2016-11-26 12:21:50 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
90881f2fa9
FIX Sanitize title of ajax_dialog
2016-11-07 00:15:58 +01:00
Laurent Destailleur
4c712866a0
FIX No tooltip if dol_no_mouse_hover is on
2016-11-05 13:52:24 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
8755fa07af
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/main.inc.php
2016-10-11 12:35:14 +02:00
Regis Houssin
bac21be15a
Fix: remove for avoid errors
2016-10-07 13:32:34 +02:00
Regis Houssin
9e8d8c5f5c
Fix: pdfmake is not present
2016-10-07 13:16:33 +02:00
Laurent Destailleur
11533fc98d
Removed a old hidden problematic feature never used in Dolibarr. If an
...
external module need datatable, the module must provide all lib it needs
and manage version problems with other dolibarr components
2016-09-22 11:31:15 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
Laurent Destailleur
69b65ad00c
Fix MAIN_SECURITY_CSRF. Renamed into MAIN_SECURITY_CSRF_WITH_TOKEN
...
So option name is easier to understand.
2016-09-08 10:43:31 +02:00
Laurent Destailleur
f440e78fa6
FIX quick search boxes when nojs or when using smartphone
2016-09-03 12:56:49 +02:00
Laurent Destailleur
0e4b4ee321
Merge branch 'develop-external-logging' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging
Conflicts:
composer.json
2016-09-02 21:51:25 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
fbdbad0d7c
More space on dropdown
2016-08-29 18:04:21 +02:00
Laurent Destailleur
2ba920a4cb
Fix for jmobile
2016-08-29 11:33:48 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
Laurent Destailleur
8a3a9dee6d
Width of tooltip
2016-08-11 15:23:53 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
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
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
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6
Removed duplicated requires.
...
Json.lib.php is included with functions.lib.php
2014-07-30 15:42:58 +02:00
Laurent Destailleur
600801a442
- New: First change to match accessibility rules:
...
http://www.w3.org/TR/WCAG10-HTML-TECHS/
Differentiate text and img.
Use label into quick search form.
Use accesskey on form search.
2014-07-29 22:04:53 +02:00
Laurent Destailleur
0f9aa69e4e
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 21:34:23 +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
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +02:00
Laurent Destailleur
5d2a81a4f0
Fix: checkstyle
2014-07-08 21:17:40 +02:00
Laurent Destailleur
f1d1736532
Fix: checkstyle
2014-07-08 20:59:14 +02:00
Florian HENRY
cdfe8818da
avoid message
...
Delimiter must not be alphanumeric or backslash in
/home/bobby/Eclipse/workspace/dolibarr/htdocs/main.inc.php on line 450
on preg_replace
2014-07-04 13:16:48 +02:00
Laurent Destailleur
bf96a78f63
Try a fix when timezone string is not standard
2014-07-04 13:07:53 +02:00
Laurent Destailleur
a94b78958f
Merge pull request #1679 from defrance69/patch-1
...
Update entrepot.class.php
2014-06-23 20:28:53 +02:00
Laurent Destailleur
c18d7de7b0
Fix: Use bad var for test
2014-06-22 13:33:31 +02:00
BENKE Charles
60ac697813
Update main.inc.php
2014-06-21 16:10:13 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Florian HENRY
77a9d4eb71
Start fix [ bug #1437 ] Securitu Issue
...
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple
I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Laurent Destailleur
9bc1a6b4f5
Fix: favicon must use dol_buildpath and not hardcoded path
...
Conflicts:
htdocs/core/lib/security2.lib.php
2014-05-24 18:29:22 +02:00
Raphaël Doursenaud
55e7862027
Added missing local communities links
2014-05-19 14:37:37 +02:00
Laurent Destailleur
39c0b9e356
Merge 2 tests. Remove checkstyle errors.
2014-05-06 10:44:15 +02:00
Jean-François VIAL
60fd9cf463
Update the test_sql_and_script_inject function to block web-shell drops
...
block web-whell SQL injections by blocking INTO {outfile | dumpfile} sequences
2014-05-05 23:46:21 +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
f749ae6052
Fix: With LDAP we refused empty password because some LDAP are "opened"
...
for anonymous access so connexion is a success.
2014-04-28 02:31:11 +02:00
Laurent Destailleur
8c5bc11def
Qual: Better error message for LDAP connection
2014-04-27 14:16:29 +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
889ed4a49c
Fix: div was opened and not close or the oposite.
2014-04-24 01:26:28 +02:00
Raphaël Doursenaud
152fbbd7f6
Qual: Wrong type in method documentation
2014-04-23 18:24:11 +02:00
Laurent Destailleur
caf6712286
Add message on disconnect button when using an authentication mode where
...
disconnect has no sense.
2014-04-23 12:29:41 +02:00
Laurent Destailleur
c1e349d110
Experiment hidden option MAIN_MENU_INVERT
2014-04-23 12:22:01 +02:00
Laurent Destailleur
81b8961dab
Qual: Dead code war
2014-03-17 11:13:53 +01:00
Laurent Destailleur
bb3632e90c
Fix: Pb with new ckeditor.
2014-03-13 12:45:20 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/main.inc.php
2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f
Fix: Compatibility with v4 of ckeditor (for debian)
2014-03-08 14:06:01 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
0c2ca119d7
Fix: Add a test to avoid the non stable and experimental fuc...
...
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
2014-02-26 16:51:38 +01:00
Grand Philippe
2f2668d41f
typo
2014-01-23 12:25:25 +01:00
Grand Philippe
8a0bddf4c5
typo
2014-01-21 18:55:45 +01:00
Laurent Destailleur
c7a73e4e00
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36
Fix: Missing the version into url
2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Laurent Destailleur
4074547589
Fix;: Pb of caching static resource (js and css). Add a workaround to
...
avoid any problems.
2014-01-18 00:50:21 +01:00
Laurent Destailleur
ac45051b53
Fix: Showing version is wrong when replace by external module
2014-01-15 02:04:44 +01:00
Laurent Destailleur
5f65b2a97f
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef
Fix: MAIN_FORCETHEME was not working when user set its own theme
2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891
Update code comments and add log warning to help debug
2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961
Update code comments and add log warning to help debug
2014-01-12 20:02:41 +01:00
Marcos García de La Fuente
e7d2765fc6
Replaced use of htmlentities with dol_htmlentities
2014-01-05 21:08:37 +01:00
Marcos García de La Fuente
e49f94d02e
Fixed XSS problem in title tag
2014-01-05 04:52:45 +01:00
Laurent Destailleur
b6a910cf34
Fix: jmobile is crazy, we can disable it
2013-12-02 12:34:46 +01:00
Laurent Destailleur
4a1f6713ff
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2013-11-21 18:45:33 +01:00
Laurent Destailleur
0d853cf73d
Fix: [ bug #1118 ] Minor problem on print page link
2013-11-21 02:49:22 +01:00
simnandez
e66371c6d1
New: Link to communities. Add official Support links
2013-11-13 16:35:02 +01:00
Laurent Destailleur
faae93bd03
Fix: Duplicate code
2013-10-22 17:57:22 +02:00
Laurent Destailleur
c9012b498f
Fix: Code comment and phpunit test
2013-10-18 17:34:12 +02:00
Laurent Destailleur
12366410e5
Merge remote-tracking branch 'origin/3.4' into develop
2013-10-18 17:30:14 +02:00
Laurent Destailleur
4e637d3121
Fix: Sanitizing PHP_SELF
2013-10-18 17:27:17 +02:00
Laurent Destailleur
2f1340a6c6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2013-10-18 12:19:12 +02:00
Laurent Destailleur
5e35731693
Add debug info to find a bug
2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85
Add debug info to find a bug
2013-10-18 11:19:32 +02:00
Laurent Destailleur
b9aac118aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-21 12:31:38 +02:00
Laurent Destailleur
fd564f5c7d
Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1
...
cookie
per
parameter.
2013-09-21 12:30:44 +02:00
Laurent Destailleur
491bd76c1b
Work on openif authentication mode
2013-09-18 21:22:24 +02:00
Laurent Destailleur
b1f528f4d5
Comment code of a deprecated variable.
2013-08-07 20:56:10 +02:00
Maxime Kohlhaas
1b54efcaaf
Task # 853 : Can hide in conf the search by product supplier ref, and displayed only if product and supplier module are enabled
2013-07-30 11:26:37 +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
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
0743521b6b
- No need to load css of plugin fileupload (plugin never loaded). Too
...
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
2013-07-28 05:35:51 +02:00
Laurent Destailleur
61f11d3621
Fix: Duplicate tooltip
2013-07-26 11:12:29 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +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
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
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
965b173451
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:11:42 +02:00
Laurent Destailleur
2042fc3a21
Qual: Update jquery.tablednd plugin. Use minified version (all embedded
...
plugins should use minified version).
2013-06-17 13:16:25 +02:00
Laurent Destailleur
af8c4cd0d3
Fix: Bad closing of div
2013-06-14 19:46:43 +02:00
Laurent Destailleur
2f386b1b36
Fix: Bad closing of div
2013-06-14 19:43:45 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Laurent Destailleur
c78d5aa4a7
Fix: Bad param 'zone' into printCommon
2013-06-07 14:52:25 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
c5783215c4
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:45:03 +02:00
Laurent Destailleur
b4c4211b98
Fix: was using bad params and not complete.
2013-05-31 20:09:26 +02:00
Laurent Destailleur
5254f102ba
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 16:34:02 +02:00
Laurent Destailleur
da40c460bb
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 10:56:48 +02:00
Laurent Destailleur
c97d1cb15b
Try a fix for some browsers
2013-05-24 18:29:59 +02:00
Laurent Destailleur
6270a2e23c
Try a fix for some browsers
2013-05-23 19:29:39 +02:00
Laurent Destailleur
8fe45b1af6
Manifest usage is useless for a dynamic application like dolibarr.
2013-05-21 14:41:11 +02:00
Laurent Destailleur
1e76911890
Fix: Not error when migrating from version using exotic menu manager.
...
Fix: Delete of member use id
2013-05-12 15:26:23 +02:00
Laurent Destailleur
7c543d0c2a
Fix: Not error when migrating from version using exotic menu manager.
...
Fix: Delete of member use id
2013-05-12 15:25:12 +02:00
Laurent Destailleur
9b30f116f1
Fix: Some lib missing when jmobile enabled.
2013-05-10 12:48:11 +02:00
Laurent Destailleur
9a4cc839bb
Fix: Removed warning
...
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
Laurent Destailleur
cbc56f8044
Fix: W3C
...
Fix: Translation
2013-05-01 16:05:52 +02:00
Laurent Destailleur
ce47a7d731
printSearchForm hook match specifications
2013-04-28 20:53:23 +02:00
Laurent Destailleur
670d01e14e
Fix: Remove space char at end of document and viewimage.
2013-04-28 18:46:34 +02:00
Laurent Destailleur
9dc0a19ed3
More logs
2013-04-27 21:36:52 +02:00
Laurent Destailleur
2a74cb81f0
Fix: Removed warnings
2013-04-26 19:13:39 +02:00
Laurent Destailleur
4c1f301f4e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-25 20:39:47 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
Regis Houssin
4f600b6465
Fix: use $conf->entity if defined
2013-04-25 15:53:20 +02:00
Regis Houssin
d162a61d41
Fix: use $conf->entity if defined
2013-04-25 15:52:33 +02:00
Laurent Destailleur
20b9331b3c
Fix: W3C
2013-04-24 18:58:01 +02:00
Laurent Destailleur
90cfa42915
Fix: removed useless
2013-04-12 19:45:09 +02:00
Laurent Destailleur
545ac638b0
Qual: Removed deprecated code for using a specific mobile theme.
...
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
Laurent Destailleur
c8bc0a1ec9
New: Prepare to code to support jmobile.
2013-04-01 23:38:39 +02:00
Laurent Destailleur
9449345395
Another step for menu management rewriting
2013-04-01 20:15:52 +02:00
Laurent Destailleur
0b9602e4e6
Optionnal entries at end
2013-03-30 20:32:50 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Regis Houssin
ce8631619a
Fix: avoid errors due to BROKEN FEATURES !!!
2013-03-27 11:55:14 +01:00
Regis Houssin
c36f52c47a
Fix: avoid errors due to BROKEN FEATURES !!!
2013-03-27 11:54:10 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01:00
Laurent Destailleur
34fed3e430
No link if we renamed into another product
2013-03-11 15:06:40 +01:00
simnandez
f79a26fe65
[ task #731 ] Uniformize ref generation. Interventions
...
[ task #748 ] Add a link "Dolibarr" into left menu
2013-03-10 13:58:32 +01:00
simnandez
c3f8939ede
[ task #748 ] Add a link "Dolibarr" into left menu
2013-03-10 13:11:31 +01:00
Laurent Destailleur
b060e5961b
Qual: Another step in men manager rewrite.
2013-03-07 19:47:03 +01:00
Laurent Destailleur
c11f7dfc71
Next step for rewriting menu managers.
2013-03-05 15:42:26 +01:00
Laurent Destailleur
ae322ba17f
Qual: Better init of default lang
2013-02-25 10:17:38 +01:00
Laurent Destailleur
b61c576343
Qual: Still work onto menu management rewrite.
2013-02-24 21:16:36 +01:00
Laurent Destailleur
6b20370ffa
Fix: Check consitency of option NOREQUIREXXX
2013-02-24 14:54:08 +01:00
Laurent Destailleur
08bde6faa5
Fix: Do not load menu when not required.
2013-02-24 03:45:19 +01:00
Laurent Destailleur
d31306609c
Fix: Bad translation if error
2013-02-24 02:47:30 +01:00
frederic34
6259f4ce59
Fix : some & -> &
2013-02-21 23:08:58 +01:00
Laurent Destailleur
935f2d9bd8
Add TODO
2013-02-11 21:23:25 +01:00
Regis Houssin
a177853299
Fix: la bétise n'a pas de limite ! restons archaïque.
2013-01-28 20:30:33 +01:00
Laurent Destailleur
c42a0c5b03
Fix: removed warning
2013-01-28 14:40:15 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
c2d334624b
Qual: Simplify system for menu manager. Only one file, one class per
...
manager.
2013-01-25 17:44:23 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
6091f74b13
New: First changes to simplify/optimize menu management.
2013-01-17 18:39:15 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
db1cd6b27f
Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file
...
into 1 class MenuManager. This make code simpler and is also a first
step to optimize performance of menu loading.
2013-01-15 15:42:39 +01:00
Laurent Destailleur
c9a6da610d
To allow module to use ckeditor/config.js
2013-01-12 16:00:38 +01:00
Grand Philippe
eea5dd36ac
fix: favicon was not displayed when using theme within custom directory
2013-01-10 09:23:52 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
9d47b812b9
New: Support module_parts['theme']
2013-01-08 15:21:56 +01:00
Laurent Destailleur
1f320dc1e7
Fix: Comment must be before tag
2013-01-08 12:27:17 +01:00
Regis Houssin
c730aff87b
Fix: possibility to activate jquery plugins with a constant
2013-01-03 19:14:22 +01:00
Regis Houssin
9af8637bd7
Fix: possibility to activate jquery plugins with a constant
2013-01-03 19:13:09 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Laurent Destailleur
215139ca72
Fix: Test for css must match test for js
2012-12-29 05:14:07 +01:00
Laurent Destailleur
ba4be70a5e
Fix: External user was not using correct menu handler.
2012-12-27 17:06:55 +01:00
Laurent Destailleur
5d370c7e96
Fix: force redirect to https could not work for some environments
2012-12-12 02:37:15 +01:00
Christophe Battarel
27670d62ba
fix missing $conf global var in llxHeader() function
2012-12-11 15:14:43 +01:00
Laurent Destailleur
8a5485c9b6
New: Skin can be personalized according to environment.
2012-12-08 18:38:14 +01:00
Laurent Destailleur
ac3eb2e86c
Fix: Use different css cache file for each user. This fix problem when
...
using personalised constants that change style.
2012-12-08 15:29:24 +01:00
Christophe Battarel
bbc470b3ae
add search box to find product by supplier ref
2012-12-05 19:56:23 +01:00
Laurent Destailleur
19b7cc66d5
Qual: Remove hidden option so is not efficient and not used files.
...
Qual: Uniformize code
2012-11-17 11:48:51 +01:00
Laurent Destailleur
f43b26f311
Fix: Bad link
2012-11-10 16:24:20 +01:00
Regis Houssin
1722db223a
Fix: add timepicker default options
2012-11-03 20:41:59 +01:00
Regis Houssin
d0dc336a85
New: jQuery and jQuery UI upgrade
...
New: jQuery Timepicker addon for Datepicker
2012-11-03 19:15:45 +01:00
Regis Houssin
455d399bce
Fix: remove tag
2012-10-31 16:15:37 +01:00
Regis Houssin
634b5f7d1b
Fix: image is hard defined
2012-10-31 15:50:14 +01:00
Regis Houssin
40f5427520
Fix: broken features, ready for doliforge
2012-09-19 17:18:52 +02:00
Regis Houssin
0a61f13c7a
Fix: restore broken features
2012-09-08 18:10:19 +02:00
Regis Houssin
7a0b8b3b1a
Fix: saturday strict mode
2012-09-08 17:43:14 +02:00
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
Laurent Destailleur
d02076f8f2
Strict mode war
2012-09-05 14:41:45 +02:00
Regis Houssin
1b238a7086
Fix: try to use jquery blockUI
2012-09-04 18:34:36 +02:00
Regis Houssin
7f6bf34362
Try to use blockUI
2012-09-04 09:38:38 +02:00
Regis Houssin
2130571712
New: try jquery blockUI plugin
2012-09-03 22:05:13 +02:00
Regis Houssin
616ee24683
Fix: try to use another popup jquery plugin gpl compatible
2012-09-03 11:45:01 +02:00
Laurent Destailleur
9eb21c3d9f
Fix: Minot miscellanous fix
2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938
Fix: strict mode everywhere
2012-09-02 22:48:52 +02:00