PasswordProtectedFiles #5067

dapocalypse · 2018-07-28T20:49:42Z

This PR adds password protected files. When creating a file an additional prompt will come up. This will ask if you would like to set a password. If left blank a password will not be set and the file will function normally. If a password is set, when viewing, cloning, renaming, or deleting a file, the password prompt will again come up asking for the previously set password. When cloned, the cloned file retains the password.

BurgerLUA

There are a places where you could be using else statements, and a lot of the checks are wrong in the first place. NOT EQUAL statements are x != y not !x == y.

!x == y checks in the inverse of x is equal to y.

Other than that, this is a fine addition.

BurgerLUA · 2018-07-28T20:52:03Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

-		HDD.remove_file(file)
+		if(!currentpass)
+			HDD.remove_file(file)
+		if(currentpass)


This can be an else statement.

BurgerLUA · 2018-07-28T20:52:17Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+			checkpass = sanitize(input(usr, "Please enter the password:"))
+			if(checkpass == currentpass)
+				open_file = href_list["PRG_openfile"]
+			if(!checkpass == currentpass)


This can be an else statement.

BurgerLUA · 2018-07-28T20:52:26Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		var/currentpass = file.password
+		if(!currentpass)
+			open_file = href_list["PRG_openfile"]
+		if(currentpass)


This can be an else statement.

BurgerLUA · 2018-07-28T20:53:35Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+			checkpass = sanitize(input(usr, "Please enter the password:"))
+			if(checkpass == currentpass)
+				HDD.remove_file(file)
+			if(!checkpass == currentpass)


