Skip to content

Jordan's branch #11

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
5f246e1
0.0.01
simonst3 Nov 8, 2021
59b81c3
Merge pull request #1 from dayj18/Tazmin's-Branch
dayj18 Nov 9, 2021
cf2dbc7
0.0.1
simonst3 Nov 9, 2021
22f2f92
Merge pull request #2 from dayj18/Tazmin's-Branch
simonst3 Nov 10, 2021
be4e431
0.0.25
dayj18 Nov 11, 2021
6f6e630
Merge branch 'master' into Jacobs-branch
simonst3 Nov 11, 2021
8633358
Merge pull request #3 from dayj18/Jacobs-branch
simonst3 Nov 11, 2021
5abe576
Update leap.py
ryee2 Nov 11, 2021
72e166c
Merge pull request #4 from dayj18/Webb's-Branch
simonst3 Nov 11, 2021
1b7ecf8
0.1.0
simonst3 Nov 11, 2021
e2fb5e1
Merge pull request #5 from dayj18/Tazmins-branch
simonst3 Nov 11, 2021
3ecbb53
0.1.1
simonst3 Nov 11, 2021
d6199a8
0.1.2
simonst3 Nov 13, 2021
259c55f
Merge pull request #6 from dayj18/Tazmins-branch
simonst3 Nov 13, 2021
7939679
Update leap.py
ryee2 Nov 18, 2021
88a6373
Merge pull request #7 from dayj18/Webb's-branch
simonst3 Nov 18, 2021
6b37ce1
Update leap.py
scholesj2 Nov 25, 2021
1932c90
Update leap.py
scholesj2 Nov 25, 2021
417e0c1
Merge pull request #8 from dayj18/Jordan's-Branch
simonst3 Nov 25, 2021
b40300c
0.1.41
simonst3 Nov 25, 2021
f0b303b
Merge pull request #9 from dayj18/Tazmin's-branch
simonst3 Nov 25, 2021
730254a
Update leap.py
dayj18 Nov 25, 2021
beb6243
0.1.5
simonst3 Nov 25, 2021
0082b8a
0.1.6
joe Nov 25, 2021
489b702
Merge pull request #10 from dayj18/Joe's-Branch
joe Nov 25, 2021
cbd92aa
0.1.7
joe Nov 25, 2021
5e18193
Merge pull request #11 from dayj18/Joe's-Branch
joe Nov 25, 2021
a352816
0.1.71
simonst3 Nov 25, 2021
87f41a2
Update leap.py
taylorr15 Nov 28, 2021
2cfc13e
Merge pull request #12 from dayj18/Reece's-Branch
simonst3 Nov 28, 2021
d357daa
0.2.1
simonst3 Nov 28, 2021
83843f3
0.2.11
simonst3 Nov 29, 2021
e004f5d
0.2.2
simonst3 Nov 29, 2021
6baaab3
Merge pull request #13 from dayj18/Taz-and-Webb's-Branch
simonst3 Nov 29, 2021
ea88de3
0.2.21
simonst3 Nov 29, 2021
4c610a0
Update leap.py
ryee2 Nov 29, 2021
fe24cad
Merge pull request #14 from dayj18/Webb's-Branch
ryee2 Nov 29, 2021
4a12a89
Update leap.py
ryee2 Nov 29, 2021
be786c5
Merge pull request #15 from dayj18/Webb's-branch
ryee2 Nov 30, 2021
ff9edcc
Update leap.py
ryee2 Nov 30, 2021
de9946a
Merge pull request #16 from dayj18/Webb's-branch
simonst3 Nov 30, 2021
4298f5d
0.2.32
simonst3 Nov 30, 2021
b1abe8a
Merge pull request #17 from dayj18/Taz's-branch
simonst3 Nov 30, 2021
6219b37
Update leap.py
dayj18 Nov 30, 2021
e235579
Update leap.py
ryee2 Nov 30, 2021
0c0fe6b
Merge pull request #18 from dayj18/Webb's-branch
simonst3 Nov 30, 2021
7377749
Update leap.py
ryee2 Nov 30, 2021
2246ea0
Merge pull request #19 from dayj18/Webb's-branch
ryee2 Nov 30, 2021
9d5b000
Update leap.py
ryee2 Nov 30, 2021
8d22d83
Update leap.py
ryee2 Nov 30, 2021
5981150
Merge pull request #20 from dayj18/Webb's-branch
simonst3 Nov 30, 2021
0ee56a0
Update leap.py
ryee2 Nov 30, 2021
e17bf40
Merge pull request #21 from dayj18/Webb's-branch
ryee2 Nov 30, 2021
2ba4129
Update leap.py
ryee2 Nov 30, 2021
40b2a15
Update leap.py
ryee2 Nov 30, 2021
257d744
Merge pull request #22 from dayj18/Webb's-branch
simonst3 Dec 1, 2021
9ef7504
Add files via upload
ryee2 Dec 1, 2021
d2b6a62
Add files via upload
ryee2 Dec 1, 2021
bcc6c36
Merge pull request #23 from dayj18/Webb's-branch
simonst3 Dec 1, 2021
60d4749
Update leap.py
ryee2 Dec 1, 2021
79c1098
Merge pull request #24 from dayj18/Webb's-branch
ryee2 Dec 1, 2021
94102bc
1.0.0
scholesj2 Dec 1, 2021
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
Prev Previous commit
Next Next commit
0.1.0
simonst3 committed Nov 11, 2021
commit 1b7ecf8a079a5b0128f0d203071e5f1591a2789c
15 changes: 5 additions & 10 deletions src/leap.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
#CW 2
import os
start = input("which line of code would you like to try?\n 1: enum-1 by:\n 2: enum-2 by:\n 3: enum-3 by:\n 4: priv-esc-1 by:")
start = input("which line of code would you like to try?\n 1: enum-1 by:Tazmin \n 2: enum-2 by: Jacob\n 3: enum-3 by: Webb\n 4: priv-esc-1 by:")

if start == 1:
#place holder
print("enum-1")
Username = os.getlogin()
print(Username)
input()
domain = os.environ['userdomain']
print(domain)
input()
opsys = os.name()
print(opsys)
input()

print("Operating system:")
print(opsys)

elif start == 2:
#placeholder
print("enum-2")
domain = os.environ['userdomain']
print(domain)
input()

elif start == 3:
print("enum-3")
opsys = os.name
print(opsys)
input()
#placeholder