Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

1523 Commits

Author SHA1 Message Date
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
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