This can be an else statement, and I think it's written wrong in the first place.
NOT EQUALS statements are x != y not `!x == y', I think I'm seeing this a lot in this PR so you might want to look at that.

BurgerLUA · 2018-07-28T20:53:50Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+			checkpass = sanitize(input(usr, "Please enter the password:"))
+			if(checkpass == currentpass)
+				RHDD.remove_file(file)
+			if(!checkpass == currentpass)


This can be an else statement.

BurgerLUA · 2018-07-28T20:54:50Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+			checkpass = sanitize(input(usr, "Please enter the password:"))
+			if(checkpass == currentpass)
+				HDD.store_file(C)
+			if(!checkpass == currentpass)


Else statement.

Karolis2011

Just horrid. But improving.

Karolis2011 · 2018-07-28T20:54:15Z

code/modules/modular_computers/file_system/programs/system/desktop.ini

@@ -0,0 +1,2 @@
+[LocalizedFileNames]


Unnecessary file

Karolis2011 · 2018-07-28T20:57:36Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		var/currentpass = file.password
+		if(!currentpass)
+			open_file = href_list["PRG_openfile"]
+		if(currentpass)


if (...) onething() else otherthing()

exists

Depending on what if(currentpass) is, a ternary may be more appropriate.

Karolis2011 · 2018-07-28T21:10:38Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
+		var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_openfile"])
+		var/checkpass = ""
+		var/currentpass = file.password


Unsafe access of file.
This whole password check should be put inside ui_interact() around line 225

Do I make a proc to check for the password? Also I dont understand what you mean by unsafe acess of file.

You should make password protection validation a proc, yes. This method of doing:

if (!currentpass) // do one thing else // check password and do the other

is bad. Very bad. A file should have a proc proc/can_access_file(mob/user, prompt_for_password = FALSE, input_password = "")

Rough contents would look like this:

/datum/computer_file/proc/can_access_file(mob/user, prompt_for_password = FALSE, input_password = "") if (!password) return TRUE if (prompt_for_password) if (!ismob(user)) return FALSE input_password = sanitize(input(user, "Please enter a password to access file '[name]':")) return password == input_password

This allows for 100x cleaner functionality:

if (!file.can_access_file(usr, TRUE)) return 1 open_file = href_list["PRG_openfile"]

Karolis2011 · 2018-07-28T21:11:13Z

html/changelogs/dapocalypse-development.yml

+#################################
+
+# Your name.  
+author: dapocalypse


DO NOT EDIT example.yml

It´s now a different file

Karolis2011 · 2018-07-28T21:12:20Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		var/datum/computer_file/data/F = new/datum/computer_file/data()
 		F.filename = newname
 		F.filetype = "TXT"
+		F.password = newpassword


should do if (newpassword)

Karolis2011 · 2018-07-28T21:12:50Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		if(!file || file.undeletable)
 			return 1
-		HDD.remove_file(file)
+		if(!currentpass)


deleting shouldn't require password

I disagree, bald greytide names steve breaks into the captains office and logs onto his computer, baldie mcsteve finds file names "realy important information i need to remember and cannot be deleted" baldie mcsteve deleted the file and runs to his greytide layer. The captain returns and finds his file has been deleted.

Password protected files IRL ask for a password every time you so much as breathe on it. It requires a password when you move the file or delete the file. It makes sense that password protected files ask for a password every time you modify it.

It would depend on what the actual underlying mentality of the password protection is. There's two ways to handle password protection:

OS level. This is what you're referring to, in that the OS enforces password protection to even breathe on the file.

Encrypted file. This just means that the contents of the file are encrypted and require a key to decrypt. You can move/copy/delete the file without issues, tho. Because it's just a random text file with garbled contents.

I don't really have a preference, @Arrow768 might have one.

I am thinking of revealing encrypted ciphertext during an emag then having the player decrypt the file.

Regarding password required for deletion:
Most operating systems do not care weather a file is encrypted or not. The actual encryption / decryption is handled by a application interacting with the file.
The operating system only uses RBAC or something simmilar, but there are no special checks if a file is encrypted or not.

I believe the second option is our way to go in that case:
Viewing / editing requires a key (saved with the file datum)
but moving / copying / deleting does not.
This leaves room to add file owners and permissions later on.

Regarding Baldie McSteve.
Physical Security is a important aspect.
If you allow someone else physical access to a computer system, then they can do almost anything with it.
Therefore I would allow other people to tamper with it, if they can get access.
It should be the responsibility of the player to restrict the access to the computer system accordingly or keep backups

Karolis2011 · 2018-07-28T21:14:07Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		if(!F || !istype(F))
 			return 1
 		var/datum/computer_file/C = F.clone(1)
-		HDD.store_file(C)
+		if(!currentpass)


If you opened file, you already know password, so closing it shouldn't ask password too.

This is for cloning the file, not closing it.

Karolis2011 · 2018-07-28T21:14:25Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		if(!file || !istype(file))
 			return 1
 		var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename))
-		if(file && newname)
-			file.filename = newname
+		if(!currentpass)


Renaming shouldn't need password

Baldie McSteve will strike again.

Karolis2011 · 2018-07-28T21:14:50Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		if(!file || file.undeletable)
 			return 1
-		RHDD.remove_file(file)
+		if(!currentpass)


Same thing about deleting

Removed the thing about deleting files in flash drive as you cant find them or make them i dont think.

skull132 · 2018-07-29T10:41:16Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 		if(!file || file.undeletable)
 			return 1
-		HDD.remove_file(file)
+		if(!currentpass)


It would depend on what the actual underlying mentality of the password protection is. There's two ways to handle password protection:

OS level. This is what you're referring to, in that the OS enforces password protection to even breathe on the file.

Encrypted file. This just means that the contents of the file are encrypted and require a key to decrypt. You can move/copy/delete the file without issues, tho. Because it's just a random text file with garbled contents.

I don't really have a preference, @Arrow768 might have one.

skull132 · 2018-07-29T10:41:35Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(href_list["PRG_usbdeletefile"])
 		. = 1
-		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
+		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.hard_drive


This change seems weird. Can you explain the difference between portable_drive and hard_drive? It could lead to odd things.

This was unintended,

skull132 · 2018-07-29T10:41:55Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

-		var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"])
+		var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_deletefile"])
+		var/checkpass = ""
+		var/currentpass = file.password


We don't know if the file exists. Move this below line 76.

skull132 · 2018-07-29T10:42:28Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -60,21 +92,40 @@
 		if(!HDD)
 			return 1
 		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"])
+		var/checkpass = ""
+		var/currentpass = F.password


You're accessing F.password without checking if F actually exists. Line 97 checks if F exists and exits if it doesn't. So this has to be below it.

skull132 · 2018-07-29T10:42:56Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(href_list["PRG_rename"])
 		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
 			return 1
 		var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"])
+		var/checkpass = ""
+		var/currentpass = file.password


Below line 117.

skull132 · 2018-07-29T10:43:22Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(href_list["PRG_copyfromusb"])
 		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
 		if(!HDD || !RHDD || computer.enrolled != 2)
 			return 1
 		var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"])
+		if(!F || !istype(F))


Erm. Line 207 already exists. Delete this and line 204.

skull132 · 2018-07-29T10:43:30Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		if(!F || !istype(F))
+			return 1
+		var/checkpass = ""
+		var/currentpass = F.password


Move this below line 208.

skull132 · 2018-07-29T10:50:04Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
+		var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_openfile"])
+		var/checkpass = ""
+		var/currentpass = file.password


You should make password protection validation a proc, yes. This method of doing:

if (!currentpass) // do one thing else // check password and do the other

is bad. Very bad. A file should have a proc proc/can_access_file(mob/user, prompt_for_password = FALSE, input_password = "")

Rough contents would look like this:

/datum/computer_file/proc/can_access_file(mob/user, prompt_for_password = FALSE, input_password = "") if (!password) return TRUE if (prompt_for_password) if (!ismob(user)) return FALSE input_password = sanitize(input(user, "Please enter a password to access file '[name]':")) return password == input_password

This allows for 100x cleaner functionality:

if (!file.can_access_file(usr, TRUE)) return 1 open_file = href_list["PRG_openfile"]

dapocalypse · 2018-07-29T21:19:35Z

The thing stalled, my push is fine, can somone get it to test it again

skull132 · 2018-07-29T21:17:51Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

-		var/currentpass = file.password
-		if(!currentpass)
+		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
+		var/iscorrect = F.can_acess_file(passcheck)


This needs to be after line 27. We don't know if F exists yet.

The var iscorrect is unnecessary. Just call the proc in an if: if (F.can_access_file(passcheck))

skull132 · 2018-07-29T21:18:34Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -19,18 +19,16 @@

 	if(href_list["PRG_openfile"])
 		. = 1
+		var/passcheck


What and why is this variable.

skull132 · 2018-07-29T21:18:53Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(href_list["PRG_usbdeletefile"])
 		. = 1
-		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.hard_drive
+		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive


again, this change needs to be explained.

This was reverted from the previos push

skull132 · 2018-07-29T21:19:40Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(.)
 		SSnanoui.update_uis(NM)

 /datum/nano_module/program/computer_filemanager
 	name = "NTOS File Manager"

+/datum/computer_file/proc/can_acess_file(input_password = "")


This proc is in the wrong file. Look for a file which has the computer_file definition.

Also, you're missing the argument mob/user. You need it.

skull132 · 2018-07-29T21:20:49Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+	if(!password)
+		return TRUE
+	else
+		input_password = sanitize(input(usr, "Please enter a password to access file '[filename]':"))


Usage of usr outside of Topic and a few other procs is forbidden. It is unsafe and makes procs unusable. This is why you need the argument of mob/user.

dapocalypse · 2018-07-29T21:59:40Z

can admins please run check again for travis, byond is fucking up not me

dapocalypse · 2018-07-29T22:21:36Z

alright, papi skull, do you appreove

Arrow768 · 2018-07-30T08:38:57Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -150,6 +159,16 @@
 /datum/nano_module/program/computer_filemanager
 	name = "NTOS File Manager"

+/datum/computer_file/proc/can_acess_file(var/mob/user, input_password = "")


spelling mistake in the proc.
It should be access

Arrow768 · 2018-07-30T18:04:38Z

I do not like that you are promoted for a password when you create the file and there is no way to change / decrypt the file.

There should be options to encrypt / decrypt the file manually.
-> This would also allow you to change the encryption key
-> And we can get rid of the password prompt when a file is created.

Arrow768 · 2018-07-31T18:46:52Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+	if(href_list["PRG_encrypt"])
+		. = 1
+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
+		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])


shouldnt that be ?
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
-> Same for the decrypt option below

skull132 · 2018-07-31T18:50:13Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -73,8 +80,7 @@
 		if(!file || !istype(file))
 			return 1
 		var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename))
-		if(file && newname)
-			file.filename = newname
+		file.filename = newname


Removing the two checks here is bad. First, we don't know if the name is empty; second, the file might get deleted while the proc sleeps. Put them back.

skull132 · 2018-07-31T18:51:45Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -144,12 +150,39 @@
 			return 1
 		var/datum/computer_file/C = F.clone(0)
 		HDD.store_file(C)
+	if(href_list["PRG_encrypt"])
+		. = 1
+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive


Need to check if HDD exists after this, and return if not. See line 135 or 146.

Skull's comment is now invalid, check is present

skull132 · 2018-07-31T18:52:21Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
+	if(href_list["PRG_decrypt"])
+		. = 1
+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive


Need to check if HDD exists after this.

Skull's comment is now invalid, check is present

dapocalypse · 2018-07-31T21:55:58Z

admins admins hear my cry please reset travis

Karolis2011

Mostly way way better than initial implementation. If not that proc, I would have approved it.

Karolis2011 · 2018-08-01T17:30:10Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -46,7 +53,7 @@
 		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
 		if(!RHDD)
 			return 1
-		var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"])
+		var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_deletefile"])


This line shouldn't have been changed

Karolis2011 · 2018-08-01T17:30:47Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

@@ -144,12 +150,39 @@
 			return 1
 		var/datum/computer_file/C = F.clone(0)
 		HDD.store_file(C)
+	if(href_list["PRG_encrypt"])
+		. = 1
+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive


Skull's comment is now invalid, check is present

Karolis2011 · 2018-08-01T17:31:29Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+		F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
+	if(href_list["PRG_decrypt"])
+		. = 1
+		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive


Skull's comment is now invalid, check is present

Karolis2011 · 2018-08-01T17:33:13Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

 	if(.)
 		SSnanoui.update_uis(NM)

 /datum/nano_module/program/computer_filemanager
 	name = "NTOS File Manager"

+/datum/computer_file/proc/can_access_file(var/mob/user, input_password = "")


This Proc should have been in code/modules/modular_computers/file_system/computer_file.dm

Karolis2011 · 2018-08-01T17:35:34Z

code/modules/modular_computers/file_system/programs/system/file_browser.dm

+	if(!password)
+		return TRUE
+	else
+		input_password = sanitize(input(user, "Please enter a password to access file '[filename]':"))


What is the point of proc param input_password if it's being reset by user's input anyway?
I recommend putting this line inside if(!input_password)

merge

MarinaGryphon · 2018-08-21T01:01:35Z

code/modules/modular_computers/file_system/computer_file.dm

+		return TRUE
+	else
+		if (!input_password)
+			input_password = sanitize(input(user, "Please enter a password to access file '[filename]':"))


I think file '[filename]' is a bit redundant. What are you going to be accessing that isn't a file?

Imho its fine.

"Please enter a password to access"
Is what would be left and thats worse.

Maybe remove just the "file"
So its only:

Please enter a password to file '[filename]':

You're misunderstanding what I'm suggesting. Just removing the word 'file' is fine, so that it's Please enter a password to access 'foo':, or similar.

Arrow768

Looks fine. Please make sure its tested and works ingame

Karolis2011

Do as I suggest and you will:

Reduce great wall of buttons
Fix issue that you can't decrypt files

Also you can encrypt programs, but there is no check while opening program if program is encrypted. Add check or make them unencryptable.

Karolis2011 · 2018-08-21T18:14:26Z

nano/templates/file_manager.tmpl

@@ -28,6 +28,8 @@
 					{{:helper.link('DELETE', null, { "PRG_deletefile" : value.name }, value.undeletable ? 'disabled' : null)}}
 					{{:helper.link('RENAME', null, { "PRG_rename" : value.name }, value.undeletable ? 'disabled' : null)}}
 					{{:helper.link('CLONE', null, { "PRG_clone" : value.name }, value.undeletable ? 'disabled' : null)}}
+					{{:helper.link('ENCRYPT', null, { "PRG_encrypt" : value.name }, (value.encrypted || value.undeletable) ? 'disabled' : null)}}


{{if !value.encrypted}} {{:helper.link('ENCRYPT', null, { "PRG_encrypt" : value.name }, (value.undeletable) ? 'disabled' : null)}} {{else}} {{:helper.link('DECRYPT', null, { "PRG_decrypt" : value.name }, (value.undeletable) ? 'disabled' : null)}} {{/if}}

merge

Karolis2011 · 2018-08-30T17:46:31Z

nano/templates/file_manager.tmpl

@@ -28,8 +28,10 @@
 					{{:helper.link('DELETE', null, { "PRG_deletefile" : value.name }, value.undeletable ? 'disabled' : null)}}
 					{{:helper.link('RENAME', null, { "PRG_rename" : value.name }, value.undeletable ? 'disabled' : null)}}
 					{{:helper.link('CLONE', null, { "PRG_clone" : value.name }, value.undeletable ? 'disabled' : null)}}
-					{{if data.usbconnected}}
-						{{:helper.link('EXPORT', null, { "PRG_copytousb" : value.name }, value.undeletable ? 'disabled' : null)}}


Why remove copying to USB drive? Please return this button.

merge

skull132 · 2018-09-15T21:28:44Z

nano/templates/file_manager.tmpl

 					{{if data.usbconnected}}
 						{{:helper.link('EXPORT', null, { "PRG_copytousb" : value.name }, value.undeletable ? 'disabled' : null)}}
-					{{/if}}
+


The {{/if}} tag needs to be here as well.

merge

dapocalypse · 2018-09-24T02:56:28Z

I'd like to thank Armok, you are best, I'd like to thank my boi eddy snowman for keeping me safe, You all are amazing, god bless ancapistan.
PS: Also thanos for gifting me his amazing thanos car.

PasswordProtectedFiles

56418a3

dapocalypse requested a review from Arrow768 as a code owner July 28, 2018 20:49

BotBOREALIS added the Changelog Required label Jul 28, 2018

BurgerLUA suggested changes Jul 28, 2018

View reviewed changes

Added changelog for passwordprotectedfiles.

ccea176

BotBOREALIS removed the Changelog Required label Jul 28, 2018

Password Protection Fixes

5ae29af

Karolis2011 suggested changes Jul 28, 2018

View reviewed changes

dapocalypse added 2 commits July 28, 2018 15:09

Password Protection Fixes

19ba053

fixes

093914b

Alberyk added the Review Required label Jul 29, 2018

skull132 suggested changes Jul 29, 2018

View reviewed changes

Makes password check a proc

d06f0a5

skull132 suggested changes Jul 29, 2018

View reviewed changes

Proc Password Proctection Fixes

b609ece

Arrow768 reviewed Jul 30, 2018

View reviewed changes

Fixes typo acess

8af142c

Allows to encrypt or decrypt files outside of file creation

121103e

Arrow768 reviewed Jul 31, 2018

View reviewed changes

skull132 suggested changes Jul 31, 2018

View reviewed changes

dapocalypse added 2 commits July 31, 2018 12:58

Fix to encryp decrypt stuff

2b4bd2b

Merge branch 'development' into development

45fa2d4

Karolis2011 suggested changes Aug 1, 2018

View reviewed changes

dapocalypse added 2 commits August 1, 2018 12:25

UGh, Fixes

f1da4d8

Merge branch 'development' into development

fb816e4

dapocalypse added 7 commits August 3, 2018 13:42

Again?

8faefc1

forgot

28de024

Merge branch 'development' into development

43ec5f7

Merge branch 'development' into development

1ec8efc

Merge branch 'development' into development

8218fcb

Merge branch 'development' into development

17852bb

Merge branch 'development' into development

75e5820

skull132 added this to the September Update milestone Aug 5, 2018

dapocalypse added 3 commits August 7, 2018 12:52

Merge branch 'development' into development

af8cc38

Merge pull request #1 from Aurorastation/development

f23c03d

merge

Merge branch 'development' into development

b867b90

MarinaGryphon reviewed Aug 21, 2018

View reviewed changes

Arrow768 approved these changes Aug 21, 2018

View reviewed changes

Karolis2011 suggested changes Aug 21, 2018

View reviewed changes

dapocalypse added 2 commits August 26, 2018 17:00

Merge pull request #3 from Aurorastation/development

d789693

merge

Yea, fixes shit

0fb1088

Karolis2011 suggested changes Aug 30, 2018

View reviewed changes

skull132 modified the milestones: Update September 2018, Update October 2018 Sep 2, 2018

dapocalypse added 2 commits September 2, 2018 09:40

Merge pull request #4 from Aurorastation/development

c5eac59

merge

Fixes USB shit

65faf44

skull132 suggested changes Sep 15, 2018

View reviewed changes

dapocalypse added 4 commits September 15, 2018 14:41

Merge pull request #5 from Aurorastation/development

5de0a28

merge

Proably not the last commit

4d5c59f

Merge branch 'development' into development

e26199a

Merge branch 'development' into development

38d917f

skull132 approved these changes Sep 23, 2018

View reviewed changes

Merge branch 'development' into development

79ae330

skull132 merged commit c5f5f8c into Aurorastation:development Sep 23, 2018

PasswordProtectedFiles #5067

PasswordProtectedFiles #5067

Conversation

dapocalypse commented Jul 28, 2018

BurgerLUA left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Karolis2011 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dapocalypse Jul 28, 2018 • edited

Choose a reason for hiding this comment

skull132 Jul 29, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

skull132 Jul 29, 2018 • edited

Choose a reason for hiding this comment

dapocalypse commented Jul 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dapocalypse commented Jul 29, 2018 • edited

dapocalypse commented Jul 29, 2018

Choose a reason for hiding this comment

Arrow768 commented Jul 30, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dapocalypse commented Jul 31, 2018

Karolis2011 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Arrow768 left a comment

Choose a reason for hiding this comment

Karolis2011 left a comment • edited

BurgerLUA left a comment •

edited

dapocalypse Jul 28, 2018 •

edited

skull132 Jul 29, 2018 •

edited

skull132 Jul 29, 2018 •

edited

dapocalypse commented Jul 29, 2018 •

edited

Arrow768 commented Jul 30, 2018 •

edited

Karolis2011 left a comment •

edited

dapocalypse commented Sep 24, 2018 •

edited