Frédéric FRANCE
|
2137486e55
|
code syntax r... dir
|
2021-02-26 20:53:03 +01:00 |
|
Laurent Destailleur
|
2be6992916
|
Fix include_once into include for inc.php file. See comment in #16338
|
2021-02-19 16:10:19 +01:00 |
|
Laurent Destailleur
|
b0ea2ac187
|
Merge pull request #16033 from FHenry/12_fix_position_coutry_resource
move extrafield to the end as other card
|
2021-01-21 13:22:04 +01:00 |
|
Florian HENRY
|
2a19528267
|
move extrafield to the end as other acard
|
2021-01-21 08:52:10 +01:00 |
|
Gauthier PC portable 024
|
8dfb088fc5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation
|
2021-01-11 10:34:38 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
8e839a34e2
|
FIX for php 8
|
2020-12-23 19:14:47 +01:00 |
|
Gauthier PC portable 024
|
5116337e0b
|
FIX : stickler feedbacks
|
2020-12-21 13:29:44 +01:00 |
|
stickler-ci
|
da9defe0ce
|
Fixing style errors.
|
2020-12-21 11:34:51 +00:00 |
|
Gauthier PC portable 024
|
7b739920a2
|
NEW : Workstations management
|
2020-12-21 12:28:45 +01:00 |
|
Laurent Destailleur
|
958893228a
|
Fix combo to add contact and status of contact on popup
|
2020-11-30 15:18:58 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
27282d7e3d
|
FIX Include the ticket and mo table in merge process of thirdparty
|
2020-10-16 17:08:23 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
0bf0312d50
|
FIX #yogosha4448
|
2020-09-17 12:30:14 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
f626bd70d0
|
Look and feel v13
|
2020-09-14 20:53:42 +02:00 |
|
Laurent Destailleur
|
c4383747a1
|
Look and feel v13
|
2020-09-11 13:57:16 +02:00 |
|
Laurent Destailleur
|
b2bd90ae1a
|
Fix link to list of event
|
2020-07-09 12:33:28 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
e5fc928fda
|
add new rule
|
2020-05-21 02:02:54 +02:00 |
|
Laurent Destailleur
|
a2bc46f1c0
|
CSS
|
2020-05-11 12:50:24 +02:00 |
|
Laurent Destailleur
|
c511af69fe
|
Debug look and feel v12
|
2020-05-10 21:07:49 +02:00 |
|
Laurent Destailleur
|
4d6a45d491
|
Major doxygen fix
|
2020-05-03 22:48:35 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
3740d59848
|
Look and feel v12
|
2020-04-13 04:14:28 +02:00 |
|
Laurent Destailleur
|
92b6b1a042
|
Look and feel v12
|
2020-04-12 18:13:43 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
84cda962c1
|
Clean dead code
|
2020-04-02 12:03:29 +02:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Laurent Destailleur
|
ffa847bc8e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-02 19:32:37 +01:00 |
|
Laurent Destailleur
|
314456f812
|
Fix var not defined
|
2020-01-30 13:03:33 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
1e13f6fd0f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php
|
2020-01-29 11:44:04 +01:00 |
|
Laurent Destailleur
|
5d2130a5ae
|
Fix SQL injection
|
2020-01-29 11:38:06 +01:00 |
|
Laurent Destailleur
|
5f64531e9b
|
Fix look and feel v11
|
2020-01-20 12:39:25 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
Frédéric FRANCE
|
bd270cd535
|
Update dolresource.class.php
|
2019-12-14 16:21:18 +01:00 |
|
Scrutinizer Auto-Fixer
|
b388c6b7a8
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-22 13:14:59 +00:00 |
|
Laurent Destailleur
|
9a8c5d5c29
|
Sanitize param
|
2019-11-21 15:36:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
6f82c212a0
|
Finished migration to the new architecture of extrafields
|
2019-11-02 17:38:19 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
941043dd67
|
Fix navigation on resources
|
2019-11-02 00:17:08 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Philippe GRAND
|
9407afcacb
|
add some comment
|
2019-10-30 10:09:37 +01:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Laurent Destailleur
|
e3edb37620
|
Fix escape db
|
2019-09-27 14:54:23 +02:00 |
|
Laurent Destailleur
|
99ed34b6a4
|
Fix escape db
|
2019-09-27 11:39:02 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
VESSILLER
|
66611f4097
|
FIX rename "resource" (reserved) by "dolresource"
|
2019-09-09 09:29:43 +02:00 |
|
VESSILLER
|
815d0bbc20
|
FIX rename "dolresource" into "resource" for compatibility with PR 11822
|
2019-09-05 11:57:12 +02:00 |
|
VESSILLER
|
9ed09db93c
|
FIX replace "<br />" by "<br>"
|
2019-09-05 09:41:15 +02:00 |
|
VESSILLER
|
4ef7e755ad
|
FIX only check on busy resources before updating an event
|
2019-09-05 09:29:40 +02:00 |
|
VESSILLER
|
b70587c150
|
NEW check if a resource is in use in an event
|
2019-09-04 15:14:16 +02:00 |
|
Laurent Destailleur
|
4bda18fd4d
|
Merge pull request #11568 from joseplluis/patch-7
FIX: move doActions hook before standard actions
|
2019-07-30 21:08:12 +02:00 |
|
Josep Lluís
|
567c4bf97b
|
FIX: resource tpls directories
search resource tpls also in custom modules directories
|
2019-07-29 18:17:48 +02:00 |
|
Josep Lluís
|
a412a99263
|
FIX: move doActions hook before standard actions
Move doActions hook before standard actions in element resources
|
2019-07-26 17:51:54 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
73d60e6606
|
Look and feel v10
|
2019-06-05 12:16:55 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
969e139d5c
|
Fix parameters of accessforbidden
|
2019-06-04 12:21:27 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
2b3c5902e6
|
Merge pull request #11281 from atm-maxime/fix_warning_resource
Fix : warnings in resource module
|
2019-06-02 12:17:19 +02:00 |
|
Laurent Destailleur
|
cb927847ab
|
Update dolresource.class.php
|
2019-06-02 12:16:12 +02:00 |
|
Maxime Kohlhaas
|
0372276a7b
|
Fix : warnings in resource module
|
2019-05-31 16:04:12 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
florian HENRY
|
c519906c9e
|
fix scrunitizer
|
2019-05-18 15:46:49 +02:00 |
|
Laurent Destailleur
|
26d4875f8f
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 02:27:23 +02:00 |
|
Maxime Kohlhaas
|
aed71be7f1
|
Fix resource delete with attached file
|
2019-05-18 00:47:32 +02:00 |
|
John BOTELLA
|
f296093f8d
|
fix travis
|
2019-05-10 15:52:46 +02:00 |
|
John BOTELLA
|
a60d4b3b52
|
Appli btn apply to links
|
2019-04-16 09:09:25 +02:00 |
|
Laurent Destailleur
|
a19cedfc13
|
Fix phpcs
|
2019-04-09 00:48:12 +02:00 |
|
Ion
|
b64cb4129f
|
Add resources tab for products/services
|
2019-04-07 23:52:49 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|