Skip to content

Sub trees #10

Merged
merged 5 commits into from Mar 22, 2021
Merged

Sub trees #10

merged 5 commits into from Mar 22, 2021

Conversation

aa9863
Copy link
Contributor

@aa9863 aa9863 commented Mar 22, 2021

No description provided.

aa9863 added 5 commits Mar 22, 2021
c37a493 Merge pull request #12 from aa9863/Cookies
b9de569 Update Changelog
7c6eb13 Session Jacking and Cookies Completed
d45edb6 Enable cookies in responses
2a241a1 Add ability to change template file is rendered with
4af64c2 Update view so we pass the level to the renderer
1028cac Flag disply when a cookie is set has been added
93a1a9c Testing cases for Cookies
016609e Author Test updated to take account of new 'Badge' style for authors
7a79b5b Changelog updates
36d9ead Merge pull request #11 from aa9863/Authors
b933e01 Bens levels added
d44f7f3 Clean up templates
06f78ba Authors added to existing levels
0495625 Notes and REadme updates
37fb165 Merge pull request #10 from aa9863/Flags
9ebe015 More index updates
2559fde Index page updated
6dd1410 Badge
fd23b27 LEvels cna now have flags
020691c Test for Flags added
835ca19 Readme Tidy
b91799c Update Readme
336a9eb Merge pull request #8 from aa9863/Testing
e8d753a Intergration tests added
5bf383f Merge pull request #7 from aa9863/Testing
42f438d Testing for Main views and Driver added
763ea16 Initial set of unittests for flask added
36ebe8b Refactor so we have the app in a seperate module for testing
ee6b5e2 Convert Selenoid into a Class
33e09be Break app into seperate File
6a90be1 New LEvesl added
06451b5 Changelog added
49261e3 Merge pull request #6 from aa9863/FilterRefactor
7b888c0 Changelog added, and Readme complete
f5ef9a4 Readme update
e7b2dc8 Rework Nav menus
13790ab Refactor Levels into their own file
507dd1b Update nav so ar shows levels
c60312d Add stop condition to level listing
3b0296d Added Simple Filter
bfc0b2c New style levels added for Training and level 0
d254ec3 Basic for Training level added
5d3d34b Test calling via Dictionary
1f049ab Break filters into a seperate file
cffa227 Change Levels to remove need for level numbers
5cfcabd Fix Render so it loads bootstrap (as I am an Ijit
17eadb7 Levels 7 and 8 added

git-subtree-dir: Week7_XSS/Challenges
git-subtree-split: c37a493861cdc93c5e43b8d160fb20db19e64041
aa9863 added a commit that referenced this pull request Mar 22, 2021
37fb165 Merge pull request #10 from aa9863/Flags
9ebe015 More index updates
2559fde Index page updated
6dd1410 Badge
fd23b27 LEvels cna now have flags
020691c Test for Flags added
835ca19 Readme Tidy
b91799c Update Readme
336a9eb Merge pull request #8 from aa9863/Testing
e8d753a Intergration tests added
5bf383f Merge pull request #7 from aa9863/Testing
42f438d Testing for Main views and Driver added
763ea16 Initial set of unittests for flask added
36ebe8b Refactor so we have the app in a seperate module for testing
ee6b5e2 Convert Selenoid into a Class
33e09be Break app into seperate File
6a90be1 New LEvesl added
06451b5 Changelog added
49261e3 Merge pull request #6 from aa9863/FilterRefactor
7b888c0 Changelog added, and Readme complete
f5ef9a4 Readme update
e7b2dc8 Rework Nav menus
13790ab Refactor Levels into their own file
507dd1b Update nav so ar shows levels
c60312d Add stop condition to level listing
3b0296d Added Simple Filter
bfc0b2c New style levels added for Training and level 0
d254ec3 Basic for Training level added
5d3d34b Test calling via Dictionary
1f049ab Break filters into a seperate file
cffa227 Change Levels to remove need for level numbers
5cfcabd Fix Render so it loads bootstrap (as I am an Ijit
17eadb7 Levels 7 and 8 added

git-subtree-dir: Week7_XSS/Challenges
git-subtree-split: 37fb16535213c6db064cd5adad43b90b4b88081a
@aa9863 aa9863 merged commit d9fb4b8 into main Mar 22, 2021
@aa9863 aa9863 deleted the SubTrees branch Mar 22, 2021
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant