Laurent Destailleur
|
503206af88
|
Fix analytics tag
|
2020-06-11 16:38:58 +02:00 |
|
Laurent Destailleur
|
5794b1abea
|
Fix for use with text browser
Conflicts:
htdocs/main.inc.php
|
2020-06-10 12:46:55 +02:00 |
|
Laurent Destailleur
|
bd22ad4174
|
Fix for use with text browser
|
2020-06-10 12:35:39 +02:00 |
|
Laurent Destailleur
|
c175fbd697
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
|
2020-06-09 22:09:57 +02:00 |
|
Laurent Destailleur
|
756ef0b583
|
Fix disallow < > into meta info
Fix message page regenerated
|
2020-06-09 21:43:42 +02:00 |
|
Laurent Destailleur
|
88aaec63f7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 18:57:41 +02:00 |
|
Laurent Destailleur
|
e31e889595
|
Add url in error message
|
2020-06-06 18:30:04 +02:00 |
|
Laurent Destailleur
|
474860d546
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-03 14:06:35 +02:00 |
|
Laurent Destailleur
|
7b84518e59
|
Fix webp support
|
2020-06-03 14:05:18 +02:00 |
|
Laurent Destailleur
|
a2a15ceb5b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
|
2020-05-27 23:07:18 +02:00 |
|
Laurent Destailleur
|
e37e45f984
|
Debug credit transfer
|
2020-05-27 22:35:55 +02:00 |
|
Laurent Destailleur
|
16625af34e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
|
2020-05-27 14:28:20 +02:00 |
|
Laurent Destailleur
|
c0ce584487
|
Look and feel v12
|
2020-05-27 00:26:04 +02:00 |
|
Laurent Destailleur
|
c607c2daa0
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-26 22:31:47 +02:00 |
|
Laurent Destailleur
|
91ecd3455f
|
Fix CSS
|
2020-05-26 22:30:11 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
Frédéric FRANCE
|
0f4f727d18
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-22 08:27:12 +02:00 |
|
Laurent Destailleur
|
5d78f6dac5
|
NEW Add link to edit property from search result of website pages
|
2020-05-22 00:38:01 +02:00 |
|
Frédéric FRANCE
|
5940d3705a
|
add new rule
|
2020-05-21 16:00:12 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Frédéric FRANCE
|
ccadb1ec7a
|
add new rule
|
2020-05-21 00:47:16 +02:00 |
|
Laurent Destailleur
|
c5e341883d
|
Fix popup of supplier invoice
|
2020-05-19 23:22:40 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Laurent Destailleur
|
5fe9c45fb2
|
Fix look and feel v12
|
2020-05-15 16:07:39 +02:00 |
|
Laurent Destailleur
|
ae0e6e4dc8
|
FIX dol_concatdesc to escape <
Better help
|
2020-05-14 14:30:36 +02:00 |
|
Laurent Destailleur
|
44d36815bd
|
Look and feel v12
|
2020-05-11 19:00:27 +02:00 |
|
Laurent Destailleur
|
a8dcd2d09b
|
Clean code
|
2020-05-11 11:53:13 +02:00 |
|
Laurent Destailleur
|
501f1ba2c4
|
Fix look and feel v12
|
2020-05-10 15:45:07 +02:00 |
|
Laurent Destailleur
|
206b16410e
|
Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
|
2020-05-07 22:52:32 +02:00 |
|
Frédéric FRANCE
|
c28e6630bb
|
Update functions.lib.php
|
2020-05-07 15:41:21 +02:00 |
|
Frédéric FRANCE
|
dd1d29f983
|
add some substitutions for date datetime
|
2020-05-07 15:37:32 +02:00 |
|
Laurent Destailleur
|
b09f179a16
|
NEW Website logs are now into a separated log file.
|
2020-05-06 04:32:48 +02:00 |
|
Laurent Destailleur
|
30fede216c
|
Fix Add '_pw' var as var sensibles.
|
2020-05-06 04:03:07 +02:00 |
|
Laurent Destailleur
|
247acdd274
|
Fix position of custom groups of modules
|
2020-05-06 03:47:28 +02:00 |
|
Scrutinizer Auto-Fixer
|
8f0e00b4aa
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-02 01:39:56 +00:00 |
|
Laurent Destailleur
|
62a2469c71
|
Fix position of modules
|
2020-05-02 00:41:27 +02:00 |
|
Laurent Destailleur
|
5948d385a3
|
Look and feel v12
|
2020-04-30 14:46:49 +02:00 |
|
kamel
|
28d330996c
|
Correction pour validation Stickler CI / stickler-ci
|
2020-04-27 18:01:07 +02:00 |
|
kamel
|
9cb90cb384
|
NEW: Add prospect status managment for the contact with managment of custom icon
|
2020-04-27 17:35:14 +02:00 |
|
Laurent Destailleur
|
3090eb578b
|
Look and feel v12
|
2020-04-25 17:43:12 +02:00 |
|
Laurent Destailleur
|
1121d2c1c6
|
Look and feel v12
|
2020-04-25 13:49:44 +02:00 |
|
Laurent Destailleur
|
5ce3174181
|
Look and feel v12
|
2020-04-25 03:31:47 +02:00 |
|
Laurent Destailleur
|
6b114a31ce
|
Look and feel v12
|
2020-04-25 03:00:41 +02:00 |
|
Laurent Destailleur
|
291664d109
|
Look and feel v12
|
2020-04-25 01:04:26 +02:00 |
|
Laurent Destailleur
|
3ed11f374a
|
Look and feel v12
|
2020-04-24 23:56:57 +02:00 |
|
Laurent Destailleur
|
39c454d07b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modFournisseur.class.php
|
2020-04-22 18:28:52 +02:00 |
|
Laurent Destailleur
|
7bc8a70b0a
|
FIX #13670
|
2020-04-22 18:23:48 +02:00 |
|
Laurent Destailleur
|
496d8f354f
|
Look and feel v12
|
2020-04-22 17:59:54 +02:00 |
|
Laurent Destailleur
|
9a5986e190
|
css
|
2020-04-22 12:40:11 +02:00 |
|
Laurent Destailleur
|
5c573e197b
|
Look and feel v12
|
2020-04-22 00:50:04 +02:00 |
|
Laurent Destailleur
|
cadb52c5b3
|
Look and feel v12
|
2020-04-20 19:39:34 +02:00 |
|
Laurent Destailleur
|
230fe26b58
|
Look and feel v12
|
2020-04-20 18:38:25 +02:00 |
|
Laurent Destailleur
|
67a7d6b77d
|
Look and feel v12
|
2020-04-20 15:57:15 +02:00 |
|
Laurent Destailleur
|
fe674f08d9
|
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
|
2020-04-20 03:00:10 +02:00 |
|
Laurent Destailleur
|
8d59ce2e03
|
Look and feel v12
|
2020-04-20 02:48:05 +02:00 |
|
Laurent Destailleur
|
fa056e59df
|
Look and feel v12
|
2020-04-20 02:14:43 +02:00 |
|
Laurent Destailleur
|
3740d59848
|
Look and feel v12
|
2020-04-13 04:14:28 +02:00 |
|
Laurent Destailleur
|
d0dbf323ed
|
css
|
2020-04-13 01:42:10 +02:00 |
|
Laurent Destailleur
|
549b126eff
|
Look and feel v12
|
2020-04-12 21:36:57 +02:00 |
|
Laurent Destailleur
|
ed51ce8734
|
Look and feel v12
|
2020-04-12 19:56:50 +02:00 |
|
Frédéric FRANCE
|
ea78fc48a8
|
The variable $rep seems to be never defined.
|
2020-04-12 18:03:51 +02:00 |
|
Laurent Destailleur
|
7d430c08d0
|
Look and feel v12
|
2020-04-12 16:36:25 +02:00 |
|
Laurent Destailleur
|
0916017519
|
Fix addreplace hook
|
2020-04-12 15:29:13 +02:00 |
|
Laurent Destailleur
|
d7784887d1
|
More font awesome picto
|
2020-04-12 14:58:50 +02:00 |
|
Maxime Kohlhaas
|
f5ab957faf
|
FIX #13535 : state in italian address
|
2020-04-11 17:56:23 +02:00 |
|
Laurent Destailleur
|
760121a3d1
|
Can sort list of answers.
|
2020-04-11 14:13:16 +02:00 |
|
Laurent Destailleur
|
069fb27ced
|
Look and feel v12
|
2020-04-10 12:27:34 +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
|
5f00f0133e
|
Merge pull request #13529 from bb2a/patch-4
Display Phone link and separ personalise in const
|
2020-04-09 19:54:48 +02:00 |
|
Laurent Destailleur
|
bc2a1d653d
|
Merge pull request #13542 from ptibogxiv/patch-325
FIX pencil with font awesome 5.13
|
2020-04-09 19:35:35 +02:00 |
|
Laurent Destailleur
|
6a60678186
|
Look and feel v12
|
2020-04-09 16:36:39 +02:00 |
|
ptibogxiv
|
5bba22aeeb
|
FIX pencil with font awesome 5.13
|
2020-04-09 14:58:42 +02:00 |
|
Laurent Destailleur
|
5819aadf75
|
Clean html code (replace table into table with div)
|
2020-04-09 13:40:26 +02:00 |
|
Laurent Destailleur
|
fe614658c8
|
Look and feel v12
|
2020-04-08 16:13:29 +02:00 |
|
Anthony Berton
|
97153fd57d
|
Update functions.lib.php
|
2020-04-08 15:13:19 +02:00 |
|
Laurent Destailleur
|
18f2087cc6
|
Fix look and feel v12
|
2020-04-08 15:13:01 +02:00 |
|
Laurent Destailleur
|
1adee36314
|
Upgrade to font awesome 5.13
|
2020-04-07 21:11:18 +02:00 |
|
Laurent Destailleur
|
9d9364256b
|
More picto using fontawesome.
|
2020-04-07 16:45:08 +02:00 |
|
Laurent Destailleur
|
ff1b3db54b
|
Fix regression on hamburger picto
|
2020-04-06 23:38:30 +02:00 |
|
Laurent Destailleur
|
0933fefa1d
|
More fontawesome logo
|
2020-04-06 18:36:33 +02:00 |
|
Laurent Destailleur
|
665dc6f8d2
|
More fontawesome logo
|
2020-04-06 18:16:21 +02:00 |
|
Laurent Destailleur
|
809c741d11
|
Can use font awesome as picto of object and modules.
|
2020-04-06 15:34:28 +02:00 |
|
Laurent Destailleur
|
d2de6a22eb
|
WIP Can set values in extra languages
|
2020-04-01 18:11:28 +02:00 |
|
Laurent Destailleur
|
4727800206
|
Can show technical ID of any object in banner.
|
2020-04-01 16:51:45 +02:00 |
|
Laurent Destailleur
|
9fcbec9f02
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-30 19:36:07 +02:00 |
|
Francis Appels
|
3eda785ca5
|
Add newline end of file
|
2020-03-30 10:36:49 +02:00 |
|
Francis Appels
|
076caa11ab
|
Add token functions to improve modulebuilder compatiblity with maintained versions.
|
2020-03-30 10:28:20 +02:00 |
|
Laurent Destailleur
|
d5b107211f
|
Look and feel v12
|
2020-03-28 15:20:26 +01:00 |
|
Laurent Destailleur
|
ec83f18944
|
Move more icon definition into CSS
|
2020-03-28 13:38:25 +01:00 |
|
Laurent Destailleur
|
c27592bad2
|
Clean deprecated params on all fetch_optionals()
|
2020-03-27 16:02:58 +01:00 |
|
Laurent Destailleur
|
3855ef6073
|
Add rounding code 'CR' (currency rate'
|
2020-03-25 17:41:39 +01:00 |
|
Laurent Destailleur
|
92db075aa1
|
Add parameter morecss to img_credit_card()
|
2020-03-24 21:40:25 +01:00 |
|
Laurent Destailleur
|
62fefab5ac
|
Standardize color of status
|
2020-03-24 19:06:37 +01:00 |
|
Laurent Destailleur
|
24dc202022
|
Doc
|
2020-03-23 15:33:52 +01:00 |
|
Laurent Destailleur
|
f904ff5240
|
Add dol_escape_json method
|
2020-03-20 17:10:35 +01:00 |
|
Laurent Destailleur
|
222556b464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
|
2020-03-19 22:09:17 +01:00 |
|
Laurent Destailleur
|
7eb4522636
|
FIX missing token and save of survey description
|
2020-03-19 11:59:57 +01:00 |
|
Laurent Destailleur
|
8e1ffa5144
|
Fix management of token
|
2020-03-19 10:52:07 +01:00 |
|
Laurent Destailleur
|
76fc722638
|
NEW Can get some variables (not available by default)
|
2020-03-17 13:33:21 +01:00 |
|
Laurent Destailleur
|
5f255a6c14
|
A new way to navigate between pages in list is available
|
2020-03-17 03:24:24 +01:00 |
|
Laurent Destailleur
|
52290b002a
|
NEW Another way to navigate between pages for some lists
|
2020-03-13 12:53:22 +01:00 |
|
Laurent Destailleur
|
967d4223c6
|
FIX #13277
|
2020-03-12 16:15:48 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
fc05e8d768
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
|
2020-03-11 18:03:15 +01:00 |
|
Laurent Destailleur
|
25eae4db9c
|
Fix missing __USER_EMAIL__ substitution
|
2020-03-11 16:28:00 +01:00 |
|
Laurent Destailleur
|
44a611e006
|
Move getElementProperties and fetchObjectByElement into functions
|
2020-03-07 15:06:14 +01:00 |
|
Laurent Destailleur
|
47ebc2bbf2
|
Hide legend
|
2020-03-06 09:52:51 +01:00 |
|
Laurent Destailleur
|
a5a2d60755
|
Fix phpcs
|
2020-03-05 00:20:39 +01:00 |
|
Laurent Destailleur
|
a6d340a22c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2020-03-04 19:28:15 +01:00 |
|
Laurent Destailleur
|
deda6252f2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
|
2020-03-04 19:22:30 +01:00 |
|
atm-arnaud
|
834873ab15
|
FIX date order was -1D and desc with label repetition
|
2020-03-04 11:58:42 +01:00 |
|
Anthony Berton
|
2fd7276a30
|
Update functions.lib.php
|
2020-03-03 09:53:00 +01:00 |
|
Laurent Destailleur
|
ea7c2aa46b
|
Update functions.lib.php
|
2020-03-02 21:47:36 +01:00 |
|
Anthony Berton
|
d9a002a8bd
|
Update functions.lib.php
|
2020-03-02 19:27:36 +01:00 |
|
Anthony Berton
|
197f81cb52
|
Update functions.lib.php
|
2020-03-02 19:23:45 +01:00 |
|
Anthony Berton
|
12b9897f5c
|
Update functions.lib.php
|
2020-03-02 18:53:52 +01:00 |
|
Laurent Destailleur
|
fab39aef9e
|
Clean menu bar
|
2020-03-02 17:35:49 +01:00 |
|
Laurent Destailleur
|
8879672122
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-29 12:52:18 +01:00 |
|
Laurent Destailleur
|
0855598c00
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
|
2020-02-29 12:51:33 +01:00 |
|
Laurent Destailleur
|
56704e4029
|
Add stats of products in MO
|
2020-02-28 19:26:52 +01:00 |
|
atm-quentin
|
009eb0d4a4
|
FIX test on 0 better than isset
|
2020-02-27 09:34:20 +01:00 |
|
atm-quentin
|
a5baf2bc88
|
FIX search with '0'
|
2020-02-26 09:19:39 +01:00 |
|
Laurent Destailleur
|
ace5f2844a
|
Make Setup of TakePOS faster with Ajax ON-Off Button.
|
2020-02-25 12:37:44 +01:00 |
|
Laurent Destailleur
|
d78221ea08
|
css
|
2020-02-24 21:48:46 +01:00 |
|
Laurent Destailleur
|
7cd49f327e
|
Look and feel v12: CSS for qty in lists
|
2020-02-24 21:47:48 +01:00 |
|
Laurent Destailleur
|
68526a14cd
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:33:28 +01:00 |
|
Laurent Destailleur
|
32d74adf20
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:18:49 +01:00 |
|
Laurent Destailleur
|
9d9429f66b
|
New: Can limit number of tabs by page.
|
2020-02-24 20:41:29 +01:00 |
|
Laurent Destailleur
|
096a568e83
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
|
2020-02-23 23:42:23 +01:00 |
|
Laurent Destailleur
|
3075e40f8c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
|
2020-02-23 23:37:46 +01:00 |
|
Laurent Destailleur
|
189c0d675b
|
Fix memory report. Xdebug no more required. Try = null instead of unset.
|
2020-02-23 22:05:59 +01:00 |
|
Alexandre SPANGARO
|
a7ca7dfbb6
|
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
|
2020-02-20 06:00:17 +01:00 |
|
Laurent Destailleur
|
76f0df138b
|
Try to fix doc
|
2020-02-20 01:26:40 +01:00 |
|
Laurent Destailleur
|
1dd5ba093d
|
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
|
2020-02-19 12:11:16 +01:00 |
|
Laurent Destailleur
|
ac16857501
|
GETPOST(..., 'alpha') remove " if found instead of returning ''
|
2020-02-19 11:33:45 +01:00 |
|
Laurent Destailleur
|
6555f5d74f
|
More default hmtl tags in restricthtmlonly
|
2020-02-17 20:55:17 +01:00 |
|
Laurent Destailleur
|
a6b0fec90b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
|
2020-02-17 12:35:34 +01:00 |
|
Laurent Destailleur
|
bf281b7dab
|
Comment
|
2020-02-17 11:51:49 +01:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
05f0242198
|
NEW The info_admin() can show text after click on other text
|
2020-02-11 10:38:09 +01:00 |
|
Laurent Destailleur
|
8645fd8946
|
FIX CVE-2019–17223 FIX #13053
|
2020-02-09 18:28:57 +01:00 |
|
Laurent Destailleur
|
5e71366ff2
|
css
|
2020-02-06 18:06:36 +01:00 |
|
Laurent Destailleur
|
05e08b3596
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
|
2020-02-06 12:58:02 +01:00 |
|
Laurent Destailleur
|
4f3cc87077
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:38 +01:00 |
|
Laurent Destailleur
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
bb1c9a66dd
|
Fix code alignement on modulebuilder
|
2020-02-04 16:37:30 +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
|
aa54aaeb01
|
FIX search filter on extrafields were not restored avec "Back to list"
|
2020-01-31 19:46:03 +01:00 |
|
Laurent Destailleur
|
9372940f17
|
Fix log through proxy
|
2020-01-31 17:51:30 +01:00 |
|
Laurent Destailleur
|
8e18a08377
|
Fix log of proxy forward only if it differs from remote_addr
|
2020-01-31 16:59:10 +01:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
f64ad71924
|
Missing country code
|
2020-01-28 02:50:11 +01:00 |
|
Laurent Destailleur
|
fc63d7366d
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:23:40 +01:00 |
|
Laurent Destailleur
|
4fe942985f
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:22:59 +01:00 |
|
Laurent Destailleur
|
50d9ac0b52
|
Fix else if
|
2020-01-27 02:13:12 +01:00 |
|
Laurent Destailleur
|
08d8670bb3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
|
2020-01-24 20:12:27 +01:00 |
|
Laurent Destailleur
|
8f3f34e1c0
|
Fix css
|
2020-01-24 20:11:07 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +01:00 |
|
Laurent Destailleur
|
7ad827f212
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2020-01-23 12:09:01 +01:00 |
|
Laurent Destailleur
|
be344518c4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
|
2020-01-23 12:07:17 +01:00 |
|
Alexandre SPANGARO
|
7f47b48559
|
Move function to functions2.lib.php
|
2020-01-23 11:47:30 +01:00 |
|
Alexandre SPANGARO
|
5eeef771fa
|
FIX: FEC export format
|
2020-01-23 06:20:31 +01:00 |
|
Laurent Destailleur
|
4922567a27
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:02:04 +01:00 |
|
Laurent Destailleur
|
4fdfba3867
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:01:22 +01:00 |
|
Laurent Destailleur
|
ab5940f28c
|
Fix css lost
|
2020-01-21 00:56:32 +01:00 |
|
Laurent Destailleur
|
acdb28ba25
|
Add country id and country code in substitution vars
|
2020-01-21 00:28:53 +01:00 |
|
Laurent Destailleur
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +01:00 |
|
Laurent Destailleur
|
24d439845b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-18 20:20:25 +01:00 |
|
Laurent Destailleur
|
d9f7c4aec4
|
FIX #12838
|
2020-01-18 19:53:48 +01:00 |
|
Laurent Destailleur
|
9c1e409feb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-17 11:35:16 +01:00 |
|
Laurent Destailleur
|
c556f60c89
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-16 18:13:35 +01:00 |
|
Anthony Berton
|
9a6ee89d43
|
Update functions.lib.php
|
2020-01-16 15:44:07 +01:00 |
|
Anthony Berton
|
9a6bcaa683
|
Update functions.lib.php
|
2020-01-16 15:20:09 +01:00 |
|
Laurent Destailleur
|
849c78f4cd
|
Doc
|
2020-01-16 10:12:39 +01:00 |
|
atm-ph
|
3cdb84b192
|
Fix note started with <s> balise
|
2020-01-16 09:50:57 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
Anthony Berton
|
ef5c1e6c8c
|
Update functions.lib.php
|
2020-01-13 23:09:08 +00:00 |
|
Anthony Berton
|
1eff733e1c
|
Update functions.lib.php
|
2020-01-13 18:23:50 +01:00 |
|
Anthony Berton
|
f3046589e7
|
Update functions.lib.php
|
2020-01-13 18:19:51 +01:00 |
|
Anthony Berton
|
226dbceac0
|
Update functions.lib.php
|
2020-01-13 17:11:50 +01:00 |
|
Laurent Destailleur
|
9d4e1a3941
|
FIX #12797
|
2020-01-13 14:25:48 +01:00 |
|
Laurent Destailleur
|
e88c11c417
|
Space
|
2020-01-13 13:20:58 +01:00 |
|
Laurent Destailleur
|
b47db086cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
|
2020-01-10 14:30:42 +01:00 |
|
Laurent Destailleur
|
9ebdd82edb
|
Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
|
2020-01-10 02:43:24 +01:00 |
|
Laurent Destailleur
|
f48c7d2ecf
|
Fix modulebuilder
|
2020-01-09 22:31:23 +01:00 |
|
Laurent Destailleur
|
0e58edd896
|
Fix modulebuilder
|
2020-01-09 22:27:24 +01:00 |
|
Laurent Destailleur
|
a947215ac1
|
Fix morecss param was lost
|
2020-01-07 14:40:59 +01:00 |
|
Laurent Destailleur
|
40ba90d170
|
css
|
2020-01-06 15:29:18 +01:00 |
|
Laurent Destailleur
|
e7ac01e1bd
|
FIX localtax info were not returned correctly when call done with id.
|
2020-01-01 22:27:47 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
Laurent Destailleur
|
330cca994e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2019-12-23 15:49:00 +01:00 |
|
Laurent Destailleur
|
3250b13f4a
|
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
|
2019-12-23 15:45:08 +01:00 |
|
Laurent Destailleur
|
2df9df2db0
|
Debug v11
|
2019-12-23 12:24:27 +01:00 |
|
Laurent Destailleur
|
fdf4d86d81
|
Debug code
|
2019-12-16 12:38:51 +01:00 |
|
Laurent Destailleur
|
28bcb49957
|
Fix css
|
2019-12-16 11:32:27 +01:00 |
|
Laurent Destailleur
|
9e94be8bac
|
CSS
|
2019-12-15 20:31:09 +01:00 |
|
Laurent Destailleur
|
7c71f6cae9
|
Fix message
|
2019-12-15 17:48:30 +01:00 |
|
Laurent Destailleur
|
d38c73c90a
|
FIX output of emails from and error on emailing pages.
|
2019-12-13 15:52:08 +01:00 |
|
Laurent Destailleur
|
63a26ed436
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-09 13:25:49 +01:00 |
|
Laurent Destailleur
|
f2c7d3de2e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:25:23 +01:00 |
|
Laurent Destailleur
|
5dbf060f00
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:24:01 +01:00 |
|
Laurent Destailleur
|
fba274997a
|
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
Fix dolGetBadge class
|
2019-12-09 13:05:07 +01:00 |
|
Laurent Destailleur
|
eb0d20b77e
|
Fix label of country
Fix div empty
|
2019-12-09 09:16:59 +01:00 |
|
Laurent Destailleur
|
394104291a
|
Fix function not found when creating a payment of an expense report
|
2019-12-08 04:22:09 +01:00 |
|
ATM John BOTELLA
|
4d3ed4ffd3
|
Fix dolGetBadge class
|
2019-12-07 17:41:13 +01:00 |
|
Laurent Destailleur
|
796f34628d
|
Debug v11
|
2019-12-06 17:40:22 +01:00 |
|
Laurent Destailleur
|
bde917d7fc
|
Fix responsive
|
2019-12-04 15:09:20 +01:00 |
|
Laurent Destailleur
|
d93cfedcbe
|
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
Add preview button for MD, CSS, XAML files
|
2019-12-03 13:20:08 +01:00 |
|
Tobias Sekan
|
f4e4e1e518
|
Add preview for MD, CSS, XAML files
|
2019-12-02 13:53:28 +01:00 |
|
Laurent Destailleur
|
f378141fbd
|
PHPCS
|
2019-12-01 12:51:01 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
Laurent Destailleur
|
a352fd5a6e
|
Revert "FIX#12482"
|
2019-11-30 21:00:56 +01:00 |
|
Nicolas
|
f2ff443641
|
FIX #12482
|
2019-11-30 20:04:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Laurent Destailleur
|
d1419f81da
|
Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
|
2019-11-26 10:26:45 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Anthony Berton
|
496aa0c065
|
Update functions.lib.php
|
2019-11-21 10:38:59 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Laurent Destailleur
|
771f304c79
|
Fix typo
|
2019-11-09 18:40:08 +01:00 |
|
Anthony Berton
|
4449c6d2a7
|
Update functions.lib.php
|
2019-11-08 16:34:20 +01:00 |
|
Laurent Destailleur
|
747113551b
|
Debug pagination of bookmark list
|
2019-11-05 09:52:33 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
f4545a2068
|
Debug method MAIN_STATUS_USES_CSS
|
2019-10-23 17:31:54 +02:00 |
|
Laurent Destailleur
|
c4be61c55c
|
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
|
2019-10-22 18:42:59 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Laurent Destailleur
|
8242281ef8
|
Close #12096
|
2019-10-22 14:39:33 +02:00 |
|
Laurent Destailleur
|
b2bbee55f1
|
Fix phpcs
|
2019-10-22 12:37:36 +02:00 |
|
Anthony Berton
|
5e7d615250
|
Update functions.lib.php
|
2019-10-21 21:06:48 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
49c101bb77
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 15:16:51 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Laurent Destailleur
|
84f6fd64a9
|
Merge pull request #12176 from Ahuahuachi/develop
Translation of some function documentation
|
2019-10-20 13:31:25 +02:00 |
|
Frédéric FRANCE
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
6d05d42c50
|
Look and feel v11
|
2019-10-16 11:26:20 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
a1c93cb2e6
|
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
|
2019-10-15 02:45:12 +02:00 |
|
Laurent Destailleur
|
c869cbe193
|
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
|
2019-10-14 23:55:10 +02:00 |
|
Frédéric FRANCE
|
c143584af4
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 21:16:54 +02:00 |
|
Laurent Destailleur
|
c338db6c36
|
Fix unlink picto
|
2019-10-12 19:16:36 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
cc73877e03
|
Merge branch 'develop' into patch-18
|
2019-10-11 16:32:48 +02:00 |
|
John Botella
|
9194eb4bec
|
Fix block title height if no button
|
2019-10-11 09:14:10 +02:00 |
|
John Botella
|
724999f1ce
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-11 08:40:43 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Frédéric FRANCE
|
be00576717
|
Update functions.lib.php
|
2019-10-10 08:22:14 +02:00 |
|
Frédéric FRANCE
|
d4757a0b5b
|
globe fontawesome
|
2019-10-09 23:20:15 +02:00 |
|
Laurent Destailleur
|
072a0a26d6
|
Use a font awesome icon to show "shippable" flag on orders.
|
2019-10-09 18:07:00 +02:00 |
|
Laurent Destailleur
|
db651a607d
|
Use fontawesome for img_warning
|
2019-10-09 17:33:46 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
f55a4d77e4
|
css
|
2019-10-08 16:41:03 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
1060ac4608
|
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
|
2019-10-07 13:08:33 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
503973cec9
|
FIX Edit of ticket module parameters erased others
|
2019-10-04 14:04:31 +02:00 |
|
ATM john
|
027c8224b0
|
Fix dolGetStatus unused
|
2019-10-03 21:34:01 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
ATM john
|
77f666a236
|
Fix dolGetStatus param
|
2019-10-03 21:28:11 +02:00 |
|
Alexandre SPANGARO
|
8668e7157a
|
Add bookmark fa-icon
|
2019-10-03 21:00:59 +02:00 |
|
Alexandre SPANGARO
|
d0840b038f
|
Remove constant MAIN_DISABLE_FONT_AWESOME_5
|
2019-10-03 20:42:02 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Frédéric FRANCE
|
37bb548d21
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 20:56:32 +02:00 |
|
Laurent Destailleur
|
b6a95b4be5
|
Look and feel v11
|
2019-10-02 19:04:24 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
f89701b4d4
|
Fix technical id align on left
|
2019-10-02 18:55:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
ATM john
|
4d5ffbb5c4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-01 20:45:04 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Laurent Destailleur
|
11e01f5c86
|
Use correct style for table header
|
2019-10-01 12:02:28 +02:00 |
|
Laurent Destailleur
|
15e646cc62
|
Fix bad name of trigger
|
2019-10-01 11:34:35 +02:00 |
|
Laurent Destailleur
|
c7da05e4a1
|
Fix bad name of trigger
|
2019-10-01 11:28:10 +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 |
|
ATM john
|
b01bd979b5
|
Unlock title button feature
|
2019-09-30 21:10:16 +02:00 |
|
Frédéric FRANCE
|
f32f528bc2
|
fix merge
|
2019-09-30 19:36:57 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
ecc2e8df67
|
Fix restore lost images
|
2019-09-30 17:58:31 +02:00 |
|
Laurent Destailleur
|
dc7ad61940
|
Add class reposition on button that switch the view mode
|
2019-09-30 17:46:53 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Laurent Destailleur
|
bbc98c19bc
|
Update functions.lib.php
|
2019-09-30 15:25:55 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
Laurent Destailleur
|
981c5c877a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-27 20:02:08 +02:00 |
|
Laurent Destailleur
|
24ad67e0e1
|
Fix missing $conf
|
2019-09-27 20:01:57 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
66cbb4020b
|
Merge branch 'develop' into patch-4
|
2019-09-27 14:46:39 +02:00 |
|
Alexandre SPANGARO
|
4b73e09c60
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-27 14:20:53 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
f96c9c3bb5
|
FIX #11931 #11963
|
2019-09-27 11:51:34 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Laurent Destailleur
|
aa5f35f14f
|
Fix image on ticket
|
2019-09-26 14:28:34 +02:00 |
|
Alexandre SPANGARO
|
f4929c5315
|
NEW Add fa_icon "tools" for load_fiche_titre
|
2019-09-25 15:24:52 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
19c78d42e9
|
Fix az09 -> aZ09
|
2019-09-24 14:20:29 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
40f75b16d8
|
FIX Substitution of __PROJECT_XXX__ not done
|
2019-09-23 13:04:22 +02:00 |
|
Laurent Destailleur
|
345ac28c89
|
Fix js injection
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
|
2019-09-18 14:21:02 +02:00 |
|
Frédéric FRANCE
|
e43f3a0f58
|
Update functions.lib.php
|
2019-09-16 18:07:06 +02:00 |
|
Frédéric FRANCE
|
5c00712c0a
|
Update functions.lib.php
|
2019-09-16 17:57:40 +02:00 |
|
Laurent Destailleur
|
544a1237bc
|
FIX regression with option to hide picto on top menu
|
2019-09-15 15:11:13 +02:00 |
|
Laurent Destailleur
|
7019e69ee2
|
FIX regression with option to hide picto on top menu
|
2019-09-15 15:09:36 +02:00 |
|
Frédéric FRANCE
|
6444c7378f
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 16:40:23 +02:00 |
|
Laurent Destailleur
|
166d56f7a3
|
Removed function dol_micro_time. Use native PHP microtime instead.
|
2019-09-13 11:15:49 +02:00 |
|
Frédéric FRANCE
|
6f33874d75
|
add entity
|
2019-09-12 21:13:00 +02:00 |
|
Frédéric FRANCE
|
cd109d04cd
|
add function
|
2019-09-12 20:44:24 +02:00 |
|
Frédéric FRANCE
|
e0f17cc71c
|
add socialnetworks dictionary
|
2019-09-11 22:47:23 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
Laurent Destailleur
|
5f236fda2e
|
More complete error message with hour/min/sec
|
2019-09-11 00:28:09 +02:00 |
|
Laurent Destailleur
|
48aedcee20
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-09-10 15:31:29 +02:00 |
|
Laurent Destailleur
|
d4e26fcc55
|
FIX missing include (dol_convert_file not found)
|
2019-09-10 15:29:33 +02:00 |
|
Laurent Destailleur
|
ca7ce63648
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/societe/class/societe.class.php
|
2019-09-02 23:04:15 +02:00 |
|
Laurent Destailleur
|
a126b1e538
|
FIX Add char $ and ; in sanitizing of filenames.
|
2019-09-02 22:25:44 +02:00 |
|
Laurent Destailleur
|
7f5728ead9
|
A better message when database is off.
|
2019-08-31 19:39:39 +02:00 |
|
Laurent Destailleur
|
a3e221468a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-31 01:15:04 +02:00 |
|
Laurent Destailleur
|
7942c5edf7
|
Fix js injection
|
2019-08-30 16:22:24 +02:00 |
|
Laurent Destailleur
|
01962cbc67
|
Clean code
|
2019-08-29 13:17:14 +02:00 |
|
Laurent Destailleur
|
76ae0cebd6
|
We don't need anymore code to manage dol_use_jmobile = 3 or 4
|
2019-08-29 01:32:10 +02:00 |
|