krageon
/
zer.ooo-web
forked from zer.ooo/web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 4f773c0d2f made the twig template look nicer master Tim Bazuin 2019-08-03 21:42:01 +0200
  • d386e0a520 removed commented out code and old cruft Tim Bazuin 2019-08-03 21:37:18 +0200
  • 9436218561 generating an embedded server config with a decrypted private key now also works Tim Bazuin 2019-08-03 20:56:59 +0200
  • aa8812b837 embedded config support is now present for a locally saved private key or a remote private key, but decryption is currently a stub Tim Bazuin 2019-08-03 20:44:25 +0200
  • a9c368e980 I've got file downloading working for the zip file, basically as before - now on to the meat and potatoes Tim Bazuin 2019-08-03 20:07:42 +0200
  • bad2f8fa18 fixed some small formatting and logic mistakes Tim Bazuin 2019-08-03 15:29:39 +0200
  • e7eb852c66 fixed all the little form popup logic and the loading of the key file, now to fix decrypting it and adding it to the embedded config Tim Bazuin 2019-08-03 15:24:37 +0200
  • 21c8c34d7d When the user specifies they want an embedded config they no longer get a zip file containing everything *and* an embedded config Tim Bazuin 2019-08-03 13:45:37 +0200
  • e581cda081 fixed the check that sees if a ca.crt is present so it actually checks the right file Tim Bazuin 2019-08-03 13:19:53 +0200
  • c5ff4af87c added a docker-compose file and an entrypoint shell script to run a test server for zer.ooo Tim Bazuin 2019-08-03 13:17:03 +0200
  • cb7297eb88 added a twig template for a server config with an embedded certificate and associated code to make it work Tim Bazuin 2019-08-03 13:11:24 +0200
  • 0d69847a99 Merge branch 'develop' into 'master' Corné Oppelaar 2016-12-25 13:12:53 +0100
  • 299b3470aa Merge branch 'fixButtonsColor' into 'develop' Corné Oppelaar 2016-12-25 13:08:34 +0100
  • e19c88ebf0 Give buttons same color as links, so they don't show as 'disabled' Dennis de Greef 2016-12-25 12:55:39 +0100
  • b5174ef1f9 Merge branch 'develop' into 'master' Corné Oppelaar 2016-09-02 22:51:40 +0200
  • 3dce1a2d6a Merge branch 'tweakConfig' into 'develop' Corné Oppelaar 2016-09-02 22:50:13 +0200
  • b2bce4abfc move to a better cipher Corne Oppelaar 2016-09-02 22:49:47 +0200
  • c0df1d3b31 Merge branch 'develop' into 'master' Corné Oppelaar 2016-09-02 21:40:25 +0200
  • 9f9f06d389 Merge branch 'fixServerOverview' into 'develop' Corné Oppelaar 2016-09-02 21:36:46 +0200
  • d72f6fa784 add config builder + fix server overview Corne Oppelaar 2016-09-02 21:33:58 +0200
  • 0333aa10c7 Merge branch 'develop' into 'master' Corné Oppelaar 2016-09-02 13:52:37 +0200
  • 2e2f4e9f6f Merge branch 'redesignPanel' into 'develop' Corné Oppelaar 2016-08-24 20:13:58 +0200
  • 797c829510 add profile page and other stuff Corne Oppelaar 2016-08-24 22:07:42 +0200
  • 45ee7b2ebc update all panel pages Corne Oppelaar 2016-08-23 20:52:01 +0200
  • 414f17476f revamp invites and certificates screen Corne Oppelaar 2016-08-17 17:37:16 +0200
  • 72482e4f92 redesign certificates overview and new certificate form Corne Oppelaar 2016-08-09 02:16:01 +0200
  • 6027a602ca fix email check Corne Oppelaar 2016-08-07 14:46:54 +0200
  • 3998b9ef79 Merge pull request #30 from zerooo-vpn/addEmailToUser Corné Oppelaar 2016-08-07 12:38:43 +0200
  • 3bae03c387 Merge branch 'master' of github.com:EaterOfCode/zer.ooo into addEmailToUser Corne Oppelaar 2016-08-07 14:38:17 +0200
  • 23cdfd3bed
         add correct verification Corné Oppelaar 2016-08-07 12:33:57 +0200
  • ec9bedadd2 [WIP] Corne Oppelaar 2016-08-06 21:46:43 +0200
  • 78ae1ad30a Merge pull request #31 from zerooo-vpn/master Corné Oppelaar 2016-07-01 15:08:04 +0200
  • 768969e69a fix license on site Corne Oppelaar 2016-07-01 17:04:01 +0200
  • 37f4005c35 change to AGPL license Corne Oppelaar 2016-07-01 17:01:56 +0200
  • dd579b3513 add verify mail and email address saving Corne Oppelaar 2016-06-29 02:07:03 +0200
  • 0b9873ef7b add nette/mail Corne Oppelaar 2016-06-29 02:06:44 +0200
  • 7bf4e4830f regenerate new models Corne Oppelaar 2016-06-29 02:06:26 +0200
  • 28a26883b3 change db schema to reflect new database model Corne Oppelaar 2016-06-29 02:06:09 +0200
  • bb0f12bcbf Merge pull request #29 from zerooo-vpn/FixTechnicalDetailsPage Corné Oppelaar 2016-06-25 17:14:42 +0200
  • 98d639b990
         add server count Corne Oppelaar 2016-06-25 17:13:58 +0200
  • 169f705da4 Merge pull request #28 from zerooo-vpn/FixFontAwesome Corné Oppelaar 2016-06-25 17:10:35 +0200
  • 7b8fda4f10
         add email to register and also save input status after error Corne Oppelaar 2016-06-25 17:02:39 +0200
  • 837a990f59
         add email to user service Corne Oppelaar 2016-06-25 17:02:17 +0200
  • 86f878acae
         regen models Corne Oppelaar 2016-06-25 17:01:31 +0200
  • a8f73dd09a
         add email to user schema changes Corne Oppelaar 2016-06-25 16:56:38 +0200
  • 8b820d242d
         Fix viewpoets for registration and login pages. Nienke Dekker 2016-06-25 16:43:13 +0200
  • 8d372d6460
         Add tooltips, change viewport height Nienke Dekker 2016-06-25 16:34:31 +0200
  • 914287873b
         add error to install Corne Oppelaar 2016-06-25 15:48:42 +0200
  • 3435b7236c
         First commit of technical details section. Nienke Dekker 2016-06-25 15:46:09 +0200
  • b8f789d604
         Fix Firefox issue with FontAwesome. Nienke Dekker 2016-06-25 14:40:17 +0200
  • 929c6d0812 Merge pull request #26 from zerooo-vpn/fixCssThings Corné Oppelaar 2016-06-25 12:11:50 +0200
  • 8e0d0e4c89 Merge pull request #27 from krageon/master Corné Oppelaar 2016-06-25 00:47:03 +0200
  • 7479525ea6
         Changed 'an zerooo-vpn production' to 'a [...]' Tim Bazuin 2016-06-25 00:32:14 +0200
  • 6e311fc9fa Merge branch 'master' of github.com:EaterOfCode/zer.ooo into fixCssThings Corne Oppelaar 2016-06-24 22:40:12 +0200
  • a3c279e351 move third party content to local and fix some minor issues Corne Oppelaar 2016-06-24 22:40:05 +0200
  • 9a2110d22b Merge pull request #25 from zerooo-vpn/AddBootstrapToPanel Corné Oppelaar 2016-06-24 22:38:35 +0200
  • bd7f441a4b Hurr durr durr Nienke 2016-06-24 21:40:12 +0200
  • d04bcde301 Add Bootstrap to panel. Nienke 2016-06-24 21:39:08 +0200
  • a3fb24791d Merge pull request #24 from zerooo-vpn/cleanUpCSS Corné Oppelaar 2016-06-24 21:29:31 +0200
  • 1535883e08 Fix login/registration forms padding issue Nienke 2016-06-24 17:12:56 +0200
  • bcdd690912 Fix these thingies Nienke 2016-06-24 12:04:06 +0200
  • df62e86b04 I dont even know Nienke 2016-06-24 12:00:38 +0200
  • 379d4f3f03 Merge pull request #23 from zerooo-vpn/texts Nienke Dekker 2016-06-24 11:56:45 +0200
  • bbd07e0710 Merge branch 'master' into cleanUpCSS Nienke 2016-06-24 11:50:48 +0200
  • 56defb3c08 Remove glyphicons Nienke 2016-06-24 11:41:39 +0200
  • 28fc54fde2 Clarify inline comments Nienke 2016-06-23 15:09:20 +0200
  • bb95546a3c Set up an actual structure for the Sass files Nienke 2016-06-23 14:59:42 +0200
  • 7338b3c421 Clean up SCSS more Nienke 2016-06-23 14:41:02 +0200
  • 7b66278aa0 Change titles in the template files I missed Nienke 2016-06-23 14:23:24 +0200
  • dd8a59d343 Merge pull request #22 from zerooo-vpn/flexboxInSafari Corné Oppelaar 2016-06-23 13:22:41 +0200
  • 1802ec5750 Fix title and header texts Nienke 2016-06-23 10:37:37 +0200
  • c1397ea236 Fix disappearing scrollbars in Safari on Mac Nienke 2016-06-23 10:20:18 +0200
  • a943b68a1c Add Flexbox support for Safari. I sigh at Safari Nienke 2016-06-23 09:53:51 +0200
  • 18937d2741 Merge pull request #20 from zerooo-vpn/texts Corné Oppelaar 2016-06-22 21:36:44 +0200
  • 3eb917ed9b Add LICENSE Corne Oppelaar 2016-06-22 23:32:12 +0200
  • a3aca22e2d Change license wording Nienke 2016-06-22 11:57:16 +0200
  • 9f0046074b Change texts, make them read a little better Nienke 2016-06-22 11:48:31 +0200
  • 540d416e10 Merge pull request #19 from zerooo-vpn/responsive Corné Oppelaar 2016-06-22 11:09:25 +0200
  • 203a6d5f3b Another bug fix re: low browser window height Nienke 2016-06-22 11:06:53 +0200
  • 7e7f37f9c7 Kinda fixed low height viewport issue Nienke 2016-06-22 10:01:39 +0200
  • 66893c0856 Merge pull request #18 from zerooo-vpn/responsive Corné Oppelaar 2016-06-22 09:47:32 +0200
  • 6a3b05f477 Clean Nienke 2016-06-22 09:05:13 +0200
  • a9b154fc00 Clean up loose ends Nienke 2016-06-22 09:04:26 +0200
  • 270b525165 Make homepage responsive Nienke 2016-06-21 18:30:56 +0200
  • 17dbd9066c Moved things around Nienke 2016-06-21 15:37:14 +0200
  • 4194ca5bed Responsified the home page Nienke 2016-06-21 15:33:01 +0200
  • 4ec9879dea Clean up cruft Nienke 2016-06-21 15:02:38 +0200
  • f007966ffd Clean up CSS, add inline comments Nienke 2016-06-21 14:54:43 +0200
  • 39a82b4f30 Added an extension (DRY) Nienke 2016-06-21 14:49:53 +0200
  • bb34d507e6 Merge pull request #17 from zerooo-vpn/release Corné Oppelaar 2016-06-21 12:22:12 +0200
  • f28a7239e9 Merge pull request #16 from zerooo-vpn/fixExtraSpace Corné Oppelaar 2016-06-21 12:22:00 +0200
  • b14cf29049 use correct repo Corne Oppelaar 2016-06-21 12:22:23 +0200
  • d1a106ab7d fix extra space in the contributors list Corne Oppelaar 2016-06-21 12:21:54 +0200
  • bd1efb0382 Merge pull request #15 from zerooo-vpn/master Corné Oppelaar 2016-06-21 11:56:33 +0200
  • e1bea89c85 Merge pull request #14 from zerooo-vpn/fixfooter Corné Oppelaar 2016-06-21 11:56:03 +0200
  • 93151fef5c Fix ugly footer spacing Nienke 2016-06-21 11:44:31 +0200
  • 050034c82b Update README.md Nienke Dekker 2016-06-21 11:21:24 +0200
  • 22b48a1696 Update README.md Nienke Dekker 2016-06-21 11:20:46 +0200
  • ff00d989e4 Update README.md Nienke Dekker 2016-06-21 11:20:13 +0200
  • 2bd0f7868e Update README.md Nienke Dekker 2016-06-21 11:19:44 +0200