Commit graph

95 commits

Author SHA1 Message Date
Levi
c7b59ec762 added web-team@ungleich.ch email for error 2017-05-13 17:59:04 -05:00
Modulos
df777f384d Initial commit
Please Note:
This app is going to be developed in a TDD style. Please add test first
and then the corresponding code. This way we can be sure everything
works and it should help us coordinate our work.
2017-05-09 16:33:56 +02:00
M.Ravi
68e81472d5 Fixed a bug related to incorrect opennebula parameter. Added python oca's github repo to the requirements.txt. 2017-04-26 23:26:35 +05:30
M.Ravi
cb4d96604c Manual merge of develop into opennebula-integration 2017-04-26 10:40:52 +05:30
M.Ravi
c938ce738d Setting the opennebula params from the env 2017-04-26 10:27:22 +05:30
M.Ravi
43350869e0 Reverted some files back to as they were in master. They had been reorganized. 2017-04-25 03:55:05 +05:30
M.Ravi
1e61ec965d Some more fixes for the issues of the review of rscnt. 2017-04-25 03:37:50 +05:30
M.Ravi
a8952700d6 Partial fixes for issues pointed by @rscnt
- Moved opennebula constants to base.py
- Refactored all opennebula functions from admin.py to opennebula_functions.py
- string#format for some strings
- Renamed my_view function to show_vms
- Added logger to show logs of exceptions generated
2017-04-24 18:51:11 +02:00
M.Ravi
af3818d64a Removed some unwanted changes and prepared for a pull request. 2017-04-24 03:16:43 +05:30
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
M.Ravi
b363bf5f6a First working version of opennebula-integration. 2017-03-15 17:32:55 +05:30
Levi Velázquez
5c7712ff88 Merge pull request #158 from ungleich/feature/new_digitalglarus
Feature/new digitalglarus
2017-01-06 10:26:01 -05:00
Levi Velázquez
272e414b5c Merge pull request #157 from levivm/feature/new_digitalglarus
Fixed #2789 #2788  #2790 #2812 #2811
2016-12-20 18:08:01 -05:00
Levi Velázquez
65e8c5c6cd Merge pull request #154 from ungleich/feature/new_digitalglarus
Feature/new digitalglarus
2016-12-20 18:06:58 -05:00
Levi
abfab6915c added datacenterlight 2016-12-20 18:05:20 -05:00
fc1f97dea9 ref: removing raul.ascencio from prod admins. 2016-12-12 13:20:22 -06:00
Levi Velázquez
eac1dcbfb3 Merge pull request #153 from levivm/feature/new_digitalglarus
removed stripe keys from settings and script
2016-12-08 20:57:43 -05:00
Levi
8d92ebca88 removed stripe keys from settings and script 2016-12-08 20:51:44 -05:00
unknown
c18ca3a7df fixing some problems 2016-12-06 11:23:51 -04:00
unknown
33ce7093cb fix the base.py 2016-12-05 11:56:47 -04:00
unknown
402a6d001e spring 5 without the notice box 2016-12-05 11:24:46 -04:00
unknown
855c8f1140 narbar 2016-12-01 00:28:06 -04:00
Natacha Quintero
addf3de67e fixing the base.py 2016-11-22 11:25:03 -04:30
Natacha Quintero
b299a0383f terms and conditions 2016-11-21 20:26:03 -04:30
Levi Velázquez
2362413b60 Merge pull request #137 from levivm/feature/new_digitalglarus
Feature/new digitalglarus
2016-10-23 18:22:05 -05:00
Levi
98c6bb3ec8 added debug=false to prod settings 2016-10-23 18:18:49 -05:00
Levi
66533b1c1a Merge branch 'master' of github.com:ungleich/dynamicweb 2016-08-22 03:14:20 -05:00
Levi
57d27e8bc6 added local settings file again 2016-07-29 00:43:41 -05:00
Levi
4580a75f89 Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators 2016-07-27 00:08:45 -05:00
Levi
da9169c4ce Added login.html, Added login view , Added login form,Created Donation Django Model 2016-07-19 01:07:49 -05:00
Levi
a6ea27696a fixed tests in order to user permissions 2016-07-10 22:42:06 -05:00
Levi
4352094680 Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission 2016-07-10 22:08:51 -05:00
Levi
3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi
b34d84657e Added HostingUserLoginForm test, Added HostingUserSignupForm test, Added PasswordResetRequestForm Test, Added SetPasswordForm test, Created custom 404 page 2016-07-07 23:35:50 -05:00
Levi
a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi
a41b75935c revert django-mailer configuration 2016-06-16 01:19:40 -05:00
Levi
6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Levi
a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -05:00
Levi
b443d4d21e Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM 2016-05-25 01:23:32 -05:00
Levi
88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
418c257978 delete orders 2016-05-20 15:00:06 +00:00
tmslav
c8c7926a91 Merge pull request #75 from tmslav/develop
Develop
2016-05-20 15:00:41 +02:00
Levi
e26eecf2eb Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message 2016-05-19 01:47:16 -04:30
tmslav
c35366d1d6 change db name app_new -> app 2016-05-18 18:44:13 +00:00
Tom
5c544e6a8d Merge branch 'develop' 2016-05-08 18:14:51 +00:00
Tomislav R
05e752625e fix contact ungleich 2016-05-08 19:58:37 +02:00
tmslav
6e82b50f99 update email sending 2016-05-08 01:04:03 +00:00
Tom
7d7c682cec update from development 2016-05-07 23:02:29 +00:00
Tomislav R
fbbee2839c resolve base.py conflict 2016-05-07 23:05:46 +02:00