ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
714 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

714 Commits

Author SHA1 Message Date
Levi 98c1740cd2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 16:16:39 -05:00
Tomislav R 2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
tmslav f01390ec17 Merge pull request #48 from tmslav/develop 
url structure fix ungleich
 2016-04-24 01:16:38 +02:00
Tomislav R c57db296aa url structure fix ungleich 2016-04-24 01:15:58 +02:00
tmslav 0b498dec32 Merge pull request #47 from tmslav/develop 
added dist
 2016-04-23 23:48:38 +02:00
Tomislav R 74ca696bfc added dist 2016-04-23 23:48:03 +02:00
tmslav 12b00348d1 Merge pull request #46 from tmslav/develop 
change remove files loading
 2016-04-23 23:38:54 +02:00
Tomislav R 27d4a43e12 change remove files loading 2016-04-23 23:38:09 +02:00
tmslav f29e15375d Merge pull request #45 from tmslav/develop 
font-awesome local version
 2016-04-23 20:40:02 +02:00
Tomislav R 849d5e313d font-awesome local version 2016-04-23 20:39:02 +02:00
tmslav 5544c40337 Merge pull request #44 from tmslav/develop 
https
 2016-04-23 20:27:55 +02:00
Tomislav R 9215655d6c https 2016-04-23 20:27:13 +02:00
tmslav 17788cafb9 Merge pull request #43 from tmslav/develop 
new url structure
 2016-04-23 20:13:34 +02:00
Tomislav R b72a2795f0 new url structure 2016-04-23 20:12:55 +02:00
rascencio 49f50117d8 Merge branch 'tmslav-updating_calendar' into develop 2016-04-23 19:09:59 +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
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
Tomislav R ae0c404951 digitalglarus booking update 2016-04-23 19:00:20 +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
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
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
Tomislav R b546300891 Merge branch 'develop' into updating_calendar 2016-04-16 03:43:49 +02: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