Laurent Destailleur
|
fad2fa48dd
|
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
|
2019-04-07 15:44:17 +02:00 |
|
Ion
|
71f30266dc
|
Add service to getElementProperties
|
2019-04-07 12:53:52 +02:00 |
|
Laurent Destailleur
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
Laurent Destailleur
|
b6c19e0f35
|
Fix var not defined
|
2019-04-05 19:48:32 +02:00 |
|
Laurent Destailleur
|
becefeebff
|
Fix upload of files without extension
|
2019-04-05 19:39:49 +02:00 |
|
Laurent Destailleur
|
734b97e255
|
Fix upload of files without extension
|
2019-04-05 19:39:04 +02:00 |
|
Laurent Destailleur
|
00cdf13a15
|
Revert "Do not close php tags"
This reverts commit 1db134c2a0.
|
2019-04-05 11:09:39 +02:00 |
|
Alexandre SPANGARO
|
b64ee3af70
|
FIX: Problem with badge in tab in expedition card
|
2019-04-04 17:02:18 +02:00 |
|
Laurent Destailleur
|
1f00e24abc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-04-03 18:52:47 +02:00 |
|
Laurent Destailleur
|
9e5d87e821
|
Fix warning
|
2019-04-03 18:39:27 +02:00 |
|
Laurent Destailleur
|
82c19a6372
|
FIX Avoid error 500 when extension php-intl not loaded
|
2019-04-03 18:38:27 +02:00 |
|
Laurent Destailleur
|
1db134c2a0
|
Do not close php tags
|
2019-04-03 18:13:39 +02:00 |
|
Laurent Destailleur
|
c5f5abc67d
|
Fix css for MD theme
|
2019-04-03 14:37:38 +02:00 |
|
Laurent Destailleur
|
80be77d95d
|
Merge pull request #10948 from ptibogxiv/patch-148
fix term autoOrManual
|
2019-04-03 11:03:44 +02:00 |
|
Laurent Destailleur
|
bb9cd05ea8
|
Fix phpcs
|
2019-04-02 20:02:43 +02:00 |
|
Laurent Destailleur
|
8a6e28860b
|
A better transition with deprecation
|
2019-04-01 22:09:24 +02:00 |
|
Laurent Destailleur
|
7db443e8ab
|
Better compatibility
|
2019-04-01 21:14:15 +02:00 |
|
ptibogxiv
|
5d25c33ff5
|
fix term
|
2019-04-01 20:49:41 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Laurent Destailleur
|
fc983fa65c
|
Move a function into functions2.lib.php
|
2019-04-01 18:46:13 +02:00 |
|
Laurent Destailleur
|
0c051e0cf0
|
Merge pull request #10923 from ptibogxiv/patch-145
NEW automatic / manual selector form
|
2019-04-01 18:44:05 +02:00 |
|
Laurent Destailleur
|
5d9a7e0d80
|
Fix phpcs
|
2019-04-01 18:21:59 +02:00 |
|
Laurent Destailleur
|
0091b65a83
|
Fix phpcs
|
2019-04-01 18:10:14 +02:00 |
|
Laurent Destailleur
|
c07159fee9
|
Fix regression in timesheet. Keep extrafield of task for the moment.
|
2019-03-31 22:06:41 +02:00 |
|
Laurent Destailleur
|
d572a9258c
|
Merge branch 'develop' into new_evol_time_spent_views
|
2019-03-31 19:12:27 +02:00 |
|
Laurent Destailleur
|
039e6034d1
|
Merge pull request #10936 from aspangaro/10.0_WARNING
LOG_WARNING on function dol_print_date with deprecated value
|
2019-03-31 18:45:01 +02:00 |
|
Frédéric FRANCE
|
ddd1c04eae
|
phpcs fix
|
2019-03-31 09:27:11 +02:00 |
|
Laurent Destailleur
|
fca404e8d5
|
Show price without tax to prepare tax per customer country.
|
2019-03-30 19:30:58 +01:00 |
|
Laurent Destailleur
|
be21755378
|
Add page id to help debug in header
|
2019-03-29 23:04:09 +01:00 |
|
Laurent Destailleur
|
697a2e5576
|
Show time to bill and billed in list of tasks
|
2019-03-29 14:34:55 +01:00 |
|
Alexandre SPANGARO
|
8163739a68
|
LOG_WARNING on function dol_print_date with deprecated value
|
2019-03-28 12:03:04 +01:00 |
|
ptibogxiv
|
2c71b98d0d
|
NEW automatic / manual selector form
|
2019-03-27 11:05:43 +01:00 |
|
Laurent Destailleur
|
513ef1e727
|
Fix label short
|
2019-03-25 16:16:08 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
a950d8389e
|
WIP Attach document to expense report lines
|
2019-03-24 20:22:05 +01:00 |
|
Laurent Destailleur
|
b2eee520df
|
Fix phpcs
|
2019-03-24 16:11:12 +01:00 |
|
Laurent Destailleur
|
152c27139f
|
Doc
|
2019-03-24 14:54:04 +01:00 |
|
Laurent Destailleur
|
614b4afeb0
|
NEW The preview of PDF files generates 1 png file even if several pages.
|
2019-03-24 14:53:26 +01:00 |
|
Laurent Destailleur
|
949ef79227
|
Better error message
|
2019-03-24 14:26:16 +01:00 |
|
Laurent Destailleur
|
fad6efd86c
|
WIP file attachment on expense report lines
|
2019-03-24 13:27:26 +01:00 |
|
Laurent Destailleur
|
df9e121ac6
|
Enhance the module debugbar. Do not scan the log anymore.
|
2019-03-23 14:37:54 +01:00 |
|
Laurent Destailleur
|
cd6a0bacdd
|
Look and feel v10
|
2019-03-22 14:32:15 +01:00 |
|
Laurent Destailleur
|
28fede950f
|
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
|
2019-03-22 13:00:48 +01:00 |
|
atm-ph
|
b202169e9a
|
New evol "Input per day" display
|
2019-03-21 15:20:59 +01:00 |
|
atm-ph
|
fa41eeec7f
|
New evol "Input per week" display
|
2019-03-21 14:21:29 +01:00 |
|
Laurent Destailleur
|
70c2ffc816
|
FIX toggle of login_block was ko with eldy theme
|
2019-03-19 14:22:57 +01:00 |
|
Laurent Destailleur
|
1a8902f23e
|
Fix migration for compatibility
|
2019-03-19 12:03:02 +01:00 |
|
Laurent Destailleur
|
2a8056b075
|
Merge pull request #10881 from frederic34/patch-5
phpcs fix
|
2019-03-19 11:15:16 +01:00 |
|
Frédéric FRANCE
|
03cd321aeb
|
phpcs fix
|
2019-03-18 20:18:38 +01:00 |
|
Frédéric FRANCE
|
135df4b3ce
|
Usage of ELSE IF is discouraged; use ELSEIF instead
|
2019-03-18 11:24:56 +01:00 |
|
Laurent Destailleur
|
b3dc6d7d1d
|
NEW Generation of doc by modulebuilder can include README and CHANGELOG
|
2019-03-17 19:33:25 +01:00 |
|
Laurent Destailleur
|
5f9fa817fb
|
Fix bad log
|
2019-03-16 23:41:06 +01:00 |
|
Laurent Destailleur
|
e5567c7ee4
|
Fix typo
|
2019-03-16 14:48:41 +01:00 |
|
Laurent Destailleur
|
40c2ca4310
|
Fix label of status of third party record when using smartphone
|
2019-03-15 23:08:00 +01:00 |
|
Laurent Destailleur
|
7a5a561170
|
Fix label of status of invoice record when using smartphone
|
2019-03-15 23:00:50 +01:00 |
|
Laurent Destailleur
|
91f80934f3
|
Fix: On smartphone, hide label of status only on lists.
|
2019-03-15 20:39:55 +01:00 |
|
Laurent Destailleur
|
b6cacf3a20
|
Fix label of status for members on smartphone
|
2019-03-15 20:18:35 +01:00 |
|
Laurent Destailleur
|
d512e54407
|
Restore toggle of login_block because it was no more visible
|
2019-03-15 20:10:39 +01:00 |
|
Laurent Destailleur
|
3b4bcc67c9
|
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
|
2019-03-15 19:41:39 +01:00 |
|
Laurent Destailleur
|
6f0fbc42c1
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
|
2019-03-15 15:16:29 +01:00 |
|
Laurent Destailleur
|
e5c08978c3
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
|
2019-03-15 15:13:28 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
d31b632d96
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
|
2019-03-15 11:06:49 +01:00 |
|
Laurent Destailleur
|
074ba0729a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-15 11:00:52 +01:00 |
|
Laurent Destailleur
|
84bff41543
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-15 11:00:24 +01:00 |
|
Laurent Destailleur
|
6c2cad3d48
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/security.lib.php
|
2019-03-15 11:00:00 +01:00 |
|
Laurent Destailleur
|
e326c4d579
|
Look and feel v10
|
2019-03-15 10:48:10 +01:00 |
|
gauthier
|
8375b47e74
|
FIX : in fact expensereport must be in $check array
|
2019-03-15 10:21:50 +01:00 |
|
Laurent Destailleur
|
86c5dc20e3
|
NEW Can choose the root category to show for TakePOS module
|
2019-03-15 02:12:40 +01:00 |
|
Laurent Destailleur
|
0afbd70c2c
|
Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
|
2019-03-14 18:04:06 +01:00 |
|
gauthier
|
3fb6978bc8
|
FIX : no need to test anything to display documents tabs on expense report
|
2019-03-14 17:36:49 +01:00 |
|
Laurent Destailleur
|
8a752ae657
|
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
Fix sort by field in all events (action and emailing type)
|
2019-03-14 17:00:12 +01:00 |
|
Laurent Destailleur
|
be0535d11f
|
Merge pull request #10805 from frederic34/patch-2
update doc
|
2019-03-14 16:55:29 +01:00 |
|
Philippe GRAND
|
27b7ec8202
|
update with html5 compliant code
|
2019-03-14 14:24:17 +01:00 |
|
Philippe GRAND
|
d506cf7700
|
update with html5 compliant code
|
2019-03-14 14:21:54 +01:00 |
|
Philippe GRAND
|
68c6c0513d
|
update with html5 compliant code
|
2019-03-14 14:20:32 +01:00 |
|
Philippe GRAND
|
38822a9bb1
|
update with html5 compliant code
|
2019-03-14 14:18:44 +01:00 |
|
Philippe GRAND
|
6984cd25d8
|
update with html5 compliant code
|
2019-03-14 14:11:43 +01:00 |
|
Philippe GRAND
|
0832e9873c
|
update with html5 compliant code
|
2019-03-14 14:10:41 +01:00 |
|
Philippe GRAND
|
63b1a1459b
|
update with html5 compliant code
|
2019-03-14 14:09:54 +01:00 |
|
Laurent Destailleur
|
f8a4d9075b
|
Fix css for fontawesome 5
|
2019-03-14 11:48:25 +01:00 |
|
Laurent Destailleur
|
fcbd39fda9
|
Fix typo
|
2019-03-13 19:07:19 +01:00 |
|
Laurent Destailleur
|
e7cd8d690c
|
Remove warnings
|
2019-03-13 19:06:45 +01:00 |
|
Laurent Destailleur
|
1bd9d6a8e5
|
Fix font awesome 5 picto for notes
|
2019-03-13 15:02:43 +01:00 |
|
Laurent Destailleur
|
7d82073eab
|
Use fontawesome for icon "setup".
|
2019-03-12 11:57:55 +01:00 |
|
Laurent Destailleur
|
d762766a56
|
Font awesome 5 by default
|
2019-03-12 10:11:34 +01:00 |
|
John BOTELLA
|
be2885c75b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
|
2019-03-12 09:24:42 +01:00 |
|
Frédéric FRANCE
|
40a1562077
|
update doc
|
2019-03-12 09:09:26 +01:00 |
|
Laurent Destailleur
|
abdc2aa21a
|
Fix phpcs
|
2019-03-11 21:03:23 +01:00 |
|
Laurent Destailleur
|
e5f0c8e0e7
|
Look and feel
|
2019-03-11 20:54:25 +01:00 |
|
John BOTELLA
|
57c6c60118
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-11 14:44:35 +01:00 |
|
John BOTELLA
|
5d7118340b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-11 14:40:19 +01:00 |
|
Laurent Destailleur
|
fac329e637
|
Clean code
|
2019-03-11 01:01:15 +01:00 |
|
Laurent Destailleur
|
935fe7c22a
|
Debug and enhance modulebuilder.
|
2019-03-10 19:33:28 +01:00 |
|
John BOTELLA
|
ccebb8d1a7
|
Fix travis errors
|
2019-03-08 14:40:22 +01:00 |
|
John BOTELLA
|
37cd62b564
|
Add user friendly behavior
|
2019-03-08 14:26:06 +01:00 |
|
John BOTELLA
|
218690db00
|
add css behavior
|
2019-03-07 17:05:27 +01:00 |
|
John BOTELLA
|
a0b14b9105
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 15:53:41 +01:00 |
|
John BOTELLA
|
74c8754092
|
fix travis
|
2019-03-07 15:49:16 +01:00 |
|
John BOTELLA
|
5ea5d51247
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 09:41:03 +01:00 |
|
John BOTELLA
|
89157234b7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-07 09:33:11 +01:00 |
|
Laurent Destailleur
|
0c2a0c643b
|
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
|
2019-03-06 14:33:05 +01:00 |
|
Lionel VESSILLER
|
bf5b482f3d
|
Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request
|
2019-03-06 09:05:07 +01:00 |
|
John BOTELLA
|
e382f13637
|
remove test
|
2019-03-05 17:16:38 +01:00 |
|
John BOTELLA
|
ef9ad4d109
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-05 17:14:59 +01:00 |
|
John BOTELLA
|
600f0c9fa6
|
Fix condition
|
2019-03-05 17:14:29 +01:00 |
|
John BOTELLA
|
72d96d2ac3
|
prepare badges
|
2019-03-05 17:13:20 +01:00 |
|
John BOTELLA
|
6b98eecd32
|
fix compatibility status
|
2019-03-05 16:58:05 +01:00 |
|
John BOTELLA
|
7a4540088a
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-05 15:37:17 +01:00 |
|
John BOTELLA
|
95981ca14c
|
PR feedback
|
2019-03-05 15:26:19 +01:00 |
|
Lionel VESSILLER
|
9b797eb980
|
Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event
|
2019-03-05 14:55:04 +01:00 |
|
Laurent Destailleur
|
4a582485b9
|
Debug module ticket
|
2019-03-04 19:19:09 +01:00 |
|
John BOTELLA
|
7cadaca8fc
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-04 11:37:16 +01:00 |
|
John BOTELLA
|
74caaca827
|
fix travis errors
|
2019-03-04 11:15:01 +01:00 |
|
John BOTELLA
|
c420cab500
|
fix travis errors
|
2019-03-04 11:11:15 +01:00 |
|
Laurent Destailleur
|
1931f43ce7
|
Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
|
2019-03-03 00:05:07 +01:00 |
|
Laurent Destailleur
|
8fce6e5e31
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
|
2019-03-02 19:13:37 +01:00 |
|
Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Laurent Destailleur
|
4f9981063f
|
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
|
2019-03-02 18:26:50 +01:00 |
|
Laurent Destailleur
|
e215bfdb66
|
Merge pull request #10721 from frederic34/bad-exclude-pattern
fix exclude from phpcs
|
2019-03-02 18:23:02 +01:00 |
|
Laurent Destailleur
|
03237d1730
|
NEW Look and feel v10 - Add CSS tabBarNoTop
|
2019-03-02 18:20:13 +01:00 |
|
Laurent Destailleur
|
5f6ca1119a
|
Replace arrow picto with fontawesome
|
2019-03-02 14:07:13 +01:00 |
|
Frédéric FRANCE
|
65551864d5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-03-02 12:24:15 +01:00 |
|
Laurent Destailleur
|
359f2c6e81
|
NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
Removed migration files
|
2019-03-02 12:16:37 +01:00 |
|
Frédéric FRANCE
|
40d34940f1
|
fix exclude from phpcs
|
2019-03-02 10:00:51 +01:00 |
|
John BOTELLA
|
421c009e58
|
Standardise new function name
|
2019-03-01 15:33:23 +01:00 |
|
John BOTELLA
|
162c3249cf
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-01 13:49:42 +01:00 |
|
John BOTELLA
|
b222c44bb9
|
Add helper functions and little review size of badges
|
2019-03-01 12:01:25 +01:00 |
|
Frédéric FRANCE
|
4f9e35f350
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-28 20:48:23 +01:00 |
|
Laurent Destailleur
|
429da47d68
|
Fix default language of reminders
|
2019-02-28 13:11:14 +01:00 |
|
Laurent Destailleur
|
c444521abc
|
IFTTT
|
2019-02-28 11:00:40 +01:00 |
|
Frédéric FRANCE
|
ba4ca5d7c2
|
add visibility
|
2019-02-28 00:15:32 +01:00 |
|
Laurent Destailleur
|
29cfa03fa4
|
Fix font awesome 5 regressions
|
2019-02-27 13:54:39 +01:00 |
|
John BOTELLA
|
9f0a93f68f
|
Add color lib for color automation
|
2019-02-26 17:44:16 +01:00 |
|
Alexandre SPANGARO
|
2da1447a0b
|
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
|
2019-02-25 09:12:04 +01:00 |
|
Alexandre SPANGARO
|
acb9cfe07a
|
NEW: Add LinkedIn field
|
2019-02-25 09:07:58 +01:00 |
|
Laurent Destailleur
|
6b46a927f1
|
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
|
2019-02-24 20:53:54 +01:00 |
|
ptibogxiv
|
47f5ff3303
|
Fix declare functions2.lib.php for donations API
|
2019-02-24 20:51:00 +01:00 |
|
Laurent Destailleur
|
c002fd68ae
|
Merge pull request #10679 from ptibogxiv/patch-129
Fix declare functions2.lib.php for donations API
|
2019-02-24 20:49:59 +01:00 |
|
Laurent Destailleur
|
e349fe780e
|
Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
Fix url for emailing type event (link to emailing card)
|
2019-02-24 20:48:57 +01:00 |
|
Laurent Destailleur
|
3fa2680859
|
Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
|
2019-02-24 20:36:24 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
ptibogxiv
|
efd27ec1d8
|
Fix declare functions2.lib.php for donations API
|
2019-02-24 16:11:52 +01:00 |
|
Frédéric FRANCE
|
167a857f4c
|
replace html code by html5 in contact
|
2019-02-24 14:47:47 +01:00 |
|
Frédéric FRANCE
|
cdf5348b47
|
Update ajax.lib.php
|
2019-02-23 18:15:56 +01:00 |
|
Laurent Destailleur
|
0a83bc474c
|
Merge pull request #10635 from grandoc/new_branch_19_02_2019
update with html5 compliant code
|
2019-02-23 14:09:17 +01:00 |
|
Lionel VESSILLER
|
cdc2c5ae77
|
Company Lib : Fix contact events with no thirdparty
|
2019-02-21 09:49:46 +01:00 |
|
Lionel VESSILLER
|
d10c5cab34
|
Company Lib : Fix url for emailing type event (link to emailing card)
|
2019-02-20 15:14:50 +01:00 |
|
Laurent Destailleur
|
a3a89b755f
|
NEW Gain space by moving the meteo on title line
|
2019-02-20 06:01:13 +01:00 |
|
Laurent Destailleur
|
abfd610bbc
|
Fix quote not closed
|
2019-02-20 03:44:08 +01:00 |
|
Philippe GRAND
|
d83b77432d
|
update with html5 compliant code
|
2019-02-19 17:42:12 +01:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
Laurent Destailleur
|
e644de4a70
|
Fix for font awesome 5
|
2019-02-15 15:30:21 +01:00 |
|
Laurent Destailleur
|
c480f4be68
|
FIX Bad remote ip address when user is using a proxy
|
2019-02-15 15:17:24 +01:00 |
|
Laurent Destailleur
|
a7af1b1765
|
Remove deprecated code
|
2019-02-14 16:29:13 +01:00 |
|
Laurent Destailleur
|
42f754cbc0
|
Merge pull request #10596 from frederic34/patch-33
Update functionsnumtoword.lib.php
|
2019-02-14 13:33:03 +01:00 |
|
Laurent Destailleur
|
6b00bb1a6f
|
Merge pull request #10583 from frederic34/patch-18
Update company.lib.php
|
2019-02-14 13:26:21 +01:00 |
|
Frédéric FRANCE
|
0594061ef4
|
Update functionsnumtoword.lib.php
|
2019-02-14 00:03:10 +01:00 |
|
Frédéric FRANCE
|
154ba78ee7
|
Update company.lib.php
|
2019-02-13 22:43:12 +01:00 |
|
Frédéric FRANCE
|
b9d37c276d
|
update doc in barcode.lib.php
|
2019-02-13 22:23:14 +01:00 |
|
Laurent Destailleur
|
2311912d8a
|
Merge branch 'develop' into dev_importproduct_measuringunit
|
2019-02-13 16:35:46 +01:00 |
|
Laurent Destailleur
|
69313cbf0d
|
Merge pull request #10567 from frederic34/patch-18
Update images.lib.php
|
2019-02-13 16:25:32 +01:00 |
|
florian HENRY
|
de87321c15
|
fix travcis
|
2019-02-13 10:28:08 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Frédéric FRANCE
|
e4b73e8273
|
Update images.lib.php
|
2019-02-12 23:39:59 +01:00 |
|
Frédéric FRANCE
|
2aae952760
|
fix doc in tax.lib.php
|
2019-02-12 23:25:26 +01:00 |
|
Laurent Destailleur
|
5fceee3048
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-02-12 19:02:19 +01:00 |
|
Laurent Destailleur
|
affbd20cdb
|
FIX Bad link in menu manager
|
2019-02-12 18:56:32 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Alexandre SPANGARO
|
b99149b940
|
Move error on function dol_include_once() to LOG_WARNING
|
2019-02-12 16:34:52 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
ATM-Nicolas
|
4e35ebe52a
|
FIX : Default sign out icon if not using Font Awesome 5
|
2019-02-12 10:43:00 +01:00 |
|
Laurent Destailleur
|
27cad29e1e
|
Fix regression of right alignement
|
2019-02-11 15:06:52 +01:00 |
|
Laurent Destailleur
|
0bd30b160a
|
Fix picto logout with fontawesome 5
|
2019-02-11 11:55:48 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
522afd8e7b
|
Fix font awesome 5
|
2019-02-09 13:11:02 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
471f11dace
|
Merge pull request #10502 from hregis/9.0_merge
FIX wrong merged conflict
|
2019-02-08 09:34:49 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
3bdf017d41
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:59 +01:00 |
|
Laurent Destailleur
|
8d82135033
|
Fix missing \n
|
2019-02-07 19:39:23 +01:00 |
|
Laurent Destailleur
|
491bfbdbfc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:04 +01:00 |
|
Laurent Destailleur
|
89af7b0e98
|
Add doctype to web site
|
2019-02-07 19:38:36 +01:00 |
|
Laurent Destailleur
|
789c089e14
|
Code comment
|
2019-02-05 13:08:28 +01:00 |
|
Regis Houssin
|
8860eab6b1
|
FIX wrong merged conflict
|
2019-02-05 07:40:50 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
49d695c9b2
|
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
|
2019-02-03 19:06:38 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|