28661c0c48
Replaced all occurrences of digitalglarus.ungliech.ch with digitalglarus.ch
2017-09-18 11:57:41 +05:30
e6514f8061
Refactored DCL_ERROR_EMAILS_TO_ADDRESS to DCL_ERROR_EMAILS_TO
2017-09-15 13:10:11 +02:00
a06753ca4b
Use hostname and send celery errors to DCL_ERROR_EMAILS_TO
2017-09-15 13:09:46 +02:00
a4fe2e2db9
Updated SaveSSHKeyTestCase to include add/remove ssh keys
2017-09-14 15:05:28 +02:00
a32bb9b774
We use the default timezone available to celery
2017-09-05 02:26:00 +05:30
2a76167d10
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-24 23:59:09 +05:30
0026874f09
Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages
...
Corrected/added missing google analytics and reformated code
2017-08-24 00:00:22 +02:00
4d18dc6f7c
Corrected/added missing google analytics and reformated code
2017-08-24 01:20:32 +05:30
4cc2e09b0a
Rearranged imports in base.py
2017-08-23 20:18:46 +02:00
82b73df6e7
Added test case to check whether celery task executes properly on production.
2017-08-23 20:12:50 +02:00
6339442bfe
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-21 18:01:28 +02:00
7d7260ce6d
Renamed faq.html to cms_page.html
2017-08-21 17:59:56 +02:00
f28f55c775
faq.html now referred as DCL.Faq
2017-08-19 06:41:29 +05:30
6b7ae88f74
Merged master into task/3622/decouple_opennebula_dcl_flow
2017-08-19 03:24:22 +05:30
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
8029f05824
Added env variable to logger message
2017-08-08 02:12:13 +05:30
26b4feb1d1
Introduced int_env and CELERY_MAX_RETRIES env variable
2017-08-06 18:39:45 +02:00
5a5654be01
Moved CELERY_BROKER_URL and CELERY_RESULT_BACKEND to .env file
2017-08-06 16:51:07 +02:00
68505e73a8
Added django-celery-results and setup redis as backend for celery tasks
2017-08-06 16:32:35 +02:00
d8592fc6d8
Added celery files
2017-08-06 12:30:56 +05:30
0993d8c106
reviewed changes
2017-08-03 22:00:41 +05:30
a2f705f012
Merge branch 'master' into feature/3517/ssh_keys
2017-07-31 18:50:07 +05:30
d565294119
Update base.py
...
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +05:30
925252f1c9
merged master
2017-07-28 16:45:34 +05:30
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
c7feed6a73
Delete commented code
2017-07-13 23:50:11 +03:00
a8be59d7a2
Add GA to all important apps
2017-07-13 22:53:15 +03:00
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
53f797472b
Update base.py
2017-07-07 18:13:00 +03:00
1279d4efbb
Merge branch 'master' into feature/ssh_keys
2017-07-07 17:49:22 +03:00
1a7cefcc54
Merged pcoder/set_debug_false into pcoder-set_debug_false
2017-07-07 04:47:15 +05:30
4bdae326f7
Refactored the call to import local and prod files
2017-07-04 23:16:27 +02:00
6d7a1d4e4a
Added memcached cache
2017-07-04 21:00:00 +02:00
41220ef172
Added bool_env function to retrieve env variable and convert to python boolean
2017-07-04 20:46:42 +02:00
8bb7eee418
Corrected some mistakes
2017-07-04 08:48:04 +02:00
f9c3c80864
Merged the latest master into siarheipuhach-feature/flake8
2017-07-03 23:47:56 +02:00
5ea35bd4d8
add ids for dev and staging server
2017-07-02 23:00:56 +03:00
9431e9846c
Add middleware for fix "get_host() method fails when the host is behind multiple proxies"
2017-06-30 08:44:39 +03:00
2ad984504c
Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID
2017-06-30 01:23:35 +03:00
fcc109b8f5
Merge branch 'master' into feature/flake8
2017-06-29 18:56:50 +03:00
edcfd3e9f4
Added Flake8 lib and fixed PEP8 violations
2017-06-29 17:34:40 +03:00
007fc794c3
Add google analytics to data center light
2017-06-27 23:47:30 +03:00
5e9330102e
Added dcl email parameters to base.py
2017-06-19 12:29:22 +05:30
8acd249b4d
Create Templatetag for change language whit the current path
2017-06-13 22:35:15 -05:00
bc7f90b615
Merge branch 'master' into cleanup_201706
2017-06-05 18:41:22 +02:00
6204cbc990
Add all domains to ALLOwED_HOSTS
2017-06-05 15:29:37 +02:00
e7da97dc7f
Shrink list of web admins
2017-06-03 15:56:36 +02:00
596dde28c5
Delete unused files
2017-06-03 15:56:25 +02:00
c7b59ec762
added web-team@ungleich.ch email for error
2017-05-13 17:59:04 -05:00
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
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
cb4d96604c
Manual merge of develop into opennebula-integration
2017-04-26 10:40:52 +05:30
c938ce738d
Setting the opennebula params from the env
2017-04-26 10:27:22 +05:30
43350869e0
Reverted some files back to as they were in master. They had been reorganized.
2017-04-25 03:55:05 +05:30
1e61ec965d
Some more fixes for the issues of the review of rscnt.
2017-04-25 03:37:50 +05:30
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
af3818d64a
Removed some unwanted changes and prepared for a pull request.
2017-04-24 03:16:43 +05:30
d537fcb118
Manual merge of ungleich/master into opennebula-integration
2017-04-24 03:01:05 +05:30
b363bf5f6a
First working version of opennebula-integration.
2017-03-15 17:32:55 +05:30
5c7712ff88
Merge pull request #158 from ungleich/feature/new_digitalglarus
...
Feature/new digitalglarus
2017-01-06 10:26:01 -05:00
272e414b5c
Merge pull request #157 from levivm/feature/new_digitalglarus
...
Fixed #2789 #2788 #2790 #2812 #2811
2016-12-20 18:08:01 -05:00
65e8c5c6cd
Merge pull request #154 from ungleich/feature/new_digitalglarus
...
Feature/new digitalglarus
2016-12-20 18:06:58 -05:00
abfab6915c
added datacenterlight
2016-12-20 18:05:20 -05:00
rascencio
fc1f97dea9
ref: removing raul.ascencio from prod admins.
2016-12-12 13:20:22 -06:00
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
8d92ebca88
removed stripe keys from settings and script
2016-12-08 20:51:44 -05:00
c18ca3a7df
fixing some problems
2016-12-06 11:23:51 -04:00
33ce7093cb
fix the base.py
2016-12-05 11:56:47 -04:00
402a6d001e
spring 5 without the notice box
2016-12-05 11:24:46 -04:00
855c8f1140
narbar
2016-12-01 00:28:06 -04:00
addf3de67e
fixing the base.py
2016-11-22 11:25:03 -04:30
b299a0383f
terms and conditions
2016-11-21 20:26:03 -04:30
2362413b60
Merge pull request #137 from levivm/feature/new_digitalglarus
...
Feature/new digitalglarus
2016-10-23 18:22:05 -05:00
98c6bb3ec8
added debug=false to prod settings
2016-10-23 18:18:49 -05:00
66533b1c1a
Merge branch 'master' of github.com:ungleich/dynamicweb
2016-08-22 03:14:20 -05:00
57d27e8bc6
added local settings file again
2016-07-29 00:43:41 -05:00
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
da9169c4ce
Added login.html, Added login view , Added login form,Created Donation Django Model
2016-07-19 01:07:49 -05:00
a6ea27696a
fixed tests in order to user permissions
2016-07-10 22:42:06 -05:00
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
3e6502133e
Merge branch 'develop' into feature/hosting_permission
2016-07-09 17:43:28 -05:00
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
a8b9e02ea5
started hosting permissions
2016-06-26 14:50:48 -05:00
a41b75935c
revert django-mailer configuration
2016-06-16 01:19:40 -05:00
6d029fdeb5
Added cron to send email and fixing settings error
2016-06-16 01:04:48 -05:00
a846f42bf6
Added mark a notification as read feature, Fixed some errors
2016-05-29 13:37:43 -05:00
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
88ee543083
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-20 16:43:17 -04:30
5bdcc5d2b2
Fixed Login Error Style , Started view to generating SSH key for a VM
2016-05-20 16:41:42 -04:30
418c257978
delete orders
2016-05-20 15:00:06 +00:00
c8c7926a91
Merge pull request #75 from tmslav/develop
...
Develop
2016-05-20 15:00:41 +02:00
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
c35366d1d6
change db name app_new -> app
2016-05-18 18:44:13 +00:00
5c544e6a8d
Merge branch 'develop'
2016-05-08 18:14:51 +00:00
05e752625e
fix contact ungleich
2016-05-08 19:58:37 +02:00
6e82b50f99
update email sending
2016-05-08 01:04:03 +00:00
7d7c682cec
update from development
2016-05-07 23:02:29 +00:00
fbbee2839c
resolve base.py conflict
2016-05-07 23:05:46 +02:00
14f78893d5
Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking
2016-05-05 01:03:35 -05:00
65e3cdeb94
update dg payment
2016-05-01 14:13:12 +02:00
PCoder
M.Ravi
ARvind Tiwari
Andrii Marynets
Siarhei Puhach
Siarhei Puhach
Henry Bravo
Nico Schottelius
Levi
Modulos
rascencio
unknown
Natacha Quintero
Tom