moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3371 commits 11 branches 113 tags 314 MiB
Commit graph

283 commits

Author SHA1 Message Date
PCoder
6b7ae88f74 Merged master into task/3622/decouple_opennebula_dcl_flow 2017-08-19 03:24:22 +05:30
PCoder
73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
PCoder
8029f05824 Added env variable to logger message 2017-08-08 02:12:13 +05:30
PCoder
227d3a20a5 Removed __future__ 2017-08-08 01:57:29 +05:30
M.Ravi
29b28d551c Fixed flake8 lint warnings 2017-08-06 22:19:27 +02:00
M.Ravi
26b4feb1d1 Introduced int_env and CELERY_MAX_RETRIES env variable 2017-08-06 18:39:45 +02:00
M.Ravi
5a5654be01 Moved CELERY_BROKER_URL and CELERY_RESULT_BACKEND to .env file 2017-08-06 16:51:07 +02:00
M.Ravi
68505e73a8 Added django-celery-results and setup redis as backend for celery tasks 2017-08-06 16:32:35 +02:00
M.Ravi
477c8e81a4 Added default celery.py code 2017-08-06 15:10:26 +02:00
M.Ravi
d6d0b9c8c0 Added default init code for celery 2017-08-06 15:08:46 +02:00
PCoder
d8592fc6d8 Added celery files 2017-08-06 12:30:56 +05:30
ARvind Tiwari
0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
ARvind Tiwari
a2f705f012 Merge branch 'master' into feature/3517/ssh_keys 2017-07-31 18:50:07 +05:30
Pcoder
8a9f130832 Merge pull request #421 from pcoder/feature/enable_logging 
Introduced ENABLE_DEBUG_LOGGING
 2017-07-28 22:45:25 +02:00
Pcoder
d565294119 Update base.py 
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
 2017-07-29 02:02:40 +05:30
Pcoder
308851285e Removed patterns import 2017-07-29 01:48:56 +05:30
ARvind Tiwari
925252f1c9 merged master 2017-07-28 16:45:34 +05:30
M.Ravi
e8e7be7618 Updated base.py to check if ENABLE_LOGGING is True and in that case enable the logger to write DEBUG level logs to a file debug.log in project's root directory 2017-07-28 12:05:14 +02:00
Andrii Marynets
ea97a6bf83 Fix url for datecenterlight. Need to add / 2017-07-19 22:28:11 +03:00
Andrii Marynets
3fc1cd9463 Fix url which will be deprecated in Django 1.10 2017-07-19 00:39:52 +03:00
Andrii Marynets
ddd0594976 Fix url warning in dynamicweb 2017-07-18 23:18:23 +03:00
Andrii Marynets
c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets
a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00
PCoder
9b10ac7deb Moved google_analytics code to templates/analytics folder. It was causing wrong footer to be loaded. 2017-07-09 19:21:30 +05:30
Siarhei Puhach
53f797472b Update base.py 2017-07-07 18:13:00 +03:00
Siarhei Puhach
1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
M.Ravi
3304d862cb Moved static images urlpattern out of DEBUG case 2017-07-05 00:07:06 +02:00
M.Ravi
4bdae326f7 Refactored the call to import local and prod files 2017-07-04 23:16:27 +02:00
M.Ravi
6d7a1d4e4a Added memcached cache 2017-07-04 21:00:00 +02:00
M.Ravi
41220ef172 Added bool_env function to retrieve env variable and convert to python boolean 2017-07-04 20:46:42 +02:00
M.Ravi
8bb7eee418 Corrected some mistakes 2017-07-04 08:48:04 +02:00
M.Ravi
f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +02:00
Andrii Marynets
5ea35bd4d8 add ids for dev and staging server 2017-07-02 23:00:56 +03:00
Andrii Marynets
9431e9846c Add middleware for fix "get_host() method fails when the host is behind multiple proxies" 2017-06-30 08:44:39 +03:00
Andrii Marynets
2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +03: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
Andrii Marynets
007fc794c3 Add google analytics to data center light 2017-06-27 23:47:30 +03:00
M.Ravi
5e9330102e Added dcl email parameters to base.py 2017-06-19 12:29:22 +05:30
Henry Bravo
8acd249b4d Create Templatetag for change language whit the current path 2017-06-13 22:35:15 -05:00
Nico Schottelius
bc7f90b615 Merge branch 'master' into cleanup_201706 2017-06-05 18:41:22 +02:00
Nico Schottelius
6204cbc990 Add all domains to ALLOwED_HOSTS 2017-06-05 15:29:37 +02:00
Nico Schottelius
e7da97dc7f Shrink list of web admins 2017-06-03 15:56:36 +02:00
Nico Schottelius
596dde28c5 Delete unused files 2017-06-03 15:56:25 +02:00
M.Ravi
dec1ccd180 Created url for buy button on datacenterlight home page and redirection 
of ^hosting/ endpoint to take to hosting app's login page.
 2017-05-14 12:44:11 +02:00
Levi
c7b59ec762 added web-team@ungleich.ch email for error 2017-05-13 17:59:04 -05:00
Modulos
b7e8eceb25 Add opennebula api urls and add delete vm api 2017-05-11 17:39:59 +02: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
Raul Ascencio
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
dca2250378 fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug 2016-08-15 23:56:14 -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
cb520f6b58 Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app. 2016-07-22 01:24:32 -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
e90c5fece0 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -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