sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
636 commits 10 branches 82 tags 313 MiB
Commit graph

636 commits

This branch
This branch
All branches
Author SHA1 Message Date
tmslav
81281e9cd7 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
Levi
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
Levi
9fa83e6f9a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-22 19:58:30 -05:00
Levi
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
tmslav
4f8502dfa2 Merge pull request #38 from sgoudelis/hosting-urls 
Added extra URLs for the hosting pages
 2016-04-22 09:59:04 +02:00
tmslav
dede0246ec 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
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
Levi Velázquez
04425f751f Merge pull request #39 from levivm/feature/vm_pricing 
Feature/vm pricing
 2016-04-20 01:02:31 -05:00
Levi
9694681dd2 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
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
Levi
5e1419cd1c registered VM types model in the admin 2016-04-17 20:05:39 -05:00
Levi
d881620c42 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-17 19:52:32 -05:00
Levi
7c891fe9c4 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
7c29726166 Merge pull request #36 from levivm/develop 
fixed login urls
 2016-04-15 22:58:07 -05:00
Levi
5397fd9a63 fixed login urls 2016-04-15 22:57:16 -05:00
Levi Velázquez
90f59286b0 Merge pull request #35 from levivm/develop 
fixing url translations
 2016-04-15 22:41:59 -05:00
Levi
043d5f28c3 fixing url translations 2016-04-15 22:25:57 -05:00
Levi Velázquez
7b875efb22 Merge pull request #34 from levivm/develop 
Adding correct home menu option
 2016-04-15 21:43:13 -05:00
Levi
8ebeb1dc76 Adding correct home menu option 2016-04-15 21:42:21 -05:00
Levi Velázquez
2f4e668371 Merge pull request #33 from levivm/develop 
Develop
 2016-04-15 20:21:39 -05:00
Levi
b0be58ac1d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-15 20:18:54 -05:00
Levi
d2238106e8 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
673fb73209 Merge pull request #32 from levivm/develop 
Fixed admin urls
 2016-04-13 01:27:54 -05:00
Levi
488bb76c76 Fixed admin urls 2016-04-13 01:27:11 -05:00
Levi Velázquez
e8720422fd Merge pull request #31 from levivm/develop 
Integrating Ungleich page into dynamicweb
 2016-04-13 01:11:30 -05:00
Levi
830018f41c Removing files 2016-04-13 01:02:48 -05:00
Levi
363dc15afe Adding .psd to gitignore 2016-04-13 00:50:11 -05:00
Levi
74a4002654 Cleaning files 2016-04-13 00:46:09 -05:00
Levi
a768ce35a2 Cleaning psd files 2016-04-13 00:38:26 -05:00
Levi
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
Levi
202c3f5b46 Moved ungleich landing into django 2016-04-12 22:03:18 -05:00
Levi Velázquez
6f8bb26c95 Merge pull request #29 from levivm/develop 
Develop
 2016-04-12 00:54:02 -05:00
Levi
ce6d98c931 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-12 00:51:02 -05:00
Levi
c5e5640e8d Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi Velázquez
96682e30ed Merge pull request #28 from levivm/develop 
Updated contact page style and changed header bg
 2016-04-10 17:09:49 -05:00
Levi
2f9fa9f8fb Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi Velázquez
2df6899599 Merge pull request #27 from levivm/develop 
Changing database name from app_new to app
 2016-04-10 16:24:21 -05:00
Levi
1ac1e2c4e1 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi Velázquez
534d086836 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
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
tmslav
3c0b414b10 Merge pull request #25 from tmslav/develop 
update staging
 2016-04-10 08:52:03 +02:00
tmslav
923e9930b0 Merge pull request #24 from tmslav/master 
updating staging
 2016-04-10 08:50:55 +02:00
Tomislav R
61a9213279 Merge branch 'master' into develop 2016-04-10 08:43:03 +02:00
Tomislav R
e73d50be19 Merge remote-tracking branch 'upstream/master' 2016-04-10 08:42:33 +02:00
tmslav
f0b089ba8d updated gallery 2016-04-10 06:23:21 +00:00
Tomislav R
0fe1ba241a fixed debug option 2016-04-10 04:52:29 +02:00
tmslav
a61f4f8318 Merge pull request #23 from tmslav/develop 
Develop
 2016-04-10 04:43:19 +02:00
Tomislav R
e24c3d06a4 sorting files 2016-04-10 04:41:36 +02:00
Tomislav R
7815cbeda4 Merge branch 'master' into develop 2016-04-10 04:39:32 +02:00
tmslav
39dedf92d2 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00