Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Laurent Destailleur
|
8de5e6898d
|
Merge pull request #12032 from frederic34/ficheinter_rec
duration of fichinter rec
|
2019-10-07 13:04:34 +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 |
|
Frédéric FRANCE
|
ee42cd000e
|
duration of fichinter rec
|
2019-10-03 19:07:26 +02:00 |
|
Frédéric FRANCE
|
723b88f618
|
retrieve duration of lines
|
2019-10-02 22:41:14 +02:00 |
|
Frédéric FRANCE
|
9607bb145c
|
wip
|
2019-10-02 17:53:52 +02:00 |
|
Frédéric FRANCE
|
a1107bdcfa
|
Update fichinterrec.class.php
|
2019-10-02 09:11:46 +02:00 |
|
Frédéric FRANCE
|
802236f583
|
db escape
|
2019-10-02 08:31:46 +02:00 |
|
Frédéric FRANCE
|
13eb76a5b7
|
db escape
|
2019-10-02 08:18:36 +02:00 |
|
Frédéric FRANCE
|
27cc92f6ca
|
replace some text
|
2019-10-02 08:10:21 +02:00 |
|
Frédéric FRANCE
|
f928bacfb9
|
db escape
|
2019-10-02 08:05:20 +02:00 |
|
Frédéric FRANCE
|
79846b8cdf
|
db escape
|
2019-10-02 08:02:03 +02:00 |
|
Frédéric FRANCE
|
16693e08b3
|
can create but some infos missing
|
2019-10-02 00:23:36 +02:00 |
|
Frédéric FRANCE
|
45bc7e2ca4
|
can create but some infos missing
|
2019-10-02 00:20:45 +02:00 |
|
Frédéric FRANCE
|
50a8c6e103
|
wip
|
2019-10-02 00:06:22 +02:00 |
|
Frédéric FRANCE
|
e7bf146f2c
|
wip
|
2019-10-01 23:55:02 +02:00 |
|
stickler-ci
|
ea84d9fc14
|
Fixing style errors.
|
2019-10-01 21:48:27 +00:00 |
|
Frédéric FRANCE
|
edf559697a
|
restore unfinished old commit
|
2019-10-01 23:47:45 +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 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
bb4618e2cf
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
|
2019-08-14 04:12:37 +02:00 |
|
Laurent Destailleur
|
53b43eb98a
|
Fix error message
|
2019-08-13 19:34:21 +02:00 |
|
Laurent Destailleur
|
b443b1b372
|
FIX permission check on API intervention
|
2019-08-13 14:21:43 +02:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
e5c3945ec3
|
FIX delete of links between objects
|
2019-07-19 18:10:45 +02:00 |
|
Laurent Destailleur
|
f745d01bf3
|
Prepare change of properties "titre" into "title"
|
2019-07-19 13:22:54 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
1bce2f085e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-25 14:32:03 +02:00 |
|
Laurent Destailleur
|
2f7e9aa363
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
|
2019-06-25 13:24:45 +02:00 |
|
Laurent Destailleur
|
c9883eecd2
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/fichinter/list.php
|
2019-06-25 13:23:19 +02:00 |
|
Laurent Destailleur
|
144f2a5159
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fichinter/list.php
|
2019-06-25 13:15:57 +02:00 |
|
Ferran Marcet
|
7f127989b2
|
FIX: Not showing Contract and Project columns on ficheinter list
|
2019-06-25 09:55:34 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Laurent Destailleur
|
d8259d9db1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/card.php
|
2019-06-07 22:59:59 +02:00 |
|
Laurent Destailleur
|
f6d8b46b40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:58:58 +02:00 |
|
Laurent Destailleur
|
0a903da5dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:53:30 +02:00 |
|
atm-josselin
|
c8ab7dee45
|
Display the intervention button only in develop mode
|
2019-06-06 16:34:44 +02:00 |
|
Laurent Destailleur
|
7d2cedfdcf
|
Debug bom module
|
2019-06-03 19:29:49 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +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 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
Laurent Destailleur
|
d7f980fda0
|
NEW Add picto of deletion on mass action combo lists
|
2019-04-09 01:22:59 +02:00 |
|
Laurent Destailleur
|
fff9b7db9d
|
Fix doxygen
|
2019-04-04 18:33:12 +02:00 |
|
Laurent Destailleur
|
379f9f2d53
|
Fix phpcs
|
2019-04-02 20:36:00 +02:00 |
|
Laurent Destailleur
|
42fda54edf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
|
2019-04-02 19:41:58 +02:00 |
|
Laurent Destailleur
|
24fef25fd8
|
Update list.php
|
2019-03-31 19:07:25 +02:00 |
|
Laurent Destailleur
|
b3f81d2c1a
|
Update list.php
|
2019-03-31 19:06:44 +02:00 |
|
Laurent Destailleur
|
48ce60dd17
|
Update list.php
|
2019-03-31 19:04:28 +02:00 |
|
Lionel VESSILLER
|
59c41105a2
|
Fix project and contract fields in fichinter list
|
2019-03-29 17:03:23 +01: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 |
|
Laurent Destailleur
|
ee4150665e
|
Fix phpcs
|
2019-03-21 20:15:19 +01:00 |
|
Laurent Destailleur
|
5693fbfe97
|
Merge pull request #10898 from grandoc/new_branch_21_03_2019
add some comments
|
2019-03-21 18:29:11 +01:00 |
|
Laurent Destailleur
|
90df30e412
|
NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
|
2019-03-21 17:37:56 +01:00 |
|
Philippe GRAND
|
c906820a51
|
add some comments
|
2019-03-21 15:08:09 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
eeafc3c630
|
Standardize translation of amount
|
2019-03-13 14:10:36 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Joan Louis
|
17647de4cc
|
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-12 11:24:54 +01:00 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
Laurent Destailleur
|
3716834b0a
|
Fix bad var name
|
2019-03-09 01:13:15 +01:00 |
|
Frédéric FRANCE
|
f9e671d8a9
|
replace html by html5 in fichinter
|
2019-03-07 21:29:15 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Laurent Destailleur
|
b3fb0eaf5b
|
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 15:48:31 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
346d1f410c
|
wip
|
2019-02-25 23:15:48 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +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
|
bd8d81a96e
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 07:49:41 +01:00 |
|
Laurent Destailleur
|
2e5382f40d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:39:27 +01:00 |
|
Laurent Destailleur
|
c313ad6195
|
Fix phpcs
|
2019-02-01 18:19:39 +01:00 |
|
Laurent Destailleur
|
9d03f4b228
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:02 +01:00 |
|
Laurent Destailleur
|
a2ab6348ed
|
Fix bad menu leading on a development page
|
2019-02-01 17:06:34 +01:00 |
|
Laurent Destailleur
|
b83ff06db8
|
FIX #10416 No need of another option
|
2019-02-01 17:00:04 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
844643c37d
|
Merge pull request #10375 from grandoc/new_branch_19_01_2019
update with html5 compliant code
|
2019-01-20 19:48:32 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
3d695362ec
|
update with html5 compliant code
|
2019-01-19 12:44:26 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Philippe GRAND
|
31a83701ba
|
Fix translation
|
2019-01-16 13:44:49 +01:00 |
|
Philippe GRAND
|
2aa04e7f9c
|
Clean code and fix translation file
|
2019-01-16 13:28:13 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
83efdee7d3
|
Merge branch 'develop' into new_mass_generate
|
2018-12-14 15:44:46 +01:00 |
|
Abbes Bahfir
|
1a8882198e
|
fix: Accss to global $conf needed
|
2018-11-27 18:22:12 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
9d15f83f4c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-08 20:19:45 +01:00 |
|
Laurent Destailleur
|
3e844db74f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/stats/index.php
|
2018-11-08 20:19:28 +01:00 |
|
Laurent Destailleur
|
8a89da25c6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/margin/tabs/thirdpartyMargins.php
|
2018-11-08 20:18:13 +01:00 |
|
Laurent Destailleur
|
9012f6ecc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:40 +01:00 |
|
Frédéric FRANCE
|
8bb1545ed0
|
Update index.php
|
2018-11-08 12:16:05 +01:00 |
|
Frédéric FRANCE
|
670eed1e68
|
Update index.php
|
2018-11-08 12:13:07 +01:00 |
|
Philippe GRAND
|
f6394e4210
|
fix : error 500
|
2018-11-07 15:07:57 +01:00 |
|
Philippe GRAND
|
671b4dc227
|
fix : missing translation
|
2018-11-07 14:01:49 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Frédéric FRANCE
|
d6b909a280
|
Update index.php
|
2018-11-03 18:26:11 +01:00 |
|
Frédéric FRANCE
|
8ab53012b7
|
mode is only customer in stats fichinter
|
2018-11-03 18:20:36 +01:00 |
|
Laurent Destailleur
|
3d16b05fdb
|
Fix fetch
|
2018-10-30 21:30:44 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|
Frédéric FRANCE
|
5ad03fcd35
|
use strict compare
|
2018-10-27 21:19:19 +02:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
852b069785
|
Fix reponsive in stats pages
|
2018-10-26 15:46:17 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Maxime Kohlhaas
|
d4d921b1cc
|
Add massaction generate on main lists
|
2018-10-14 16:27:59 +02:00 |
|
Philippe GRAND
|
d98ebbd9ee
|
Standardize and update code
|
2018-10-13 10:39:27 +02:00 |
|
Philippe GRAND
|
9b6367c1ee
|
Standardize and update code
|
2018-10-10 12:16:20 +02:00 |
|
Laurent Destailleur
|
b93ab79679
|
FIX Error messages
|
2018-09-25 00:39:28 +02:00 |
|
Philippe GRAND
|
8efe98b993
|
Standardize and update code
|
2018-09-16 11:31:54 +02:00 |
|
Philippe GRAND
|
90644222d8
|
Standardize and update code
|
2018-09-16 11:30:06 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Frédéric FRANCE
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
4a7ea33008
|
replace select_date
|
2018-09-09 08:02:26 +02:00 |
|
Frédéric FRANCE
|
80880d8fb9
|
replace select_date by selectDate
|
2018-09-08 13:00:39 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Philippe GRAND
|
11d75573be
|
Standardize and update code
|
2018-09-05 12:21:13 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
489074af5c
|
move phpcs:ignore
|
2018-09-02 23:25:10 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
45cbc36a15
|
Standardize and update code
|
2018-09-01 15:27:55 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
9a14611d55
|
Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
|
2018-08-28 02:35:59 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Philippe GRAND
|
87067b2bc9
|
Standardize and update code
|
2018-08-23 18:35:45 +02:00 |
|
Philippe Grand
|
f98d2078e2
|
Merge branch 'develop' into new_branch_20_06_2018
|
2018-08-23 10:41:34 +02:00 |
|
Philippe GRAND
|
06da7f54a2
|
Update and standardize code
|
2018-08-22 18:48:53 +02:00 |
|
Philippe GRAND
|
a36061079b
|
Update and standardize code
|
2018-08-22 11:11:59 +02:00 |
|
Philippe GRAND
|
a669830427
|
Update and standardize code
|
2018-08-22 10:37:16 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|
Laurent Destailleur
|
0f1e5a78c6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-21 13:17:11 +02:00 |
|
Frédéric FRANCE
|
fb3754af59
|
Update fichinter.class.php
|
2018-08-21 12:54:25 +02:00 |
|
Frédéric FRANCE
|
69a7af88e7
|
function declaration
|
2018-08-15 18:14:02 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
82e8efe792
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 20:14:14 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Frédéric FRANCE
|
6f74ecceaf
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 18:21:59 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +02:00 |
|
Philippe GRAND
|
948647f3f9
|
comment translation
|
2018-08-04 14:17:51 +02:00 |
|
Frédéric FRANCE
|
8312d95174
|
trim trailing
|
2018-07-26 18:22:16 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Frédéric FRANCE
|
53469ee424
|
Update card-rec.php
|
2018-07-25 11:45:52 +02:00 |
|
Frédéric FRANCE
|
c7ad6c9a7c
|
Update card-rec.php
|
2018-07-25 10:04:44 +02:00 |
|
Regis Houssin
|
598f90486f
|
Fix: syntax error (Travis)
|
2018-06-30 17:05:34 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Laurent Destailleur
|
3112244529
|
Merge pull request #8884 from defrance/patch-117
New : fichinter models (like factureRec)
|
2018-06-30 01:19:03 +02:00 |
|
Philippe GRAND
|
1bb91c7860
|
update and clean code
|
2018-06-24 16:20:27 +02:00 |
|
Laurent Destailleur
|
27a27e02a1
|
Fix css
|
2018-06-22 22:53:53 +02:00 |
|
Philippe GRAND
|
4f554ab52a
|
clean and update code
|
2018-06-20 12:09:47 +02:00 |
|
Laurent Destailleur
|
ad2df304b4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
|
2018-06-18 13:31:29 +02:00 |
|