bahfir abbes
|
9662c4110a
|
new:bankline_prepare_head for bank lines
|
2020-09-29 01:28:39 +01:00 |
|
Laurent Destailleur
|
1a28d7f641
|
Fix missing token
|
2020-09-28 16:33:27 +02:00 |
|
Laurent Destailleur
|
2e79064098
|
Clean code
|
2020-09-28 11:07:53 +02:00 |
|
Laurent Destailleur
|
1aaf1fe357
|
Try catch on eval
|
2020-09-27 21:10:27 +02:00 |
|
Laurent Destailleur
|
5c9ad3ec9b
|
Update files.lib.php
|
2020-09-27 18:55:09 +02:00 |
|
Florian HENRY
|
5ff7e37696
|
review code
|
2020-09-27 18:05:19 +02:00 |
|
Florian HENRY
|
b6b2553501
|
Merge branch '11.0' into 11.0_fixmultidiroutput
|
2020-09-27 18:02:22 +02:00 |
|
Laurent Destailleur
|
68a6239322
|
Clean code
|
2020-09-26 04:25:14 +02:00 |
|
Laurent Destailleur
|
611684a9a7
|
FIX Substitution for member subscription was not done
|
2020-09-26 02:39:19 +02:00 |
|
Laurent Destailleur
|
d3e9815cfa
|
Fix phpunit
|
2020-09-25 17:48:04 +02:00 |
|
Laurent Destailleur
|
48632bbb3f
|
Clean code
|
2020-09-25 17:23:42 +02:00 |
|
Laurent Destailleur
|
1b83b55995
|
Fix to exclude possible sql injection
|
2020-09-25 17:11:54 +02:00 |
|
Laurent Destailleur
|
0d797a793a
|
On technical error, return http code 500
|
2020-09-25 15:01:15 +02:00 |
|
Laurent Destailleur
|
95cf3d2f51
|
NEW Can use desired stock of a given warehouse for replenishment
|
2020-09-23 23:02:31 +02:00 |
|
Laurent Destailleur
|
09c6761dae
|
NEW Include the tag editor of page as a popup into website editor
|
2020-09-23 16:36:19 +02:00 |
|
Laurent Destailleur
|
5a1c05735f
|
Fix phpcs
|
2020-09-22 15:55:30 +02:00 |
|
Laurent Destailleur
|
fea6fca7d1
|
Fix phpunit
|
2020-09-22 15:31:09 +02:00 |
|
Laurent Destailleur
|
d21ee07afc
|
NEW Can define date range of validity of a login during creation
|
2020-09-22 14:45:19 +02:00 |
|
Laurent Destailleur
|
5f4547bf7c
|
Prepare table for future features
|
2020-09-22 10:38:16 +02:00 |
|
Laurent Destailleur
|
438e884c01
|
Fix phpcs
|
2020-09-21 14:17:05 +02:00 |
|
Laurent Destailleur
|
3ca379c9e6
|
FIX Restore multiselect (selection of prospect level)
Conflicts:
htdocs/core/class/html.form.class.php
|
2020-09-21 12:22:57 +02:00 |
|
Laurent Destailleur
|
6380a294fc
|
FIX Restore multiselect (selection of prospect level)
|
2020-09-21 12:16:22 +02:00 |
|
Laurent Destailleur
|
43376b3abc
|
Removed warning
|
2020-09-20 21:27:11 +02:00 |
|
Laurent Destailleur
|
2fcc0791ac
|
Fix regression on backtopage
|
2020-09-20 19:55:44 +02:00 |
|
Laurent Destailleur
|
b024ce799c
|
Merge pull request #14782 from b92/patch-1
FIX: Members substitution variable not substituted if empty
|
2020-09-20 17:13:29 +02:00 |
|
Laurent Destailleur
|
2eb46b4900
|
Enhance antiXSS by excluding non printable chars used to obfuscate hack
|
2020-09-20 04:56:45 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
b5703350da
|
Fix escape
|
2020-09-19 22:41:05 +02:00 |
|
Laurent Destailleur
|
54c0f742b1
|
Fix escape
|
2020-09-19 21:19:04 +02:00 |
|
Laurent Destailleur
|
3bd94d52a1
|
Fix css
|
2020-09-19 15:15:49 +02:00 |
|
Laurent Destailleur
|
b1985950a6
|
Use POST to make the ajax set/del constant
|
2020-09-19 12:50:47 +02:00 |
|
Laurent Destailleur
|
e142b42f19
|
Clean code
|
2020-09-19 04:14:49 +02:00 |
|
Laurent Destailleur
|
93b7956156
|
Fix sanitizing of backtopage
|
2020-09-19 02:12:08 +02:00 |
|
Laurent Destailleur
|
a0b230fa46
|
Fix #yogosha4534
|
2020-09-19 01:58:46 +02:00 |
|
Laurent Destailleur
|
6a45545ec1
|
Prepare for fix
|
2020-09-19 01:53:22 +02:00 |
|
Laurent Destailleur
|
b7a97b2c81
|
Prepare for fix
|
2020-09-19 01:45:40 +02:00 |
|
Laurent Destailleur
|
f62d52f89a
|
Fix tooltip for linkto object.
Fix security of ajax selectobject.php
|
2020-09-19 00:44:47 +02:00 |
|
Laurent Destailleur
|
63bc3aa48a
|
Better sanitizing
|
2020-09-19 00:05:29 +02:00 |
|
Laurent Destailleur
|
6d2d5d7cae
|
Fix #yogosha4529
|
2020-09-19 00:02:38 +02:00 |
|
Bernard Saulme
|
d86f541b35
|
FIX|members substitution variable not substituted if empty
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
|
2020-09-18 18:29:52 +02:00 |
|
Laurent Destailleur
|
4e2aff2cdc
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:28:02 +02:00 |
|
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 |
|
Laurent Destailleur
|
bcab13c395
|
Fix typo
|
2020-09-10 15:52:47 +02:00 |
|
Laurent Destailleur
|
ed3f1c29ef
|
more log
|
2020-09-10 15:52:09 +02:00 |
|
Laurent Destailleur
|
1da99a8fcd
|
Add log to debug travis error
|
2020-09-10 15:49:13 +02:00 |
|
Sekan, Tobias
|
747d8c32e2
|
Fix Sticker CI (again :'-( )
|
2020-09-10 12:29:01 +02:00 |
|
Sekan, Tobias
|
2292f83258
|
fix sticker ci
|
2020-09-10 11:26:17 +02:00 |
|
Sekan, Tobias
|
3f8b2153ea
|
fix sticker Ci and add missing doc
|
2020-09-10 11:25:35 +02:00 |
|
Sekan, Tobias
|
d2903c5de6
|
adress feedback + massive cleanup
|
2020-09-10 11:04:41 +02:00 |
|
Laurent Destailleur
|
08ab4855f2
|
Merge branch 'develop' into 13a11
|
2020-09-09 19:12:08 +02:00 |
|
Laurent Destailleur
|
5c34b26f39
|
FIX Look and feel v12: First tab must be name of object
|
2020-09-09 13:57:35 +02:00 |
|
Sekan, Tobias
|
49d009502c
|
fix sticker CI
|
2020-09-09 08:16:26 +02:00 |
|
Scrutinizer Auto-Fixer
|
c263c8a76c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-08 19:27:28 +00:00 |
|
Laurent Destailleur
|
86ed4dfa2b
|
Debug hidden option MAIN_USE_EXPENSE_IK
|
2020-09-08 11:51:36 +02:00 |
|
Sekan, Tobias
|
bd96e0fe42
|
finished helper method and usage of it
|
2020-09-08 11:15:33 +02:00 |
|
Alexandre SPANGARO
|
d1ba6b9476
|
Merge remote-tracking branch 'upstream/develop' into 13a11
|
2020-09-08 05:01:36 +02:00 |
|
Alexandre SPANGARO
|
6a04f39fbe
|
Wrong language key
|
2020-09-08 04:58:42 +02:00 |
|
Alexandre SPANGARO
|
8c75f0b95b
|
Code optimize
|
2020-09-07 21:38:39 +02:00 |
|
Laurent Destailleur
|
c95e54843c
|
Update lib debugbar
Update php-parallel-lint
|
2020-09-07 21:00:40 +02:00 |
|
Laurent Destailleur
|
b1e45aef46
|
Debug opensurvey. Look and feel v13. Removed deprecated properties.
|
2020-09-07 12:04:50 +02:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
d700649fb9
|
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
|
2020-09-06 19:25:25 +02:00 |
|
Laurent Destailleur
|
84efd70dcb
|
FIX Clean tooltip of help for substition for long notes
|
2020-09-06 19:19:55 +02:00 |
|
Sekan, Tobias
|
0375f5fd37
|
Add helper function for table headers with numbers
|
2020-09-04 15:24:45 +02:00 |
|
lvessiller
|
27c754e6c8
|
NEW add send context for ticket
|
2020-09-02 15:33:18 +02:00 |
|
atm-lena
|
f8c79db4a9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
|
2020-08-31 14:14:27 +02:00 |
|
Laurent Destailleur
|
02f108835d
|
Fix tooltip
|
2020-08-30 19:45:46 +02:00 |
|
Laurent Destailleur
|
0d4f7cb485
|
Fix responsive and title of reports
|
2020-08-30 17:42:49 +02:00 |
|
Laurent Destailleur
|
e030b2089a
|
Look and feel v13
|
2020-08-30 13:14:28 +02:00 |
|
Laurent Destailleur
|
b721930b3b
|
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
Agenda Remind (Part 1)
|
2020-08-29 05:19:21 +02:00 |
|
Laurent Destailleur
|
723a263cd3
|
Fix phpcs
|
2020-08-29 05:07:23 +02:00 |
|
Laurent Destailleur
|
4ecd15b7ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
|
2020-08-27 21:57:42 +02:00 |
|
Laurent Destailleur
|
b6e9ba8ed6
|
Merge pull request #14535 from aspangaro/13a6
Some fix on assets
|
2020-08-27 20:01:33 +02:00 |
|
atm-lena
|
e3ce3cbb7c
|
Function sendEmailsReminder()
|
2020-08-27 15:49:56 +02:00 |
|
atm-lena
|
69459e3429
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
|
2020-08-27 11:13:21 +02:00 |
|
Laurent Destailleur
|
180a49601b
|
Use CSS to define size of logo on public pages.
|
2020-08-27 11:01:41 +02:00 |
|
atm-lena
|
4ef2644300
|
Use date.lib.php functions
|
2020-08-27 10:29:23 +02:00 |
|
Alexandre SPANGARO
|
eebe888377
|
Some fix on assets
|
2020-08-24 09:47:37 +02:00 |
|
Laurent Destailleur
|
f010e44a71
|
WIP
|
2020-08-23 22:13:06 +02:00 |
|
Laurent Destailleur
|
b600478a5a
|
Work on recruitment module
|
2020-08-23 22:11:16 +02:00 |
|
Laurent Destailleur
|
8115acbf82
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-08-23 19:25:05 +02:00 |
|
Laurent Destailleur
|
f819509442
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-08-23 19:22:27 +02:00 |
|
Laurent Destailleur
|
74eac1d06a
|
Fix include regression
|
2020-08-23 19:22:01 +02:00 |
|
Laurent Destailleur
|
38d53cc03d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/lib/pdf.lib.php
|
2020-08-23 19:20:50 +02:00 |
|
Laurent Destailleur
|
4fa6d86127
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-08-23 19:17:01 +02:00 |
|
Laurent Destailleur
|
7a183ea026
|
Update pdf.lib.php
|
2020-08-23 19:13:30 +02:00 |
|
Laurent Destailleur
|
b44d6744f9
|
Update pdf.lib.php
|
2020-08-23 19:11:40 +02:00 |
|
Laurent Destailleur
|
7eb003c684
|
Update pdf.lib.php
|
2020-08-23 19:11:19 +02:00 |
|
Laurent Destailleur
|
c784c002fd
|
Merge pull request #14517 from aspangaro/13.0_a5
Some fix on complete_head_from_modules
|
2020-08-23 18:09:15 +02:00 |
|
Laurent Destailleur
|
34d2d9a7c6
|
Look and feel v13
|
2020-08-23 15:17:22 +02:00 |
|
Laurent Destailleur
|
ca2a34a4c9
|
Standardize code: Rename fields date_m into tms. All timestamp fields
are now name "tms".
|
2020-08-23 15:15:47 +02:00 |
|
Laurent Destailleur
|
23cda5f464
|
Enhance recruitment module
|
2020-08-22 14:37:09 +02:00 |
|
Laurent Destailleur
|
220fc6db98
|
Work on recruitment module
|
2020-08-21 13:00:12 +02:00 |
|
Laurent Destailleur
|
ad0625b6ec
|
Debug posting message from ticket page
|
2020-08-21 01:11:22 +02:00 |
|
Alexandre SPANGARO
|
f1f579ad67
|
Some fix on complete_head_from_modules
|
2020-08-20 22:17:34 +02:00 |
|
Laurent Destailleur
|
afe8f76a4a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/stock.php
|
2020-08-18 15:41:57 +02:00 |
|
Laurent Destailleur
|
d4a502629e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/admin/stock.php
htdocs/core/lib/ajax.lib.php
|
2020-08-18 15:35:34 +02:00 |
|
Laurent Destailleur
|
d21bda604d
|
FIX Setup of stock increase/decrease
|
2020-08-18 15:27:17 +02:00 |
|
Laurent Destailleur
|
58e25768a7
|
NEW Add PDF document templates for warehouses (list of stock)
|
2020-08-18 14:02:36 +02:00 |
|
Laurent Destailleur
|
bd65e5612f
|
Fix duplicate id
|
2020-08-17 20:06:01 +02:00 |
|
Laurent Destailleur
|
c63d54631c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/categories/class/categorie.class.php
|
2020-08-17 19:59:17 +02:00 |
|
Laurent Destailleur
|
487d26c7db
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
|
2020-08-17 19:54:23 +02:00 |
|
John Botella
|
6e1702c1a5
|
Fix infinite fetch object linked loop
|
2020-08-17 15:00:31 +02:00 |
|
Laurent Destailleur
|
86a31d17a5
|
Better test
|
2020-08-17 04:34:53 +02:00 |
|
Laurent Destailleur
|
5987504fa5
|
Better test
|
2020-08-17 04:34:03 +02:00 |
|
asolslk
|
5a6f459db5
|
Update accounting.lib.php
|
2020-08-17 04:09:12 +02:00 |
|
Laurent Destailleur
|
75f8fe8276
|
Merge pull request #14427 from asolslk/patch-2
FIX Visible 0 on accounting account
|
2020-08-17 01:34:57 +02:00 |
|
Alexandre SPANGARO
|
27c36713d3
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-08-16 22:10:02 +02:00 |
|
Bernard Saulme
|
52b84a3ea2
|
Update functions.lib.php
|
2020-08-14 18:08:59 +02:00 |
|
Laurent Destailleur
|
65ceaac42e
|
Better message
|
2020-08-14 12:56:17 +02:00 |
|
Laurent Destailleur
|
a916f6af59
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-08-14 11:09:06 +02:00 |
|
Laurent Destailleur
|
0381cf5665
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
|
2020-08-14 11:08:53 +02:00 |
|
Laurent Destailleur
|
056a503200
|
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
Conflicts:
htdocs/product/composition/card.php
|
2020-08-14 11:06:39 +02:00 |
|
Laurent Destailleur
|
74da63c0e4
|
Merge pull request #14448 from 418sec/develop
Security Fix for Cross-site Scripting (XSS) - huntr.dev
|
2020-08-14 03:17:35 +02:00 |
|
lvessiller
|
f385e02c53
|
FIX title button attribute id empty
|
2020-08-13 17:43:18 +02:00 |
|
Laurent Destailleur
|
88c07e86ad
|
Organization of setup for Takepos bar features
|
2020-08-13 13:46:53 +02:00 |
|
florian HENRY
|
c4d8a25c5a
|
fix external module multidiroutput
|
2020-08-10 13:40:55 +02:00 |
|
asolslk
|
ea829913b0
|
Update accounting.lib.php
|
2020-08-08 19:07:55 +08:00 |
|
Laurent Destailleur
|
ada7b74ba1
|
Fix phpcs
|
2020-08-07 14:56:30 +02:00 |
|
Laurent Destailleur
|
5482a3134a
|
Merge pull request #14355 from fmarcet/10.0
Fix: User can see events that are not assigned to it
|
2020-08-07 14:54:39 +02:00 |
|
Laurent Destailleur
|
6fd433167f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-08-07 11:59:55 +02:00 |
|
Laurent Destailleur
|
284378232b
|
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
FIX : JS CRASH - bad usage of moreparam
|
2020-08-07 10:10:09 +02:00 |
|
Laurent Destailleur
|
16828b8cec
|
Merge pull request #14403 from FHenry/12.0
fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)
|
2020-08-07 09:58:49 +02:00 |
|
Laurent Destailleur
|
c2b03e49e1
|
Fix logo not visible in setup page
|
2020-08-06 17:28:57 +02:00 |
|
Laurent Destailleur
|
c6ee80eefd
|
FIX Disable svg as supported image by default. Set
MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.
|
2020-08-06 17:16:09 +02:00 |
|
florian HENRY
|
46cafcc445
|
Merge branch '11.0' into 12.0
|
2020-08-06 16:54:49 +02:00 |
|
Laurent Destailleur
|
43b23994e4
|
WIP Recruitment module
|
2020-08-06 15:55:04 +02:00 |
|
Laurent Destailleur
|
37f1b27bd2
|
Fix phpcs
|
2020-08-06 03:55:47 +02:00 |
|
Laurent Destailleur
|
cd89538ee9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-08-06 03:04:46 +02:00 |
|
Laurent Destailleur
|
5b0d04609c
|
Fix number to string
|
2020-08-06 03:03:18 +02:00 |
|
Laurent Destailleur
|
b40177a8c8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 03:00:16 +02:00 |
|
Laurent Destailleur
|
fbcf95ba02
|
Fix number to string
|
2020-08-06 02:59:46 +02:00 |
|
Laurent Destailleur
|
641d9a6565
|
Fix number to string
|
2020-08-06 02:58:07 +02:00 |
|
Laurent Destailleur
|
ce960c8d0d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 02:53:19 +02:00 |
|
Laurent Destailleur
|
0b7aec1fa0
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
|
2020-08-06 02:52:54 +02:00 |
|
Laurent Destailleur
|
73ea5b0e2d
|
Fix function to convert price to string
|
2020-08-06 02:50:24 +02:00 |
|
Laurent Destailleur
|
d2eb1cc47d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
|
2020-08-06 02:20:49 +02:00 |
|
Laurent Destailleur
|
12b9a73ca5
|
Fix phpcs
|
2020-08-06 02:18:34 +02:00 |
|
Laurent Destailleur
|
9d79e984dd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
|
2020-08-06 02:15:04 +02:00 |
|
Laurent Destailleur
|
1cf3422e05
|
FIX Bad adress of vendor in PDF for PDF of supplier payment
FIX dol_convertToWord() Bad conversion of number into a string
|
2020-08-06 01:56:42 +02:00 |
|
spooky360
|
a94fa93973
|
Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr)
|
2020-08-05 17:11:19 +02:00 |
|
spooky360
|
b9513255fd
|
Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr).
|
2020-08-05 17:02:59 +02:00 |
|
stickler-ci
|
8d88217434
|
Fixing style errors.
|
2020-08-04 14:48:15 +00:00 |
|
Ferran Marcet
|
70ad2fcee0
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:57 +02:00 |
|
Ferran Marcet
|
7a077a2d99
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:04 +02:00 |
|
Ferran Marcet
|
1a62a36b86
|
Merge remote-tracking branch 'origin/10.0' into 10.0
|
2020-08-04 16:40:01 +02:00 |
|
Ferran Marcet
|
7b6ef7aca8
|
Merge branch '10.0up' into 10.0
|
2020-08-04 16:39:40 +02:00 |
|
John Botella
|
11f14b8fe5
|
Fix bad usage of moreparam
|
2020-08-04 14:13:52 +02:00 |
|
Laurent Destailleur
|
c09827248b
|
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
|
2020-08-04 12:27:31 +02:00 |
|
Florian Mortgat
|
ce18a4f029
|
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
|
2020-08-03 12:28:12 +02:00 |
|
stickler-ci
|
9926eac192
|
Fixing style errors.
|
2020-08-03 09:26:36 +00:00 |
|