4c5ff149f7
Some multisite parameters
2018-02-17 16:52:54 +01:00
be3aeb45e7
Remove urls2.py
2018-02-17 11:33:48 +01:00
bca2956e06
Rename urls1.py to urls_multi.py
2018-02-17 11:33:28 +01:00
c1c8b38cf2
Update multisite cms urls, aliases and fallback urls
2018-02-17 11:30:36 +01:00
df35fd1f35
Add urls for example1 and example2
2018-02-15 17:58:30 +01:00
d7d831a831
Comment out debug_toolbar for DEBUG version
2018-02-15 17:57:54 +01:00
bea1f40b1b
Add multisite dependent apps and corresponding settings
2018-02-15 17:37:51 +01:00
cb5dd8a592
REmove aldryn_newsblog for the moment
2018-02-15 11:58:44 +01:00
a30e8a6adf
Configure multisite SITE_ID
2018-02-15 10:58:06 +01:00
6a9232851a
Set CMS_PERMISSION True for per page access control
2018-02-13 02:40:29 +01:00
7f5866b777
Move djangocms_admin_style above django.contrib.auth in the
...
INSTALLED_APPS
2018-02-13 02:39:07 +01:00
b9c53717e3
Merge branch 'master' into task/3713/clean_up_css
2018-02-08 17:11:41 +05:30
dd9b0d8fd9
Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX
2018-01-08 19:50:42 +01:00
0697492ab8
removed unused css files
2018-01-08 07:36:30 +05:30
ace2abc47e
Obtain email host, port and tls settings from env
2017-12-31 00:58:37 +01:00
77209921f9
Some more refactoring
2017-12-01 21:03:59 +01:00
b6e734d84e
Refactor code
2017-11-29 07:32:17 +01:00
6e82add935
Rename debug.log to django-debug.log and refactor MODULES_TO_LOG_LEVEL
2017-11-29 07:07:03 +01:00
137b45c12c
Enable logging custom modules
2017-11-29 06:45:09 +01:00
4367b9e58a
Add ungleich cms page template
2017-11-17 16:32:40 +01:00
3d192ed59f
Replace alplora.ch with .hack4glarus.ch
2017-10-21 08:33:37 +02:00
38330d562c
Remove unused cms config from base.py
2017-10-18 23:29:57 +02:00
e563ae642f
Merge branch 'master' into feature/glasfaser_cms_template
2017-10-18 18:24:53 +02:00
f6468a7c8c
First attempt to services section
...
- base.py: add settings to load GlasfaserServicesPlugin by default
- glasfaser_cms_page.html: create a placeholder for services
- cms_plugins.py: add the plugin code
- models.py: add UngelichTextSectionWithImage model
2017-10-18 09:10:50 +02:00
b6f1309735
Add glasfaser_cms_page.html
2017-10-17 09:06:45 +02:00
24cce4eed7
- Remove registration link from DG registration email
...
- Remove multiple declared settings
2017-10-16 20:53:51 +02:00
8678f7f8ea
Remove unused import
2017-10-12 00:32:47 +02:00
695a8687fd
first iteration
2017-10-10 00:04:19 +05:30
3a33dd2035
Add CSRF_FAILURE_VIEW
2017-10-01 20:14:46 +02:00
faa26a05dd
Reverted back some lines for preserving format
2017-09-22 08:51:35 +02:00
2b0dbfa1e5
Added /cms prefix to django-cms urls
2017-09-22 08:47:42 +02:00
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
f9abdfe1bc
Merged upstream master into task/3731/cdist_ssh_key_handler
2017-09-09 13:44:46 +05:30
db891aaa1e
hosting navbar changed and consistent with dcl navbar
2017-09-07 21:01:17 +05:30
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
227d3a20a5
Removed __future__
2017-08-08 01:57:29 +05:30
29b28d551c
Fixed flake8 lint warnings
2017-08-06 22:19:27 +02:00
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
477c8e81a4
Added default celery.py code
2017-08-06 15:10:26 +02:00
d6d0b9c8c0
Added default init code for celery
2017-08-06 15:08:46 +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
8a9f130832
Merge pull request #421 from pcoder/feature/enable_logging
...
Introduced ENABLE_DEBUG_LOGGING
2017-07-28 22:45:25 +02:00
d565294119
Update base.py
...
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +05:30
308851285e
Removed patterns import
2017-07-29 01:48:56 +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
ea97a6bf83
Fix url for datecenterlight. Need to add /
2017-07-19 22:28:11 +03:00
3fc1cd9463
Fix url which will be deprecated in Django 1.10
2017-07-19 00:39:52 +03:00
ddd0594976
Fix url warning in dynamicweb
2017-07-18 23:18:23 +03: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
3304d862cb
Moved static images urlpattern out of DEBUG case
2017-07-05 00:07:06 +02:00
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
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
c7b59ec762
added web-team@ungleich.ch email for error
2017-05-13 17:59:04 -05:00
b7e8eceb25
Add opennebula api urls and add delete vm api
2017-05-11 17:39:59 +02: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
PCoder
M.Ravi
Arvind Tiwari
Nico Schottelius
Andrii Marynets
Siarhei Puhach
Siarhei Puhach
Henry Bravo
Nico Schottelius
Levi
Modulos