amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1635 commits 8 branches 146 tags 314 MiB
Commit graph

177 commits

Author SHA1 Message Date
Siarhei Puhach
d2d96e9951 Added private_key field to UserHostingkey model, some html updates 2017-07-06 14:18:22 +03:00
Siarhei Puhach
8986aa6550 Added generation button with no field input required (generate ssh key name) 2017-07-06 11:47:12 +03:00
Siarhei Puhach
7cc70a95ac Added new page(Choice ssh key generate/upload), changed design of generate ssh form 2017-07-05 16:57:49 +03:00
siarheipuhach
f49d6b398f Changed ssh keys design(+ mobile ver.) 2017-07-05 08:41:50 +03:00
Siarhei Puhach
b96d13772e SSH keys list template changed 2017-07-04 17:55:43 +03:00
Siarhei Puhach
de0bada84a SSH key change design init 2017-07-04 15:00:08 +03:00
Siarhei Puhach
1f0bb9f72a Merge branch 'master' of https://github.com/siarheipuhach/dynamicweb 
Merge upsteam/master
 2017-06-30 10:03:44 +03:00
Pcoder
69fde64149 Added missing colon 2017-06-29 21:24:52 +02:00
Pcoder
b649bcd87e Fixed a typo 2017-06-29 21:24:04 +02:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Levi Velázquez
8904a14961 Merge branch 'master' into feature/added_localtime 2017-06-23 00:31:23 -05:00
Levi
720270bac5 fixed firefox issue 2017-06-23 00:30:31 -05:00
M.Ravi
aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
M.Ravi
654d73e51d Add some de translations and invoice now called 'Confirm Order' 2017-06-23 02:33:59 +05:30
Levi
8c7687fe7c fixed issue error 500 2017-06-21 13:32:23 -05:00
Levi
de64744120 fixed issue on order view 2017-06-21 13:31:02 -05:00
Levi
1897f4b5f6 fixing date format 2017-06-21 13:28:53 -05:00
Levi
339e20d0b7 changd date format on orders view 2017-06-21 13:24:38 -05:00
M.Ravi
387c45b969 We need the logo in the payment page even when user is not logged in 2017-06-21 23:38:35 +05:30
Levi
f1f6074c78 fixed time 2017-06-21 12:49:29 -05:00
Levi
ed6fdcb049 fixed ssh key time 2017-06-21 12:26:09 -05:00
Levi
d8389993ce Merge branch 'master' into feature/added_localtime 2017-06-21 12:06:58 -05:00
Levi
4f318a6f2d changed UTC to localtime in ssh key view 2017-06-21 11:48:11 -05:00
Levi
9b6bb4eb26 changed UTC to localtime in ssh key view 2017-06-21 11:45:35 -05:00
M.Ravi
c2f8ae1eb3 Fixed a responsive issue in signup/email confirmation 2017-06-17 13:41:18 +05:30
Levi
7a4d3bb41f Merge branch 'master' of github.com:ungleich/dynamicweb 2017-06-15 16:06:11 -05:00
Levi
13ddc8fc66 changed logo to datacenterlight 2017-06-15 16:05:46 -05:00
Levi Velázquez
5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails 
Feature/3296/confirm emails
 2017-06-15 15:22:00 -05:00
Levi Velázquez
93bc6ac458 Merge pull request #344 from pcoder/bug/3256/view_details_500_error 
Bug/3256/view details 500 error
 2017-06-15 13:25:49 -05:00
M.Ravi
09601aefd9 Replaced all GiB to GB 2017-06-15 12:18:38 +05:30
M.Ravi
5b4e9b733d Tentative fix for error 500 on order details page 2017-06-15 07:30:47 +05:30
M.Ravi
412236f6a1 Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange 2017-06-15 02:37:07 +05:30
M.Ravi
3c5cf3f9ec Rearranged navbar menu items 2017-06-13 23:47:57 +05:30
Henry Bravo
be82a63b7a Reduce container in ssh_key and tetextarea 2017-06-11 20:04:06 -05:00
Henry Bravo
225f92caf5 Change To Font Lato in VM Pages and remove messages in login 2017-06-11 19:46:07 -05:00
M.Ravi
bd10d1cf9f Added signup_validate html template. This is an empty template that we use to show appropriate message during email confirmation 2017-06-11 05:10:00 +05:30
Henry Bravo
7004536a19 Fix conflicts 2017-06-09 16:18:41 -05:00
Levi
d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
Henry Bravo
7485c182c4 Redesign vm order page 2017-06-09 13:55:45 -05:00
Levi
a355ae9087 Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop 2017-06-05 22:51:53 -05:00
Henry Bravo
c69694274f Fix conflicts 2017-06-05 14:55:41 -05:00
Levi
484ab5f1c6 fixed payment when user has already a card 2017-06-04 17:41:48 -05:00
Levi
5be46db5a3 Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key 2017-06-04 17:22:52 -05:00
Levi
8adcb75b8c Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-04 17:08:09 -05:00
Levi
ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
Henry Bravo
ba03cf232e 'what is it' section text change and fixed typo 2017-06-03 21:57:21 -05:00
Henry Bravo
9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -05:00
Modulos
346733fbcd Allow users to delete ssh keys 2017-06-03 15:03:55 +02:00
modulos
ab29b138c3 Add delete ssh key modal 2017-06-03 13:33:05 +02:00