Commit graph

153 commits

Author SHA1 Message Date
M.Ravi
7d7260ce6d Renamed faq.html to cms_page.html 2017-08-21 17:59:56 +02:00
PCoder
f28f55c775 faq.html now referred as DCL.Faq 2017-08-19 06:41:29 +05:30
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
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
PCoder
d8592fc6d8 Added celery files 2017-08-06 12:30:56 +05:30
ARvind Tiwari
a2f705f012 Merge branch 'master' into feature/3517/ssh_keys 2017-07-31 18:50:07 +05:30
Pcoder
d565294119 Update base.py
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +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
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
4bdae326f7 Refactored the call to import local and prod files 2017-07-04 23:16:27 +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
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
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
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
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
abfab6915c added datacenterlight 2016-12-20 18:05:20 -05: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
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