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.

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

Master #333

Merged
merged 47 commits into from
Feb 14, 2024
Merged
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
559b4d4
Merge pull request #99 from Ortus-Solutions/development
bdw429s Oct 10, 2016
dafb247
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Nov 17, 2016
c6472ec
Merge branch 'master' of https://github.com/Ortus-Solutions/commandbox
bdw429s Nov 17, 2016
500dbfb
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jan 9, 2017
f1b7513
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Mar 10, 2017
1987cfb
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jul 15, 2017
e477e09
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jul 15, 2017
8b4f197
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Aug 14, 2017
5ca282c
Add server list option to filter by webroot (#139)
pfreitag Oct 6, 2017
8dd2af8
Merge branch 'development'
bdw429s Nov 14, 2017
3b2edd1
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Nov 28, 2017
9d10cf5
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Dec 4, 2017
0a6776a
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s May 24, 2018
cb204aa
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jun 26, 2018
5918e2d
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Aug 12, 2018
f652fff
Merge branch 'development'
bdw429s Oct 3, 2018
94da71e
Merge branch 'development'
bdw429s Nov 5, 2018
61b388d
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Dec 24, 2018
c9dd2f1
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Mar 1, 2019
4c7e623
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jun 17, 2019
72eab49
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Sep 17, 2019
e9c3b53
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Mar 5, 2020
9dcb833
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Mar 16, 2020
ca270f7
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s May 21, 2020
5226e20
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Jun 1, 2020
d43467e
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Nov 13, 2020
dfdf044
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Dec 17, 2020
4c2aed5
Merge remote-tracking branch 'refs/remotes/origin/development'
bdw429s Apr 28, 2021
ef4ac6d
Merge branch 'development'
bdw429s May 17, 2021
03713d9
Merge branch 'development'
bdw429s Aug 18, 2021
96804fb
Merge branch 'development'
bdw429s Aug 18, 2021
95e8fd9
Merge branch 'development'
bdw429s Sep 16, 2021
12ea688
Merge branch 'development'
bdw429s Oct 4, 2021
3302bdd
Merge branch 'development'
bdw429s Apr 29, 2022
ba7c150
Merge branch 'development'
bdw429s May 3, 2022
589e058
Merge branch 'development'
bdw429s May 20, 2022
5415d37
Merge branch 'development'
bdw429s Sep 3, 2022
b1b89a4
Merge branch 'development'
bdw429s Dec 7, 2022
253b276
Merge branch 'development'
bdw429s Mar 4, 2023
b8227f7
Merge branch 'development'
bdw429s Apr 27, 2023
91295e0
Update Lucee
bdw429s Jul 25, 2023
b1212c2
Finalize Lucee update
bdw429s Aug 9, 2023
36aff2f
Bump for final Lucee security release
bdw429s Aug 14, 2023
b564542
More sensible defaults for XML parsing
bdw429s Aug 15, 2023
73d63ec
Final bump for 5.9.1
bdw429s Aug 15, 2023
97ac555
Oops, wrong code
bdw429s Aug 15, 2023
fa6391c
Merge branch 'development' into master
bdw429s Feb 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ External Dependencies:

<delete dir="${temp.dir}/engine/cfml/cli/lucee-server/context/extensions/available/"/>

<delete dir="${temp.dir}/engine/cfml/cli/lucee-server/context/extensions/available/"/>

<copy todir="${temp.dir}/engine/cfml/cli/lucee-server/context/extensions/available/">
<fileset dir="${extensions.dir}" includes="*.lex" />
</copy>
Expand Down