Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,381 Commits 36 Branches 189 Tags
61bca50fa62c0b51127e5802e3926f031afb9812
Commit Graph

6728 Commits

Author SHA1 Message Date
Laurent Destailleur
72d5850a5f Fix regression 2020-09-18 15:45:26 +02:00
Laurent Destailleur
cf8e8ee68b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Laurent Destailleur
2fe9514b6b Doc 2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71 Fix remove useless code 2020-09-18 13:58:09 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2020-09-17 19:33:29 +02:00
Laurent Destailleur
eae5410ced Protect md file 2020-09-17 16:57:39 +02:00
Laurent Destailleur
7cc75ac873 Fix: removing also " when removing " from a received parameter. 2020-09-17 14:43:58 +02:00
Laurent Destailleur
2f100fdf79 Fix alpha into alphanohtml 2020-09-17 12:53:58 +02:00
Laurent Destailleur
33cefacf91 Fix missing global 2020-09-17 12:17:14 +02:00
Laurent Destailleur
05636c39bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 11:39:58 +02:00
Laurent Destailleur
939433706b FIX #yogosha4465 2020-09-17 11:37:41 +02:00
Laurent Destailleur
5e3f6ce736 Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup 
Use new table function for comm/propal + cleanup
 2020-09-17 11:20:31 +02:00
Laurent Destailleur
d92e482841 FIX #yogosha transversal path when unzipping file 2020-09-17 11:09:43 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591 Fix css 2020-09-16 20:09:40 +02:00
Laurent Destailleur
47031cb656 Fix phpcs 2020-09-16 18:51:19 +02:00
Laurent Destailleur
d7aa376c3c FIX Yogosha report 4425 2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f MAIN_DASHBOARD_USE_TOTAL_HT + more clean 2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Sekan, Tobias
ac1fdb4a59 Use new table function for comm/propal + cleanup 2020-09-16 10:51:19 +02:00
Laurent Destailleur
7bcf2c9089 css 2020-09-15 14:45:51 +02:00
Laurent Destailleur
cc24e9b155 Look and feel v13 2020-09-15 13:27:48 +02:00
Laurent Destailleur
3fd041e861 Update functions.lib.php 2020-09-15 11:28:49 +02:00
Alexandre SPANGARO
4137e92430 Time to enable fontawesome icons on weather feature 2020-09-15 03:42:35 +02:00
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product. 
CSS
 2020-09-15 02:41:08 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
33d61333b1 Fix picto 2020-09-14 12:50:07 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
4b525f6826 Debug notifications on browser 2020-09-12 04:12:39 +02:00
Laurent Destailleur
9dad8f0fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06 Close #14604 Merge manually change to get notification to show 
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
 2020-09-12 03:02:08 +02:00
Laurent Destailleur
fab3a774d2 Merge pull request #14636 from TobiasSekan/AddTableHelperMethod 
NEW Add helper function for table headers with numbers
 2020-09-12 01:21:24 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
753396ec20 Look and feel v13 2020-09-11 12:19:40 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
Laurent Destailleur
7e7dec9306 FIX Look and feel v12 2020-09-10 18:02:06 +02:00
Laurent Destailleur
8d93b76258 Clean code 2020-09-10 17:49:05 +02:00
Laurent Destailleur
ed6a16a3c7 FIX look and feel v12 2020-09-10 17:17:31 +02:00
Laurent Destailleur
8c9f2b8458 Fix trans, add log 2020-09-10 17:08:51 +02:00