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
b19e33b8da
added test
2016-05-02 02:00:38 +02:00
65e3cdeb94
update dg payment
2016-05-01 14:13:12 +02:00
69f9f4a416
fix merge conflict
2016-04-28 19:47:44 +02:00
a493ad225d
update dg
2016-04-28 19:42:01 +02:00
bf334a38d4
Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer
2016-04-26 01:16:03 -05:00
f5978a7da9
Merge branch 'develop' into feature/vm_pricing
2016-04-24 19:20:17 -05:00
34fcb403c7
Merge branch 'develop' into feature/vm_pricing
2016-04-24 16:18:37 -05:00
2dff11d446
reverted changes to url structure
2016-04-24 23:16:38 +02:00
c57db296aa
url structure fix ungleich
2016-04-24 01:15:58 +02:00
rascencio
c653917358
:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar
...
Conflicts:
dynamicweb/urls.py
2016-04-23 19:08:23 +02:00
ae0c404951
digitalglarus booking update
2016-04-23 19:00:20 +02:00
5456c4c341
Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows
2016-04-23 02:22:44 -05:00
38801abed7
Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors
2016-04-22 08:36:38 -05:00
rascencio
4389230b60
:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop
...
Conflicts:
dynamicweb/settings-test/__init__.py
requirements.txt
templates/cms/ungleich.ch/_footer.html
templates/cms/ungleich.ch/_header_base.html
templates/cms/ungleich.ch/_menu.html
templates/cms/ungleich.ch/base.html
templates/cms/ungleich.ch/blog.html
templates/cms/ungleich.ch/page.html
templates/cms/ungleichch/__init__.py
templates/cms/ungleichch/_footer.html
templates/cms/ungleichch/_header_base.html
templates/cms/ungleichch/_menu.html
templates/cms/ungleichch/base.html
templates/cms/ungleichch/blog.html
templates/cms/ungleichch/page.html
ungleich/templates/cms/ungleichch/_footer.html
ungleich/templates/cms/ungleichch/_header_base.html
ungleich/templates/cms/ungleichch/_menu.html
ungleich/templates/cms/ungleichch/base_ungleich.html
ungleich/templates/cms/ungleichch/blog_ungleich.html
ungleich/templates/cms/ungleichch/page.html
2016-04-22 10:08:33 +02:00
rascencio
f4fb538b9e
wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
...
Conflicts:
dynamicweb/urls.py
2016-04-22 10:04:00 +02:00
4e23adcea6
Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors
2016-04-20 01:03:32 -05:00
805707e905
Added extra URLs for the hosting pages:
...
/djangohosting/
/nodehosting/
Also fixed a small typo in hosting/templates/hosting/rails.html
Related tickets:
https://redmine.ungleich.ch/issues/2225
https://redmine.ungleich.ch/issues/1620
https://redmine.ungleich.ch/issues/1621
2016-04-18 12:16:29 +03:00
5397fd9a63
fixed login urls
2016-04-15 22:57:16 -05:00
488bb76c76
Fixed admin urls
2016-04-13 01:27:11 -05:00
c09fc89197
Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls
2016-04-13 00:31:19 -05:00
1ac1e2c4e1
Changing database name from app_new to app
2016-04-10 16:23:30 -05:00
7dd4f7e70a
Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms .
2016-04-10 16:12:43 -05:00
61a9213279
Merge branch 'master' into develop
2016-04-10 08:43:03 +02:00
0fe1ba241a
fixed debug option
2016-04-10 04:52:29 +02:00
e24c3d06a4
sorting files
2016-04-10 04:41:36 +02:00
afc7c68cb7
production changes
2016-04-10 01:05:33 +00:00
45aaec38cf
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-09 03:00:41 -05:00
ec12689904
Merge remote-tracking branch 'upstream/develop' into develop
2016-04-09 09:57:56 +02:00
d90a95a3d4
allowing urls translation into german using .po files
2016-04-09 02:53:05 -05:00
36b99b93ef
home added and assigned right template
2016-04-09 08:51:20 +02:00
a45f019a14
Create contact page in German and made it editable
2016-04-08 19:45:28 -05:00
f667aae38e
Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch
2016-04-07 00:26:50 -05:00
rascencio
0ccf491441
Merge branch 'master' into develop
2016-04-04 03:33:25 +02:00
rascencio
67002a0a03
Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop
2016-04-04 03:32:50 +02:00
24badb1a9c
updated ungleich
2016-04-03 11:46:25 +02:00
5fd4275046
updated main pages links
2016-04-01 12:37:01 +02:00
ddb4de2954
fixed orphaned plugins and add post functionality
2016-03-25 19:18:07 +01:00
105dad3b9f
update django settings for local and production
2016-03-22 22:09:22 +01:00
18c75cf00e
removed duplicated djangocms
2016-03-22 21:09:59 +01:00
08e47294cd
resolve merge conflict
2016-03-22 15:16:21 +00:00
d57fc21784
resolve merge conflict
2016-03-22 15:12:47 +00:00
ca033be061
Blog update
2016-03-22 01:21:50 +01:00
rascencio
039399b95b
server push
2016-03-19 21:28:58 +01:00
rascencio
b7b0be4497
settings difference push
2016-03-16 15:23:15 +01:00
0a7dd2fa3d
fixed new user registration
2016-03-16 15:10:48 +01:00
baef7e4aa8
fixed requirements
2016-03-16 00:26:49 +01:00
6223f4a1ef
payment app
2016-03-11 19:42:45 +01:00
f82e0604ca
update req file and update directory structure
2016-03-07 19:20:45 +01:00
5c6e0cf7c6
fixed CustomUser
2016-03-07 18:39:24 +01:00
e7f11e9556
test
2016-03-07 17:49:02 +01:00
de875f80de
Merge remote-tracking branch 'refs/remotes/origin/master'
...
mmit.
2016-03-05 19:57:41 +00:00
e99f23551b
changes on prod - master
2016-03-05 19:46:46 +00:00
7936e5dfe5
update
2016-03-01 21:24:51 +01:00
0558d6e396
django version update #3
2016-02-29 23:28:31 +01:00
rascencio
cc9959d632
settings/base: refactor - pep8, also added djangocms-blog parler conf
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-05 01:02:18 -06:00
rascencio
d55a02c015
dynamicweb/urls: removing static() call
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
rascencio
55d1c94c38
dynamicweb/settings: local is now using DEBUG=True
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 15:59:23 -06:00
rascencio
e863a8c037
dynamicweb/settings: base, using PROJECT_ROOT instead of BASE_DIR
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 15:58:52 -06:00
rascencio
7aa5586ed3
dynamicweb/wsgi: using settings.prod module on production
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:32 -06:00
rascencio
bec5a7319d
dynamicweb/urls: fetch project settings instead of project settings module
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:04 -06:00
rascencio
aec2cd4298
dynamicweb: added settings module with different files for each env
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:44:18 -06:00
rascencio
05c8bf3d37
dynamicweb: deleted old settings files
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:41:21 -06:00
rascencio
fd3dd6ba46
digitalglarus: changing lang menu content.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 19:31:40 -06:00
rascencio
a4c3c341a3
digitalglarus: changes on urls
2015-10-04 16:48:33 -06:00
rascencio
1b17e2aac1
digitalglarus: fix urls for blog.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:38:53 -06:00
rascencio
0827c6f2ff
digitalglarus: moving digital glarus static url.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:20:39 -06:00
rascencio
9d38d3aee6
digitalglarus: i18n django-cms conf
2015-10-04 09:38:01 -06:00
rascencio
df9b0eacaa
Merge branch 'feature/digital.glarus.german' into develop
2015-10-04 09:23:56 -06:00
rascencio
4b69077414
dynamicweb: settings, added German lang, changed templates.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 08:08:19 -06:00
rascencio
0a83b1494d
dynamicweb: hotfix railshosting
2015-09-22 05:28:34 -06:00
rascencio
e91b87a889
urls: removed railshosting
2015-09-15 14:46:19 -06:00
rascencio
81207b8e12
Merge branch 'develop' of git-ungleich:dynamicweb into develop
2015-09-15 11:16:02 -06:00
rascencio
086e72c5c6
settings: python-memcache -> pylibmc
2015-09-15 10:05:46 -06:00
rascencio
1338b94e07
project: urls, added i18n routes
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-15 08:57:56 -06:00
874fdf85a2
read secret key from file
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-03 20:05:08 +02:00
51373f3c22
read secret key from file
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-03 20:04:12 +02:00
2bf346495e
begin refactor to /hosting/
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:20:08 +02:00
e8455e4e46
do not list vanity domains anymore - nginx should filter them
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-14 23:35:28 +02:00
51a398927f
Merge branch 'master' into feature/notifybymail
2015-08-09 22:15:29 +02:00
a665472c32
Quickfix: add vanity domains to allowed_hosts
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-01 01:05:19 +02:00
54387c05d8
Begin to refactor / cleanup hostings
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 19:07:29 +02:00
rascencio
27a0fc1c59
requirements: added djangocms-page-meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
rascencio
c6e44f702d
settings: added django-meta configuration.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
rascencio
717f1a7268
deleted ckeditor settings
2015-06-13 22:41:29 -06:00
rascencio
8e87a27c48
settings: use placeholder for blog post.
...
Add a TextFieldPlugin to the blog post
content placeholder by default.
The content added to the model for the articles
is just a TextField, so we loose every plugin
interaction.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 22:35:25 -06:00
rascencio
ed2012cd40
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
rascencio
181ca7cb59
settings: bootstrap3 and djangocms-blog
...
+ Now BLOG_USE_PLACEHOLDER is False, this should
give us a HTML Text field for the article body.
+ The URLs for the bootstrap and jquery cnd location
changed, now there should not be problem fetching them
over https
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 13:47:45 -06:00
640f99bbed
mount djangocms on / again - found working nginx config
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 21:45:33 +02:00
da0ece6d63
digital_glarus -> digitalglarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
46ce08909d
mount cms below cms - easier for nginx mapping
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 21:16:08 +02:00
rascencio
ae0ece8f18
settings: the migration module for django_cms_text_ckeditor changed.
...
It would be better to use an stable.requirements.txt
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 01:49:48 -06:00
rascencio
de74539fa6
settings: options for text editor and let host use x forwarded
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:32:11 -06:00
rascencio
9fe61554a7
settings: fixed typo on media.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 04:52:53 -06:00
rascencio
411588d6d3
Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1
2015-05-30 23:22:31 -06:00
rascencio
5ef00d1bb9
config: added admin
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:49 -06:00
rascencio
5d9c306573
Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
...
Conflicts:
dynamicweb/settings.py
Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
Added railshosting url.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:29:33 -06:00
rascencio
ff742091c5
settings: added memcached config.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:20 -06:00
6aaa04eaa2
get railshosting running
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:41:43 +02:00
rascencio
bad0870035
Added ungleich app to extend Page models.
...
Ungleich app has a model called UngleichPage,
this model has an attribute called image_header
which will be used to set the background image for
the page header.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 00:33:35 -06:00
rascencio
d6fdaea4ed
settings: added django_compressor
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 01:31:44 -06:00
rascencio
0a9955986e
requirements: Added django-bootstrap3
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 00:02:05 -06:00
rascencio
9e995c66d4
settings: changed CMS_TEMPLATE_DIR value.
...
- For the SITE_ID=1, templates will be looked
on the first entry for TEMPLATE_DIRS option.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:51:23 -06:00
rascencio
dec8dd7aad
settings: fixed typo.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:43:18 -06:00
rascencio
3bca8a22df
settings: added template dirs.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 02:17:05 -06:00
rascencio
36f0ec962e
settings: moved 'djangocms_admin_style' on INSTALLED_APP
2015-05-21 01:44:31 -06:00
rascencio
7aa821fdfd
urls: added taggit_autosuggest.url, djangocms-blog
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:29:42 -06:00
rascencio
46332a208c
settings: how, did I? confuse template with core?
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:24:56 -06:00
rascencio
5ef77152c1
urls: imports, forgot, dumb.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:22 -06:00
rascencio
063d278304
settings: added locale middleware
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:08 -06:00
rascencio
3ba99ee417
settings: fixed migrations calls.
...
The migrations for the new version of
django-cms were in cms/migrations/* not
cms/migrations_django/* .
- Fixed: local_settings import.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:54 -06:00
rascencio
e7b8fcc9b8
local_settings: in example call settings ok.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:09 -06:00
rascencio
7cdd9d2859
settings: Replaced ROOT_PATH call with BASE_DIR.
...
custom.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:36:08 -06:00
rascencio
e939806380
settings: fixed references on vars.
...
None != nil, too much ruby.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:34:24 -06:00
rascencio
fe8e6d13d1
settings: added APP_ROOT_ENDPOINT, fixed reference
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:33:10 -06:00
rascencio
7a713041aa
urls: added django-cms urls to project urls.py
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:30:03 -06:00
rascencio
1c95a518d9
settings: ckeditr ingration with django-filer.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:24:49 -06:00
rascencio
440e449229
settings: added migrations & thumbnail_processors
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:23:45 -06:00
rascencio
e97f2b8d3b
settings: Added TEMPLATE_DIRS tuple and MEDIA_*
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:57:00 -06:00
rascencio
38a5e1e7ec
settings: added template_processors for django cms
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:42:05 -06:00
rascencio
e98abedf2e
settings: added django-cms middlewares.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:39:30 -06:00
rascencio
d2e978caeb
settings: adapting settings for django1.7
...
- Fixed: call to local.local_settings module.
- Added: TEMPLATE_CONTEXT_PROCESSORS tuple,
django 1.7 requirement.
- Added: SITE_ID variable.
- Added: 'django.contrib.sites' to INSTALLED_APPS
tuple for django 1.7 compatibility.
- Fixed: Languages code settings.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:38:22 -06:00
rascencio
4563872d75
settings: added apps for django-cms
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:06:24 -06:00
rascencio
b77d1db911
settings: added local_settings.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 20:57:22 -06:00
5238b257c4
do not print - but ignore if localsettings are not existing
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 11:58:43 +02:00
9b48d37674
postgres module
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 01:24:40 +02:00
cccd076a3b
update db to postgres
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 01:22:20 +02:00
04c50ec314
support local settings
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 01:19:55 +02:00
0c3fcdee29
setup new static dir
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-12 23:44:30 +02:00
9350814f57
add detail view
...
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-05-02 19:00:38 +02:00
5d1b26d4f7
add first view to digital.glarus
...
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-05-02 17:15:20 +02:00
cdd6998301
register app
...
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-05-02 17:07:08 +02:00
086195073b
Init
...
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-05-02 01:30:30 +02:00
Levi
tmslav
rascencio
Efstratios Goudelis
Your Name
Nico Schottelius
Nico Schottelius