Levi Velázquez
0a1cf35770
Merge pull request #116 from levivm/feature/nosystemd
...
Feature/nosystemd
2016-08-15 22:19:23 -05:00
Levi
d4e2e43d0b
Fixed Sign up H2 margin , Added Login Headline, Added Header Background, Changed ungleich logo, Fixed Landing title style, Fixed billing form goes out of background image, Fixed billing address page amount field seems broken, Changed authentication page fonts
2016-08-15 20:45:08 -05:00
Levi
5675c402fa
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-11 01:07:12 -05:00
Levi
6a9d8f2b8b
Deleted old carousel history.html, Added new carousel to history.html, previously on crowdfunding page. Linked 100days/startdigitalglarus to history.html, Fixed contact issue in history.html, Changed index.html background, Changed history.html backend, Delete contact us from history.html, Added Facebook icon on footer
2016-08-09 23:53:49 -05:00
Levi
1697564a22
Merge branch 'feature/nosystemd' into develop
2016-08-09 01:07:39 -05:00
Levi
a36c1f1d83
Merge branch 'develop' of github.com:levivm/dynamicweb into develop
2016-08-09 01:07:08 -05:00
Levi Velázquez
57b660fc19
Merge pull request #113 from levivm/feature/nosystemd
...
#hotfix fixed digitalglarus home
2016-08-06 10:48:57 -05:00
Levi Velázquez
cb55deb5d9
Merge pull request #112 from levivm/feature/nosystemd
...
#hotfix restoring digitalglarus template
2016-08-05 01:20:11 -05:00
Levi Velázquez
0e99639330
Merge pull request #111 from levivm/feature/nosystemd
...
Now if an user after cancel his donation, he make it again, we reacti…
2016-08-05 01:05:12 -05:00
Levi Velázquez
8aee8ed94e
Merge pull request #110 from levivm/feature/nosystemd
...
Feature/nosystemd
2016-08-04 23:50:19 -05:00
Levi
abda918c48
Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html
2016-07-18 21:24:44 -05:00
Levi
e17c006582
#hotfix fixed 404 font issue
2016-07-16 11:58:43 -05:00
Levi
1e18a3c7a9
Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page
2016-07-15 00:14:51 -05:00
Levi Velázquez
a6937fcec1
Merge pull request #109 from levivm/develop
...
Added new 404.html page
2016-07-11 21:19:07 -05:00
Levi
31bbf01f4a
Added new 404.html page
2016-07-11 21:18:19 -05:00
Levi Velázquez
aa88b9c57d
Merge pull request #108 from levivm/develop
...
fixed tests in order to user permissions
2016-07-10 22:42:39 -05:00
Levi
c3c23bfce3
fixed tests in order to user permissions
2016-07-10 22:42:06 -05:00
Levi Velázquez
453d4ab350
Merge pull request #107 from levivm/develop
...
Develop
2016-07-10 22:13:42 -05:00
Levi
2852d3046c
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
f024841c4e
Merge branch 'develop' into feature/hosting_permission
2016-07-09 17:43:28 -05:00
Levi Velázquez
de5fea6dde
Merge pull request #106 from levivm/develop
...
Develop
2016-07-09 17:23:12 -05:00
Levi
bdec86bd8d
Added ungleich landing translation
2016-07-09 17:21:57 -05:00
Levi
8624fb46ed
Added HostingPriceView test, - [ ] Added resolving url test to few views
2016-07-09 16:04:50 -05:00
Levi Velázquez
e6ba8e5917
Merge pull request #105 from levivm/develop
...
Develop
2016-07-07 23:55:30 -05:00
Levi
a5a455923f
#hotfix fixing 404 style
2016-07-07 23:52:24 -05:00
Levi
8682ea7287
#hotfix fixing 404 redirect home
2016-07-07 23:50:02 -05:00
Levi Velázquez
cdb42f0022
Merge pull request #104 from levivm/develop
...
Adding tests
2016-07-07 23:42:14 -05:00
Levi
202562011e
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
e22e25cea0
Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test
2016-07-04 23:44:15 -05:00
Levi Velázquez
47b44e2fed
Merge pull request #103 from levivm/develop
...
fixed digitalglarus post detail view on DE
2016-07-01 00:42:22 -05:00
Levi
9f0694d159
fixed digitalglarus post detail view on DE
2016-07-01 00:40:39 -05:00
Levi Velázquez
ed4ed18861
Merge pull request #102 from levivm/develop
...
Generic view pricing widget, blog fixed, vm details
2016-06-30 01:25:12 -05:00
Levi
4dc6ab1d84
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 Velázquez
a2666f9ab4
Merge pull request #100 from levivm/develop
...
fixed hosting emails
2016-06-26 14:55:33 -05:00
Levi
258728e6e9
fixed hosting emails
2016-06-26 14:54:01 -05:00
Levi
5081de3dfe
started hosting permissions
2016-06-26 14:50:48 -05:00
Levi
38332561d3
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:53:26 -05:00
Levi Velázquez
af38ce71ca
Merge pull request #99 from levivm/develop
...
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:53:11 -05:00
Levi
b85ecd5c38
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:49:46 -05:00
Levi Velázquez
80dcd83777
Merge pull request #98 from levivm/develop
...
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:49:28 -05:00
Levi
44cb3aef4d
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:45:21 -05:00
Levi Velázquez
5939b63dad
Merge pull request #97 from levivm/develop
...
changing defualt 'from email' to no-reply@ungleich.ch
2016-06-24 00:45:11 -05:00
Levi
b2c0c961ef
adding from email for sending emails
2016-06-24 00:40:08 -05:00
Levi Velázquez
1a2a7b49df
Merge pull request #96 from levivm/develop
...
adding "from email" for sending emails
2016-06-24 00:40:05 -05:00
Levi
ea47d39372
updated all email templates with the new logo img
2016-06-24 00:08:51 -05:00
Levi Velázquez
d4c9a8ed7c
Merge pull request #95 from levivm/develop
...
updated all email templates with the new logo img
2016-06-24 00:08:38 -05:00
Levi Velázquez
4b8982adb6
Merge pull request #94 from levivm/develop
...
fixing logo on emails
2016-06-23 23:58:47 -05:00
Levi
a60ab62831
fixing logo on emails
2016-06-23 23:58:02 -05:00
Levi Velázquez
a542de1bd8
Merge pull request #93 from levivm/develop
...
fixing logo on emails
2016-06-23 23:46:30 -05:00
Levi
2f9dde5863
fixing logo on emails
2016-06-23 23:46:25 -05:00
Levi Velázquez
3f467118a8
Merge pull request #92 from levivm/develop
...
changing logo on vm booking emails
2016-06-23 23:38:32 -05:00
Levi
1115e7bc70
changing logo on vm booking emails
2016-06-23 23:38:32 -05:00
Levi Velázquez
9f6c278bf6
Merge pull request #91 from levivm/develop
...
fixing email rendering svg logo
2016-06-23 23:09:03 -05:00
Levi
d94a5e3e66
fixing email rendering svg logo
2016-06-23 23:08:52 -05:00
Levi Velázquez
f551a8fd58
Merge pull request #90 from levivm/develop
...
Create custom user, post languages, languages switcher
2016-06-23 21:35:18 -05:00
Levi
d4bdf65858
As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language. As an user I want to be able to switch languages between EN-DE
2016-06-23 21:32:51 -05:00
Levi Velázquez
2d3e60666c
Merge pull request #89 from levivm/develop
...
Added migrations
2016-06-21 00:23:12 -05:00
Levi
c1db3b99ee
Added migrations
2016-06-21 00:22:57 -05:00
Levi Velázquez
05b8493fe1
Merge pull request #88 from levivm/develop
...
Develop
2016-06-21 00:17:55 -05:00
Levi
104fc37bde
Created reset password email, Added forgot password view, Added forgot password form, Added set new password form, Added set new password view, fixed signup response issue, fixed main menu ungleich button redirect to django-hosting
2016-06-21 00:10:38 -05:00
Levi
0701d35add
Merge branch 'feature/django-mailer' into develop
2016-06-16 21:35:17 -05:00
Levi
e0a27ba602
revert django-mailer configuration
2016-06-16 01:19:40 -05:00
Levi
9f2c78db33
Added cron to send email and fixing settings error
2016-06-16 01:04:48 -05:00
Levi
14905db9dc
changed cancel VM modal message
2016-06-09 23:59:05 -05:00
Levi Velázquez
5845ea7b9f
Merge pull request #87 from levivm/develop
...
changed cancel VM modal message
2016-06-09 23:59:00 -05:00
Levi Velázquez
2d202c9a66
Merge pull request #86 from levivm/develop
...
Cancel VM Plan, receive email after status change
2016-06-09 23:53:09 -05:00
Levi
fd83ad4ffc
As an user I want to be able to cancel my VM Plan subscription. As an user I want to be able to receive an email each time that my VM status changes.
2016-06-09 23:50:49 -05:00
Levi Velázquez
b76c015cec
Merge pull request #85 from levivm/develop
...
As an admin I can change the VM ip using admin panel ,Fixed notificat…
2016-06-07 00:32:07 -05:00
Levi
1d83d4de79
As an admin I can change the VM ip using admin panel ,Fixed notification view count label, Fixed hosting company name on payment view, Added configuration in VM hosting page, Admin can changes the VM configuration using admin panel
2016-06-07 00:29:22 -05:00
Levi Velázquez
025343b96d
Merge pull request #84 from levivm/develop
...
#hotfix email after book vm
2016-06-05 15:50:21 -05:00
Levi
0cb7645b50
#hotfix email after book vm
2016-06-05 15:49:51 -05:00
Levi Velázquez
f5cbeb8e91
Merge pull request #83 from levivm/develop
...
Fixed style errors, login redirect, fixed hosting tests.
2016-06-04 03:02:27 -05:00
Levi
adde97bea3
Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again.
2016-06-04 02:59:37 -05:00
Levi Velázquez
13233d19c7
Merge pull request #82 from levivm/develop
...
Bill user, invoice emails, design fixes.
2016-06-03 01:10:15 -05:00
Levi
8c304dedb9
Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price
2016-06-03 00:59:46 -05:00
Levi
a72c1446b4
Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan
2016-06-03 00:07:47 -05:00
Levi Velázquez
c03ff34aec
Merge pull request #81 from levivm/develop
...
SSH Key, notifications and VM status.
2016-05-30 16:44:31 -05:00
Levi
63eebbb2b0
Added mark a notification as read feature, Fixed some errors
2016-05-29 13:37:43 -05:00
Levi
7a9ea58a89
Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved
2016-05-27 00:51:10 -05:00
Levi
081370c062
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-25 01:23:47 -05:00
Levi
02e716106e
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 Velázquez
d8536dbe5a
Merge pull request #80 from levivm/develop
...
fixed cdn fonts url
2016-05-24 01:27:58 -05:00
Levi
83a5a27791
fixed cdn fonts url
2016-05-24 01:27:10 -05:00
Levi Velázquez
6273144411
Merge pull request #79 from levivm/develop
...
Finished SSH Key generation
2016-05-24 01:22:36 -05:00
Levi
b4164e56ab
Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH
2016-05-24 01:19:49 -05:00
tmslav
35e312411f
Merge pull request #78 from tmslav/develop
...
hosting: https://redmine.ungleich.ch/issues/2292 , fixed footer
2016-05-22 17:37:44 +02:00
Tomislav R
154f6a77bf
hosting: https://redmine.ungleich.ch/issues/2292 , fixed footer
2016-05-22 17:36:28 +02:00
tmslav
a06199448f
Merge pull request #77 from tmslav/develop
...
https://redmine.ungleich.ch/issues/2290
2016-05-21 00:04:41 +02:00
Tomislav R
6eb5565537
https://redmine.ungleich.ch/issues/2290
2016-05-21 00:03:17 +02:00
Levi Velázquez
784ed0976b
Merge pull request #76 from levivm/develop
...
Develop
2016-05-20 16:43:48 -04:30
Levi
419f08aff8
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-20 16:43:17 -04:30
Levi
d4a44b2b6c
Fixed Login Error Style , Started view to generating SSH key for a VM
2016-05-20 16:41:42 -04:30
Tom
b8be9f3915
delete orders
2016-05-20 15:00:06 +00:00
tmslav
bb13644b06
Merge pull request #74 from tmslav/cancel_plans
...
Cancel plans
2016-05-20 14:23:43 +02:00
Tomislav R
9671ec5f05
resolve conflicts
2016-05-20 14:22:51 +02:00
Levi Velázquez
b4fef1e296
Merge pull request #73 from levivm/develop
...
Changed offers in VM pricing, Fixed pricing error changing disk size,…
2016-05-19 01:51:25 -04:30
Levi
768a990040
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
Tomislav R
d3b579a41c
add delete hosting order
2016-05-19 00:58:28 +02:00
Tom
76c0fc092a
Merge remote-tracking branch 'remotes/origin/master' into develop
2016-05-16 23:48:11 +00:00
tmslav
0162038c02
Merge pull request #71 from sgoudelis/bugfix/usermanage#2286
...
Registered CustomUser model in the admin panel.
2016-05-17 01:39:30 +02:00
Efstratios Goudelis
9658d6937a
Registered CustomUser model in the admin panel.
...
Related issue: https://redmine.ungleich.ch/issues/2286
2016-05-16 16:48:26 +03:00
Nico Schottelius
d890770bcc
Merge pull request #70 from sgoudelis/bugfix/blog_publish
...
Fixed issue with publish flag for the Digital Glarus blog
2016-05-16 21:58:04 +09:00
Efstratios Goudelis
8fc0ad20a6
Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now.
...
Related issue: https://redmine.ungleich.ch/issues/2284
2016-05-16 15:56:05 +03:00
Nico Schottelius
8d531a2995
Merge pull request #69 from sgoudelis/bugfix/blog_publish
...
Fixed issue with publish flag not be respected when getting blog post…
2016-05-16 21:39:16 +09:00
Efstratios Goudelis
9c83f29b94
Fixed issue with publish flag not be respected when getting blog posts for the site blog.
...
Related issue: https://redmine.ungleich.ch/issues/2284
2016-05-16 15:34:45 +03:00
Nico Schottelius
7c88ebe9f5
Merge branch 'master' of github.com:ungleich/dynamicweb
2016-05-14 22:30:05 +02:00
Nico Schottelius
ec3b872650
remove open calls
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2016-05-14 22:29:57 +02:00
Nico Schottelius
c37094cb35
add mindmap
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2016-05-14 22:29:33 +02:00
Levi Velázquez
b1e585026d
Merge pull request #68 from levivm/develop
...
removed RailsBetaUser
2016-05-14 02:21:32 -04:30
Levi
cd0bbd4063
removed RailsBetaUser
2016-05-14 02:20:45 -04:30
Levi Velázquez
9ec6f679c4
Merge pull request #67 from levivm/develop
...
Added Test to order and vms detail/list view
2016-05-14 02:15:08 -04:30
Levi
8c71468921
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-14 02:12:53 -04:30
Levi
e8e58066a0
Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view
2016-05-14 02:12:42 -04:30
Levi Velázquez
87480b6f14
Merge pull request #66 from levivm/develop
...
added model mommy to requirements.txt
2016-05-12 02:11:39 -05:00
Levi
32d9b6719d
added model mommy to requirements.txt
2016-05-12 02:11:18 -05:00
Levi Velázquez
eebf7abb66
Merge pull request #65 from levivm/develop
...
Added hosting view tests
2016-05-12 02:04:59 -05:00
Levi
fbb19c55f5
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-12 01:58:23 -05:00
Levi
8be59499b6
Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data
2016-05-12 01:57:34 -05:00
Tom
32b64f2eb7
Merge branch 'develop'
2016-05-08 18:14:51 +00:00
tmslav
700406a16c
Merge pull request #63 from tmslav/develop
...
fix contact ungleich
2016-05-08 20:01:38 +02:00
Tomislav R
949d2a3e58
fix contact ungleich
2016-05-08 19:58:37 +02:00
Tom
43da718153
ungleich template - fix unused translatation tag
2016-05-08 15:01:59 +00:00
tmslav
2c0f8c4530
update email sending
2016-05-08 01:04:03 +00:00
Tom
44d0046ccc
media
2016-05-08 00:21:30 +00:00
Tom
be1b03df85
update from development
2016-05-07 23:02:29 +00:00
tmslav
f64c42e554
Merge pull request #62 from tmslav/develop
...
Develop
2016-05-07 23:07:22 +02:00
Tomislav R
e137e8a26e
resolve base.py conflict
2016-05-07 23:05:46 +02:00
Tomislav R
073c9bf192
Merge remote-tracking branch 'upstream/develop' into develop
2016-05-07 23:02:49 +02:00
Levi Velázquez
3cad994970
Merge pull request #61 from levivm/develop
...
Develop
2016-05-05 09:03:44 -05:00
Levi
9415041f64
Merge branch 'feature/vm_pricing' into develop
2016-05-05 01:04:02 -05:00
Levi
342512036d
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
Levi
ca136d4e47
Merge branch 'develop' into feature/vm_pricing
2016-05-04 22:07:30 -05:00
Levi
6e8004bfd0
Changed hostingorder to m2m with vm plan model
2016-05-04 22:06:49 -05:00
Tomislav R
5480b51e92
Updated INSTALLATION doc
2016-05-04 20:13:31 +02:00
Tomislav R
9cfdeb73c6
Updated INSTALLATION doc
2016-05-04 20:12:58 +02:00
Tomislav R
f536da4e01
Updated INSTALLATION doc
2016-05-04 20:11:15 +02:00
Tom
f1716410e6
payment bug resolve
2016-05-04 17:59:25 +00:00
Tom
9f859ef116
remove debugger
2016-05-04 17:45:41 +00:00
Tom
786dbbf895
remove debugger
2016-05-04 17:45:12 +00:00
tmslav
4c68bd8dbc
Merge pull request #59 from tmslav/develop
...
Develop
2016-05-04 17:42:36 +02:00
Tomislav R
9f2b3a2a31
resolve merge conflicts
2016-05-04 17:36:54 +02:00
Levi
1486843af0
Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page
2016-05-04 00:16:41 -05:00
Levi
bbddb48ecc
Changed redirect url after login
2016-05-03 01:06:43 -05:00
Levi
7d697b3c3a
Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page
2016-05-03 00:59:40 -05:00
Tomislav R
3b387d61db
added test
2016-05-02 02:00:38 +02:00
Tomislav R
45730e4eb1
update dg payment
2016-05-01 14:13:12 +02:00
Levi Velázquez
8a6c05eb7d
Merge pull request #55 from levivm/feature/vm_pricing
...
Fixed error creating stripe customer
2016-04-30 14:30:54 -05:00
Levi
c4bf4fc6ff
Fixed error creating stripe customer
2016-04-30 14:29:16 -05:00
Levi Velázquez
9db711d686
Merge pull request #54 from levivm/feature/vm_pricing
...
Added redirect urls after signup/login
2016-04-30 13:57:11 -05:00
Levi
4d47564ea6
Added redirect urls after signup/login
2016-04-30 13:55:55 -05:00
Levi Velázquez
b06b0f9ebb
Merge pull request #53 from levivm/feature/vm_pricing
...
Fixed requirements file
2016-04-29 23:54:45 -05:00
Levi
8f82a5b88e
Fixed requirements file
2016-04-29 23:53:36 -05:00
Levi Velázquez
90833d5a19
Merge pull request #52 from levivm/feature/vm_pricing
...
Fixed requirements file
2016-04-29 23:44:15 -05:00
Levi
46893a5f60
Fixed requirements file
2016-04-29 23:43:34 -05:00
Levi Velázquez
fa29204a1a
Merge pull request #51 from levivm/feature/vm_pricing
...
Fixes digitalglarus urls, Added translated text to ungleich landing, Created Order view
2016-04-29 01:58:42 -05:00
Levi Velázquez
9502580030
Merge pull request #50 from levivm/feature/vm_pricing
...
Handled stripe payment errors , Added payment invoice
2016-04-29 01:53:55 -05:00
Levi
3459dc6cbc
Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template
2016-04-29 01:53:24 -05:00
Tomislav R
e0fc542673
fix merge conflict
2016-04-28 19:47:44 +02:00
Tomislav R
0fc96880ef
update dg
2016-04-28 19:42:01 +02:00
Levi
e7c8258427
Handled stripe payment errors , Added invoice template, Added view to handle invoice data
2016-04-27 01:54:15 -05:00
Levi Velázquez
a5c24855a4
Merge pull request #49 from levivm/feature/vm_pricing
...
Stripe integration
2016-04-27 01:53:38 -05:00
Levi
fdf8722c8f
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
Levi
981be2dcf4
Merge branch 'develop' into feature/vm_pricing
2016-04-24 19:20:17 -05:00
Levi
f1dfc205ac
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-24 19:19:47 -05:00
Levi
84e5178e9b
Merge branch 'develop' into feature/vm_pricing
2016-04-24 16:18:37 -05:00
Levi
b770a9b2cc
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-24 16:16:39 -05:00
Tomislav R
fcc1f8fb4b
reverted changes to url structure
2016-04-24 23:16:38 +02:00
tmslav
7ac715684e
Merge pull request #48 from tmslav/develop
...
url structure fix ungleich
2016-04-24 01:16:38 +02:00
Tomislav R
07a6473f62
url structure fix ungleich
2016-04-24 01:15:58 +02:00
tmslav
3f4d29c38f
Merge pull request #47 from tmslav/develop
...
added dist
2016-04-23 23:48:38 +02:00
Tomislav R
84ce57b2c2
added dist
2016-04-23 23:48:03 +02:00
tmslav
2d74d06691
Merge pull request #46 from tmslav/develop
...
change remove files loading
2016-04-23 23:38:54 +02:00
Tomislav R
2f7b9e4ad4
change remove files loading
2016-04-23 23:38:09 +02:00
tmslav
4c7c3c5141
Merge pull request #45 from tmslav/develop
...
font-awesome local version
2016-04-23 20:40:02 +02:00
Tomislav R
8ea8ff216c
font-awesome local version
2016-04-23 20:39:02 +02:00
tmslav
f1da9bd24b
Merge pull request #44 from tmslav/develop
...
https
2016-04-23 20:27:55 +02:00
Tomislav R
8bf18c2833
https
2016-04-23 20:27:13 +02:00
tmslav
0150801e93
Merge pull request #43 from tmslav/develop
...
new url structure
2016-04-23 20:13:34 +02:00
Tomislav R
5d0b49b6d9
new url structure
2016-04-23 20:12:55 +02:00
a6256964e8
Merge branch 'tmslav-updating_calendar' into develop
2016-04-23 19:09:59 +02:00
f7ec020838
: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
tmslav
9057b3ac7e
Merge pull request #41 from levivm/feature/vm_pricing
...
Billing Address Form added, Fixes on login / signup, Stripe test.
2016-04-23 19:01:16 +02:00
Tomislav R
213f295394
digitalglarus booking update
2016-04-23 19:00:20 +02:00
Levi
4777484245
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
Levi
2827275bdc
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-22 19:58:30 -05:00
Levi
0bad2870f9
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
82377a2dcc
: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
4a68857717
wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
...
Conflicts:
dynamicweb/urls.py
2016-04-22 10:04:00 +02:00
tmslav
de70ae3acd
Merge pull request #38 from sgoudelis/hosting-urls
...
Added extra URLs for the hosting pages
2016-04-22 09:59:04 +02:00
tmslav
cccea5d67a
Merge pull request #40 from levivm/feature/vm_pricing
...
Added pricing selector to hosting pages. Login/Signup implemented
2016-04-22 09:58:29 +02:00
Levi
64a484e749
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
Levi Velázquez
2e4c7caf9c
Merge pull request #39 from levivm/feature/vm_pricing
...
Feature/vm pricing
2016-04-20 01:02:31 -05:00
Levi
cb51e08cef
Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change
2016-04-19 01:04:42 -05:00
Efstratios Goudelis
4442501786
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
Levi
3015399692
registered VM types model in the admin
2016-04-17 20:05:39 -05:00
Levi
368cfcecd1
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-17 19:52:32 -05:00
Levi
05e73b1d5e
Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database
2016-04-17 19:52:19 -05:00
Levi Velázquez
8a6b4d695d
Merge pull request #36 from levivm/develop
...
fixed login urls
2016-04-15 22:58:07 -05:00
Levi
bdbf328375
fixed login urls
2016-04-15 22:57:16 -05:00
Levi Velázquez
8efa851430
Merge pull request #35 from levivm/develop
...
fixing url translations
2016-04-15 22:41:59 -05:00
Levi
5198333013
fixing url translations
2016-04-15 22:25:57 -05:00
Levi Velázquez
7c3bb07c9a
Merge pull request #34 from levivm/develop
...
Adding correct home menu option
2016-04-15 21:43:13 -05:00
Levi
1cfc52cf94
Adding correct home menu option
2016-04-15 21:42:21 -05:00
Tomislav R
98cc38b1cf
Merge branch 'develop' into updating_calendar
2016-04-16 03:43:49 +02:00
Levi Velázquez
c80eb8bdad
Merge pull request #33 from levivm/develop
...
Develop
2016-04-15 20:21:39 -05:00
Levi
e075be8534
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-15 20:18:54 -05:00
Levi
ab75b12ffa
Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page
2016-04-15 20:18:29 -05:00
Levi Velázquez
3f9b4abc6b
Merge pull request #32 from levivm/develop
...
Fixed admin urls
2016-04-13 01:27:54 -05:00
Levi
997f3145db
Fixed admin urls
2016-04-13 01:27:11 -05:00
Levi Velázquez
14f5faf843
Merge pull request #31 from levivm/develop
...
Integrating Ungleich page into dynamicweb
2016-04-13 01:11:30 -05:00
Levi
85c0b8348f
Removing files
2016-04-13 01:02:48 -05:00
Levi
6c11aaaa0c
Adding .psd to gitignore
2016-04-13 00:50:11 -05:00
Levi
8544efc898
Cleaning files
2016-04-13 00:46:09 -05:00
Levi
2395b2fe97
Cleaning psd files
2016-04-13 00:38:26 -05:00
Levi
fd66c33299
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
Levi
5a04fc4969
Moved ungleich landing into django
2016-04-12 22:03:18 -05:00
Levi Velázquez
09a787e1ac
Merge pull request #29 from levivm/develop
...
Develop
2016-04-12 00:54:02 -05:00
Levi
1469f077bd
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-12 00:51:02 -05:00
Levi
b29ee74634
Added translation support for ungleich contact page,
2016-04-12 00:50:15 -05:00
Levi Velázquez
c6feaba777
Merge pull request #28 from levivm/develop
...
Updated contact page style and changed header bg
2016-04-10 17:09:49 -05:00
Levi
20a59f461d
Updated contact page style and changed header bg
2016-04-10 17:09:16 -05:00
Levi Velázquez
f52a94db11
Merge pull request #27 from levivm/develop
...
Changing database name from app_new to app
2016-04-10 16:24:21 -05:00
Levi
fce44b2ec5
Changing database name from app_new to app
2016-04-10 16:23:30 -05:00
Levi Velázquez
f6cb9abc42
Merge pull request #26 from levivm/develop
...
Moved contact form model in order to be reusable by ungleich app, Cre…
2016-04-10 16:13:56 -05:00
Levi
942464f6f6
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
Tomislav R
db78247771
Merge remote-tracking branch 'upstream/design_membership' into updating_calendar
2016-04-10 21:30:11 +02:00
tmslav
cf0fec706c
Merge pull request #25 from tmslav/develop
...
update staging
2016-04-10 08:52:03 +02:00
tmslav
d3122cc3fa
Merge pull request #24 from tmslav/master
...
updating staging
2016-04-10 08:50:55 +02:00
Tomislav R
e1676a98aa
Merge branch 'master' into develop
2016-04-10 08:43:03 +02:00
Tomislav R
b661b5e7e6
Merge remote-tracking branch 'upstream/master'
2016-04-10 08:42:33 +02:00
tmslav
aa592156fd
updated gallery
2016-04-10 06:23:21 +00:00
Tomislav R
1190bd9018
fixed debug option
2016-04-10 04:52:29 +02:00
tmslav
6bf2a1ec46
Merge pull request #23 from tmslav/develop
...
Develop
2016-04-10 04:43:19 +02:00
Tomislav R
d9487848f0
sorting files
2016-04-10 04:41:36 +02:00
Tomislav R
2125bc7059
Merge branch 'master' into develop
2016-04-10 04:39:32 +02:00
tmslav
c7500175e9
Update INSTALLATION.rst
2016-04-10 04:20:15 +02:00
tmslav
1ebaaef8c3
Update INSTALLATION.rst
2016-04-10 03:47:17 +02:00
Tomislav R
45af2dbc05
doc
2016-04-10 03:42:26 +02:00
tmslav
99ad6852b7
production changes
2016-04-10 01:05:33 +00:00
de2f79e8ce
Merge branch 'develop'
2016-04-09 20:09:52 +02:00
Levi Velázquez
3961f63656
Merge pull request #22 from levivm/develop
...
added translation text for form contact form fields
2016-04-09 13:05:49 -05:00
Levi
a575465a80
added translation text for form contact form fields
2016-04-09 13:00:16 -05:00
08019b9d33
Merge branch 'develop'
2016-04-09 19:56:45 +02:00
Levi Velázquez
0e1f2f3fdf
Merge pull request #21 from levivm/develop
...
Added supporters placeholders
2016-04-09 04:06:19 -05:00
Levi
4beb09dcd1
Added supporters placeholders
2016-04-09 04:03:28 -05:00
Levi Velázquez
d6fbc281cb
Merge pull request #17 from levivm/develop
...
Develop
2016-04-09 03:12:56 -05:00
Levi
c33b85626a
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-09 03:00:41 -05:00
tmslav
c232d3e7f7
Merge pull request #20 from tmslav/develop
...
updated development from master
2016-04-09 09:58:37 +02:00
Tomislav R
e9c29fb7f9
Merge remote-tracking branch 'upstream/develop' into develop
2016-04-09 09:57:56 +02:00
Levi
0e65c1e717
allowing urls translation into german using .po files
2016-04-09 02:53:05 -05:00
tmslav
a79c78d43e
Merge pull request #19 from tmslav/master
...
home added and assigned right template, fixed up blog for digitalglarus
2016-04-09 09:12:03 +02:00
Tomislav R
10d3e236ee
home added and assigned right template
2016-04-09 08:51:20 +02:00
tmslav
29aba3d6aa
Merge pull request #18 from tmslav/master
...
fixed language choosing for digitalglarus
2016-04-09 03:57:26 +02:00
Levi
50a973c28d
changed form email contact
2016-04-08 20:11:29 -05:00
Levi
ebe214d95b
Create contact page in German and made it editable
2016-04-08 19:45:28 -05:00
Tomislav R
031ce0b5f3
Merge remote-tracking branch 'upstream/master'
2016-04-09 01:02:08 +02:00
Tomislav R
1cc0358cb0
added language selection
2016-04-09 01:01:08 +02:00
Levi
a680de0567
cleaning code
2016-04-07 00:30:18 -05:00
Levi
bb8c5314bc
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
Levi
d7cb1fbbc6
cleaning code
2016-04-03 21:47:21 -05:00
Levi
93e1641203
remove templates
2016-04-03 21:46:17 -05:00
Levi
b2b788d779
template moved
2016-04-03 21:28:04 -05:00
Levi
979a0bb24d
Merge branch 'develop' into feature/supporter
2016-04-03 21:15:05 -05:00
Levi
ceeed874d2
fixed supporter page, change footer info, added support-us page, changed contact email
2016-04-03 20:39:57 -05:00
1a5b1ec6e1
Merge branch 'master' into develop
2016-04-04 03:33:25 +02:00
3f1f43752f
Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop
2016-04-04 03:32:50 +02:00
a2a3e6156c
blog dg fix
2016-04-04 03:32:22 +02:00
tmslav
725a1d1e3d
Merge pull request #16 from tmslav/master
...
updated ungleich
2016-04-03 11:47:04 +02:00
Tomislav R
949ee20a8a
updated ungleich
2016-04-03 11:46:25 +02:00
tmslav
a4de615301
Merge pull request #15 from tmslav/master
...
updated main pages links
2016-04-01 12:38:25 +02:00
Tomislav R
1d18894b60
updated main pages links
2016-04-01 12:37:01 +02:00
tmslav
7b0f0db338
Merge pull request #14 from ungleich/master
...
dynamicweb
2016-03-31 20:31:46 +02:00
tmslav
eb9df736bb
Merge pull request #13 from tmslav/master
...
removed db
2016-03-31 18:16:50 +02:00
Tomislav R
40cdf8a11f
removed
2016-03-31 18:15:37 +02:00
tmslav
2d2f7ca6f4
Merge pull request #11 from tmslav/master
...
added media
2016-03-26 17:33:09 +01:00
Tomislav R
e13947df8d
added media
2016-03-25 19:39:50 +01:00
tmslav
e78fe3ca01
Merge pull request #10 from tmslav/master
...
added db
2016-03-25 19:36:38 +01:00
Tomislav R
c77f80dc45
added db
2016-03-25 19:35:52 +01:00
tmslav
fb539cbe92
Merge pull request #9 from tmslav/master
...
merge blog fix
2016-03-25 19:22:04 +01:00
Tomislav R
26de99e773
fixed orphaned plugins and add post functionality
2016-03-25 19:18:07 +01:00
Sanghee Kim
17a9245d21
calendar added
2016-03-23 18:25:49 +01:00
Tomislav R
f5ece43b25
added missing blog templates
2016-03-23 14:25:15 +01:00
Tomislav R
28df2526a8
update django settings for local and production
2016-03-22 22:09:22 +01:00
Tomislav R
1f2c94a053
removed duplicated djangocms
2016-03-22 21:09:59 +01:00
Your Name
1ce3f4bbac
resolve merge conflict
2016-03-22 15:16:21 +00:00
Your Name
767d24adb7
resolve merge conflict
2016-03-22 15:12:47 +00:00
tmslav
d56bbd5eab
Merge pull request #8 from tmslav/blog_fix
...
Blog update
2016-03-22 01:23:02 +01:00
Tomislav R
6b78bac53b
Blog update
2016-03-22 01:21:50 +01:00
0d04a18a0d
server push
2016-03-19 21:28:58 +01:00
0f3ebfdbba
settings difference push
2016-03-16 15:23:15 +01:00
tmslav
3d23db0c73
Merge pull request #7 from tmslav/membership_payment
...
Membership payment
2016-03-16 15:16:11 +01:00
Tomislav R
6319515bb4
fixed new user registration
2016-03-16 15:10:48 +01:00
Tomislav R
ff9a6e1b2b
fixed requirements
2016-03-16 00:26:49 +01:00
jiyounyoon
2013317420
Add new files for design
2016-03-14 14:13:31 -07:00
Tomislav R
e5d2d74450
payment app
2016-03-11 19:42:45 +01:00
Tomislav R
3ca9ef5900
fixed login
2016-03-07 19:25:01 +01:00
Tomislav R
2477fbc11b
update req file and update directory structure
2016-03-07 19:20:45 +01:00
Tomislav R
b8824b3f46
fixed CustomUser
2016-03-07 18:39:24 +01:00
Tomislav R
3157db235a
test
2016-03-07 17:49:02 +01:00
Your Name
268c3ebdbb
Merge branch 'master' of https://github.com/ungleich/dynamicweb
2016-03-05 20:15:44 +00:00
Your Name
8f4dd038bd
Merge remote-tracking branch 'refs/remotes/origin/master'
...
mmit.
2016-03-05 19:57:41 +00:00
Your Name
958ed9572b
added python path
...
Signed-off-by: Your Name <you@example.com>
2016-03-05 19:49:22 +00:00
Your Name
ec789b625e
changes on prod - master
2016-03-05 19:46:46 +00:00
Sanghee Kim
530ca19556
Import cal + css from Jiyoun
2016-03-04 21:15:48 +01:00
3ec565c178
Merge pull request #6 from tmslav/update_django_version
...
Update django version
2016-03-04 13:06:43 -06:00
Tomislav R
9f944ca1ed
init membership
2016-03-03 22:55:23 +01:00
Tomislav R
9eed348b62
Merge branch 'master' into update_django_version
2016-03-03 22:32:36 +01:00
Tomislav R
bfaa88e774
test
2016-03-03 22:22:37 +01:00
Sanghee Kim
c7a9eb1e59
error button added
2016-03-02 20:06:31 +01:00
Sanghee Kim
5606421739
text change
2016-03-02 19:42:39 +01:00
Sanghee Kim
1fef3c0b90
button color
2016-03-02 18:00:55 +01:00
Sanghee Kim
c929823c2b
button color
2016-03-02 00:18:52 +01:00
Sanghee Kim
b2e62b1fd7
button color
2016-03-02 00:16:00 +01:00
Sanghee Kim
fa5c914c40
button color
2016-03-02 00:09:14 +01:00
상희 김
6cd443c568
color changes
2016-03-01 21:52:04 +01:00
Tomislav R
5fbde4878d
update
2016-03-01 21:24:51 +01:00
Tomislav R
abbc2982e3
django version update #3
2016-02-29 23:28:31 +01:00
66d042dbe7
one column supporters
2016-02-14 11:52:05 -06:00
24df1a4dfc
Merge branch 'release/supporters-widget'
2016-02-14 10:11:06 -06:00
8392ed521f
Merge branch 'feature/supporters' into develop
2016-02-14 09:47:15 -06:00
f25a4f3d57
added supporters plugin
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-14 09:47:07 -06:00
d1c1882831
added supporters plugin
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-13 14:28:46 -06:00
상희 김
6b4b2a6be9
payment page draft
2016-02-11 16:22:15 +01:00
상희 김
caecf7c8f6
membership page design draft
2016-02-10 23:50:10 +01:00
bead7f9626
supporter description can be null
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:32:18 -06:00
862ce849f2
dg: supporters styles
2016-02-08 04:31:53 -06:00
111506d885
...
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:23:46 -06:00
eb9032592e
DG: added link to supporters...
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:21:33 -06:00
218fccf8af
adding assets to DG base template
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:14:00 -06:00
39be946638
DG: base template should show cms toolar
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:11:26 -06:00
e64fa30eef
deleted counter on letscowork item
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 03:41:47 -06:00
f4b6f43db6
adding placeholder for index gallery
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 03:01:34 -06:00
94ac23cdf4
fixed migrations
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:58:40 -06:00
d0afe37078
added digital glarus migrations
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:43:52 -06:00
ed08e54a55
added digital glarus admin
2016-02-08 02:43:08 -06:00
e4328f94d7
added digitalglarus gallery template
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:53 -06:00
3d4fb0dd1b
added plugins for digitalglarus
2016-02-08 02:42:26 -06:00
aa62bd16b8
added models for galleries and supporters
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:01 -06:00
f352f487ca
added supporters admin
2016-02-08 02:41:39 -06:00
2325d5288d
supporters description should be text field
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:19:11 -06:00
06c0b3ec55
added supporters migration
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:03:13 -06:00
0051981f07
updated requirements
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:02:56 -06:00
b9efa57eb6
supporters: better style for names
2016-02-03 07:36:52 -06:00
559fe2f698
adding supporters view
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 07:27:29 -06:00
8b8d7733d3
dynamic year for hosting template footer
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 05:24:58 -06:00
742ca48d36
Merge branch 'release/jazz-changes'
2015-11-29 08:38:18 -06:00
7481d18089
language option text changed
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-29 08:14:08 -06:00
eb9a337be5
Merge branch 'develop'
2015-11-14 17:29:45 -06:00
23f38df1cd
added one column template
2015-11-14 16:29:05 -06:00
f9a58697fc
added one column
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-14 15:58:17 -06:00
6a517b4e24
Merge branch 'release/ungleich-fixes'
2015-11-05 01:40:27 -06:00
1960f62d2c
digitalglarus: blog detail small "ugly" fix
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-05 01:02:41 -06:00
8e297fcb87
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
671c66b297
blog.ungleich: only show root pages on menu
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:59:50 -06:00
f9d555c9cf
Merge branch 'feature/django-settings' into develop
2015-11-02 16:03:00 -06:00
f5ca1934c0
dynamicweb/urls: removing static() call
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
be7579134f
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
813db391cf
dynamicweb/wsgi: using settings.prod module on production
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:32 -06:00
ca3031dde2
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
cf9a9f082a
gitignore: added .idea folder and .env file
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:44:31 -06:00
f885036d0e
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