390 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SECURED.ORG	13b965e6fa	Merge branch 'master' into master	2017-12-11 13:51:46 -08:00
SECURED.ORG	3d9ed00adb	Merge pull request #18 from xcellardoor/master ... Added some UK Conferences	2017-12-11 13:49:57 -08:00
SECURED.ORG	c18f70ff89	Merge branch 'master' into master	2017-12-11 13:49:45 -08:00
SECURED.ORG	13b4d0b1ed	Merge branch 'master' into master	2017-12-11 13:48:46 -08:00
SECURED.ORG	1016c4c378	Merge pull request #17 from p-l-/grehack ... Add GreHack Conference	2017-12-11 13:47:29 -08:00
Aljaz Ceru	1918c0797a	Update list.json	2017-12-11 22:23:49 +01:00
xcellardoor	aa9bf944a8	Added some UK Conferences	2017-12-11 21:13:48 +00:00
Pierre LALET	370aeda12b	Add GreHack	2017-12-11 21:59:36 +01:00
SECURED.ORG	d46f257100	Update list.json	2017-12-11 12:54:17 -08:00
SECURED.ORG	67a2e27aa6	Merge pull request #16 from Rurik/patch-1 ... Proposed clean-up	2017-12-11 12:52:21 -08:00
Brian Baskin	3b73429ac1	Proposed clean-up ... Tabs to whitespaces, normalizes each line (rm spaces around quotes), basic cleanup. Just a proposition, if you like this style.	2017-12-11 15:41:16 -05:00
SECURED.ORG	fc39e52423	Update list.json	2017-12-11 12:33:15 -08:00
SECURED.ORG	a16c319adf	Merge pull request #15 from Rurik/patch-1 ... Added BSidesCharm -- because it's totes ab fab	2017-12-11 11:56:07 -08:00
Brian Baskin	1ad1b2177e	Added BSidesCharm -- because it's totes ab fab	2017-12-11 14:53:45 -05:00
SECURED.ORG	250b4b20fa	Update list.json	2017-12-11 11:40:54 -08:00
SECURED.ORG	da6ea057d9	Update list.json	2017-12-11 11:37:43 -08:00
SECURED.ORG	b6c65b252a	Update search.html	2017-12-11 11:27:23 -08:00
SECURED.ORG	d1bfc96642	Update list.json	2017-12-11 11:22:53 -08:00
SECURED.ORG	b5443f4048	Update list.json	2017-12-11 11:21:19 -08:00
SECURED.ORG	e09aae9259	Update retools.md	2017-12-11 11:17:09 -08:00
SECURED.ORG	c5d518e956	Update list.json	2017-12-11 11:11:01 -08:00
SECURED.ORG	fceabce4a6	Update list.json	2017-12-11 11:10:43 -08:00
Amanda Rousseau	635d858645	adding conf	2017-12-11 11:08:09 -08:00
Amanda Rousseau	c4105e4256	adding conf	2017-12-11 11:04:40 -08:00
Amanda Rousseau	34dfe785a8	adding community conf search	2017-12-11 10:57:42 -08:00
Amanda Rousseau	1d59fe6faf	fixing locations	2017-12-08 13:27:46 -08:00
Amanda Rousseau	430dc2fd87	Merge branch 'master' of https://github.com/securedorg/securedorg.github.io	2017-12-08 13:17:27 -08:00
Amanda Rousseau	fd12e2ad4f	adding secret	2017-12-08 13:16:59 -08:00
SECURED.ORG	bbbfa459c6	Update challenge5.md	2017-11-24 15:21:31 -08:00
SECURED.ORG	486eccb4de	Update challenge5.md	2017-11-24 15:18:27 -08:00
Amanda Rousseau	015d3dc141	Merge branch 'master' of https://github.com/securedorg/securedorg.github.io	2017-11-24 15:15:28 -08:00
Amanda Rousseau	9675c1cd83	adding challenge 5	2017-11-24 15:15:02 -08:00
SECURED.ORG	89108a1a02	Update challenge3.md	2017-11-21 17:45:03 -08:00
Amanda Rousseau	55c70933b6	adding details	2017-11-21 17:32:19 -08:00
SECURED.ORG	f762e92971	Update index.md	2017-11-21 17:28:49 -08:00
Amanda Rousseau	fa85e54b71	updating link info	2017-11-21 17:25:41 -08:00
SECURED.ORG	9545e7e75d	Update challenge4.md	2017-11-21 17:13:41 -08:00
SECURED.ORG	7beb92db4e	Add files via upload	2017-11-21 17:12:45 -08:00
SECURED.ORG	887f3aae11	Delete ch4_diagram.png	2017-11-21 17:12:16 -08:00
Amanda Rousseau	a934f7b7a1	updating diagram	2017-11-21 17:08:02 -08:00
Amanda Rousseau	49c4af63ba	minor typo	2017-11-21 17:04:14 -08:00
Amanda Rousseau	fa4bfa7e07	adding challeng 4	2017-11-21 17:02:49 -08:00
Amanda Rousseau	466fbec4e6	adding detail	2017-11-21 13:19:52 -08:00
Amanda Rousseau	d153cae91b	adding challenge 3	2017-11-21 13:16:07 -08:00
Amanda Rousseau	b838126970	adding binaries	2017-11-17 17:53:35 -08:00
Amanda Rousseau	c1c2d337ea	adding binaries	2017-11-17 17:51:06 -08:00
Amanda Rousseau	1f87a4cfee	fixing typo	2017-11-17 17:33:31 -08:00
Amanda Rousseau	679018c5d7	adding challenge 2	2017-11-17 17:27:43 -08:00
Amanda Rousseau	a3aa196a06	fixing path	2017-11-17 15:54:58 -08:00
Amanda Rousseau	0e8092f39b	adding challenge1	2017-11-17 15:50:13 -08:00