Commit graph

133 commits

Author SHA1 Message Date
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 2019-08-03 15:24:37 +02:00
21c8c34d7d When the user specifies they want an embedded config they no longer get a zip file containing everything *and* an embedded config 2019-08-03 13:45:37 +02:00
e581cda081 fixed the check that sees if a ca.crt is present so it actually checks the right file 2019-08-03 13:19:53 +02:00
c5ff4af87c added a docker-compose file and an entrypoint shell script to run a test server for zer.ooo 2019-08-03 13:17:03 +02:00
cb7297eb88 added a twig template for a server config with an embedded certificate and associated code to make it work 2019-08-03 13:11:24 +02:00
Corné Oppelaar
0d69847a99 Merge branch 'develop' into 'master'
Develop

See merge request !8
2016-12-25 13:12:53 +01:00
Corné Oppelaar
299b3470aa Merge branch 'fixButtonsColor' into 'develop'
Fix buttons color

See merge request !7
2016-12-25 13:08:34 +01:00
Dennis de Greef
e19c88ebf0 Give buttons same color as links, so they don't show as 'disabled' 2016-12-25 12:55:39 +01:00
Corné Oppelaar
b5174ef1f9 Merge branch 'develop' into 'master'
Develop



See merge request !6
2016-09-02 22:51:40 +02:00
Corné Oppelaar
3dce1a2d6a Merge branch 'tweakConfig' into 'develop'
move to a better cipher



See merge request !5
2016-09-02 22:50:13 +02:00
Corne Oppelaar
b2bce4abfc move to a better cipher 2016-09-02 22:49:47 +02:00
Corné Oppelaar
c0df1d3b31 Merge branch 'develop' into 'master'
Develop



See merge request !4
2016-09-02 21:40:25 +02:00
Corné Oppelaar
9f9f06d389 Merge branch 'fixServerOverview' into 'develop'
Fix server overview



See merge request !3
2016-09-02 21:36:46 +02:00
Corne Oppelaar
d72f6fa784 add config builder + fix server overview 2016-09-02 21:33:58 +02:00
Corné Oppelaar
0333aa10c7 Merge branch 'develop' into 'master'
Develop



See merge request !2
2016-09-02 13:52:37 +02:00
Corné Oppelaar
2e2f4e9f6f Merge branch 'redesignPanel' into 'develop'
Redesign panel



See merge request !1
2016-08-24 20:13:58 +02:00
Corne Oppelaar
797c829510 add profile page and other stuff 2016-08-24 22:07:42 +02:00
Corne Oppelaar
45ee7b2ebc update all panel pages 2016-08-23 20:52:01 +02:00
Corne Oppelaar
414f17476f revamp invites and certificates screen 2016-08-17 17:37:16 +02:00
Corne Oppelaar
72482e4f92 redesign certificates overview and new certificate form 2016-08-09 02:16:01 +02:00
Corne Oppelaar
6027a602ca fix email check 2016-08-07 14:46:54 +02:00
Corné Oppelaar
3998b9ef79 Merge pull request #30 from zerooo-vpn/addEmailToUser
[WIP] Add email to user
2016-08-07 12:38:43 +02:00
Corne Oppelaar
3bae03c387 Merge branch 'master' of github.com:EaterOfCode/zer.ooo into addEmailToUser 2016-08-07 14:38:17 +02:00
Corné Oppelaar
23cdfd3bed
add correct verification 2016-08-07 12:33:57 +02:00
Corne Oppelaar
ec9bedadd2 [WIP] 2016-08-06 21:46:43 +02:00
Corné Oppelaar
78ae1ad30a Merge pull request #31 from zerooo-vpn/master
change release to AGPL
2016-07-01 15:08:04 +02:00
Corne Oppelaar
768969e69a fix license on site 2016-07-01 17:04:01 +02:00
Corne Oppelaar
37f4005c35 change to AGPL license 2016-07-01 17:01:56 +02:00
Corne Oppelaar
dd579b3513 add verify mail and email address saving 2016-06-29 02:07:03 +02:00
Corne Oppelaar
0b9873ef7b add nette/mail 2016-06-29 02:06:44 +02:00
Corne Oppelaar
7bf4e4830f regenerate new models 2016-06-29 02:06:26 +02:00
Corne Oppelaar
28a26883b3 change db schema to reflect new database model 2016-06-29 02:06:09 +02:00
Corné Oppelaar
bb0f12bcbf Merge pull request #29 from zerooo-vpn/FixTechnicalDetailsPage
Fix technical details page
2016-06-25 17:14:42 +02:00
Corne Oppelaar
98d639b990
add server count 2016-06-25 17:13:58 +02:00
Corné Oppelaar
169f705da4 Merge pull request #28 from zerooo-vpn/FixFontAwesome
Fix Firefox issue with FontAwesome.
2016-06-25 17:10:35 +02:00
Corne Oppelaar
7b8fda4f10
add email to register and also save input status after error 2016-06-25 17:02:39 +02:00
Corne Oppelaar
837a990f59
add email to user service 2016-06-25 17:02:17 +02:00
Corne Oppelaar
86f878acae
regen models 2016-06-25 17:01:31 +02:00
Corne Oppelaar
a8f73dd09a
add email to user schema changes 2016-06-25 16:56:38 +02:00
Nienke Dekker
8b820d242d
Fix viewpoets for registration and login pages. 2016-06-25 16:43:13 +02:00
Nienke Dekker
8d372d6460
Add tooltips, change viewport height 2016-06-25 16:34:31 +02:00
Corne Oppelaar
914287873b
add error to install 2016-06-25 15:48:42 +02:00
Nienke Dekker
3435b7236c
First commit of technical details section. 2016-06-25 15:46:09 +02:00
Nienke Dekker
b8f789d604
Fix Firefox issue with FontAwesome. 2016-06-25 14:40:17 +02:00
Corné Oppelaar
929c6d0812 Merge pull request #26 from zerooo-vpn/fixCssThings
Fix css things
2016-06-25 12:11:50 +02:00
Corné Oppelaar
8e0d0e4c89 Merge pull request #27 from krageon/master
Changed 'an zerooo-vpn production' to 'a [...]'
2016-06-25 00:47:03 +02:00
7479525ea6
Changed 'an zerooo-vpn production' to 'a [...]' 2016-06-25 00:43:53 +02:00
Corne Oppelaar
6e311fc9fa Merge branch 'master' of github.com:EaterOfCode/zer.ooo into fixCssThings 2016-06-24 22:40:12 +02:00
Corne Oppelaar
a3c279e351 move third party content to local and fix some minor issues 2016-06-24 22:40:05 +02:00
Corné Oppelaar
9a2110d22b Merge pull request #25 from zerooo-vpn/AddBootstrapToPanel
Add bootstrap to panel
2016-06-24 22:38:35 +02:00