Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from upstream #3

Merged
merged 72 commits into from
Nov 20, 2019
Merged

Merge from upstream #3

merged 72 commits into from
Nov 20, 2019

Conversation

ghedwards
Copy link
Collaborator

No description provided.

ryaneberly and others added 30 commits October 8, 2018 18:17
@ryaneberly
Merge branch 'master' into dev
de514d4
@ryaneberly
cleanup
6c8b862
@ryaneberly
1.5.0-SNAPSHOT
f3aa286
@ryaneberly
#592
0e059af
@ryaneberly
#584
cf0cdfa
@ryaneberly
#584
1a98d46
@ryaneberly
Merge branch 'dev' of https://github.com/cflint/CFLint.git into dev
c024d95
@ryaneberly
#573 check in test that proves its the cached phrase
6693305
@eberlyrh
upgrade to gradle 5
9709876
@eberlyrh
603 upgrade jackson
7d40037
@eberlyrh
jackson
44465d6
@eberlyrh
latest cfparser
f7ccd45
@eberlyrh
595 add fix for npe
91ec617
@eberlyrh
#599 test mixed struct keys
31a7335
@eberlyrh
601 naming with hashes in them
fe5dcfd
@eberlyrh
cfparser
e0ad61c
@eberlyrh
#593 include bode of function in evaluation
c8381f9
@eberlyrh
#580 test for page encoding parsing
9ade6c2
@eberlyrh
#464 parse nested cfoutput- add tests
a5fa6b3
@eberlyrh
#592 fixed location of error on scripts
4a9fba0
@eberlyrh
#592 -- support getting the line number right when the reporting happ…
5ba3607 
…ens later when the original context is forgotten.
@eberlyrh
#538 fix and add tests
5698a12
@eberlyrh
\#592
2511579
@eberlyrh
fix test
9be6b47
@eberlyrh
\#606 scan for functions that use the same name as BIFs
24e9106
@eberlyrh
\#635 fixed issue with trailing caps
3785ea0
@eberlyrh
\#606 changed message to CFML implementations
ca2e31f
@eberlyrh
\#629 fix nested comment handling.
cb0929d
@eberlyrh
accept new test results
c75e207
@eberlyrh
\#549 Flag QueryNew() with duplicate columns
e0bac64
eberlyrh and others added 29 commits September 15, 2019 22:25
@eberlyrh
cleanup
bc03a99
add txt and json result also
1e32ae7
add Dockerfile
9494f36
fix travis build
9526cf6
fix travis build
4095212
extend travis ci
bc59f91
extend travis ci
9963fed
speedup build
9c4b39c
extend travis ci
2854283
@eberlyrh
#631 upgrade to cfparser 2.10.0 and add tests for this one
aa21582
@eberlyrh
#625 added tests
ba18052
@eberlyrh
#548 moved to suffix
8e90b12
@eberlyrh
#542 -added tests, moved existing tests.
e4b4813
@eberlyrh
#534 test added
71d5fda
@eberlyrh
#540 fix arg var mixed reporting
140a3cc
@eberlyrh
#569 fixed - test added
adc842f
@joshknutson
adding Azure Pipeline/TFS Build extension links
39860e3
@ryaneberly
Merge pull request #639 from steinbrueckri/master
c235681 
Add Dockerfile and change travis config to use it
@eberlyrh
Merge branch 'master' into dev
0c9b550
@ryaneberly
Merge pull request #656 from joshknutson/joshknutson-patch-1
93e2f6d 
adding Azure Pipeline/TFS Build extension links
@ryaneberly
Merge branch 'master' into dev
789cabd
@ryaneberly
#94
5c34f3b
@ryaneberly
#593
cde4dd6
@ryaneberly
#593
ccf3878
@ryaneberly
#650 fixed
bb30aa9
@ryaneberly
#647
9accf21
@ryaneberly
#651
f0d80c7
@ryaneberly
640640640640640640640640640640640640640640640640640640640640640640640…
5e6275c 
…640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640640
@ryaneberly
v 1.5.0
75bc070
@ghedwards ghedwards merged commit 4ed2dcd into cfmleditor:master Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ghedwards @ryaneberly @KamasamaK @eberlyrh @joshknutson