433 commits

Author	SHA1	Message	Date
PCoder	79f4b38e4c	Refactored user activation email	2017-09-02 12:24:10 +05:30
PCoder	39b996ea1a	Merge branch 'task/3318/mail_style_fix' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3318/mail_style_fix	2017-09-02 11:03:05 +05:30
Arvind Tiwari	f0bca697b1	fix	2017-09-02 03:20:32 +05:30
Arvind Tiwari	e524281d16	Merge pull request #466 from pcoder/task/3709/faq_tos_cms_template ... Task/3709/Improvements to Data Center Light CMS template	2017-09-02 02:27:46 +05:30
Arvind Tiwari	979844e55b	hosting payment and datacenterlight payment files supported	2017-09-02 02:02:05 +05:30
Arvind Tiwari	ffa0abee34	contact link fix	2017-09-01 02:16:18 +05:30
Arvind Tiwari	b1baf564db	navbar-header clickable, contact href fixed, highlights focus color fixed	2017-09-01 02:05:24 +05:30
Arvind Tiwari	fa538e7747	landing buttons fixed	2017-09-01 01:32:06 +05:30
Arvind Tiwari	5550867870	navbar link hash fixed, footer links fixed	2017-09-01 01:27:44 +05:30
Arvind Tiwari	3ed2399337	merge master	2017-09-01 00:39:01 +05:30
Arvind Tiwari	d1f5ead9a0	place order msg posiotion fixed for mobile	2017-08-31 21:26:39 +05:30
PCoder	51190a5546	Added page_title in the title tag and the page title text	2017-08-31 00:36:19 +05:30
PCoder	a7b1819d04	Merge branch 'master' into task/3709/faq_tos_cms_template	2017-08-31 00:10:02 +05:30
PCoder	28bcef082c	Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message	2017-08-27 16:41:39 +05:30
PCoder	6cca92ec3a	Reformatted dcl's _navbar.html. ... Attention: Some lines are over 120 char limit as multiline templatetags is not supported.	2017-08-27 16:37:49 +05:30
M.Ravi	b044acab5d	Refactored class names to better names	2017-08-27 16:37:49 +05:30
M.Ravi	597541a2ee	Updated _navbar to show menu on other pages except for index and whydcl	2017-08-27 16:37:49 +05:30
M.Ravi	8caeaf0217	Added cms.css and renamed faq.html to cms_page.html	2017-08-27 16:37:48 +05:30
PCoder	189adbadfb	Added cms_tags, sekizai_tags and cms_toolbar	2017-08-27 16:37:48 +05:30
PCoder	cd67bb9938	Added faq.html cms template	2017-08-27 16:37:48 +05:30
PCoder	6c1307d1d3	Reverted back to original title in base.html	2017-08-26 21:01:21 +05:30
PCoder	af713a0e96	cms_page.html: Added placeholder for title tag	2017-08-26 20:49:17 +05:30
PCoder	0be3266ed3	Moved cms toolbar before title tag	2017-08-26 20:46:51 +05:30
PCoder	2a76167d10	Merge branch 'master' into task/3709/faq_tos_cms_template	2017-08-24 23:59:09 +05:30
M.Ravi	7153b635e5	Removed (incl. VAT) text in hosting,dcl payment template	2017-08-24 13:29:39 +02:00
PCoder	f2b0ff04ca	Added text and styles for monthly payment clarification	2017-08-24 13:41:48 +05:30
PCoder	6c80f94f67	Reformatted dcl's _navbar.html. ... Attention: Some lines are over 120 char limit as multiline templatetags is not supported.	2017-08-21 23:16:55 +05:30
M.Ravi	696af58bff	Refactored class names to better names	2017-08-21 18:00:41 +02:00
M.Ravi	c8dcd65adc	Updated _navbar to show menu on other pages except for index and whydcl	2017-08-21 17:52:57 +02:00
M.Ravi	090f338878	Added cms.css and renamed faq.html to cms_page.html	2017-08-21 17:51:38 +02:00
Arvind Tiwari	06c68873ae	downtime.html modified as a static html page	2017-08-20 03:59:24 +05:30
Arvind Tiwari	0e72f8a436	downtime page	2017-08-20 03:30:10 +05:30
Arvind Tiwari	65ac2df002	dropdown style changed to match landing page style	2017-08-20 01:46:26 +05:30
PCoder	687cf96287	Added cms_tags, sekizai_tags and cms_toolbar	2017-08-19 06:39:56 +05:30
PCoder	17fbaa59be	Added faq.html cms template	2017-08-19 06:37:40 +05:30
ARvind Tiwari	451f2a141e	file reformated	2017-08-08 22:46:00 +05:30
ARvind Tiwari	5cea467deb	master merged	2017-08-07 22:23:51 +05:30
ARvind Tiwari	d93942fa0b	heading sizes changed	2017-08-04 18:32:34 +05:30
ARvind Tiwari	6cef45beee	lead line break and alignment fixed	2017-08-04 17:20:53 +05:30
PCoder	94bc552f75	Resolved conflicts	2017-08-04 03:25:47 +05:30
ARvind Tiwari	8edbd29fad	navbar made white, dropdown fix	2017-08-03 23:18:58 +05:30
ARvind Tiwari	fda20eacd6	translation fix and font-weight bold	2017-08-03 03:12:40 +05:30
ARvind Tiwari	a3d5c81530	navbar fixed on payment, order-success, order-confirmation	2017-08-03 02:35:44 +05:30
Pcoder	4d33837069	Merge pull request #420 from tiwariav/task/3553 ... why datacenterlight page, 'we bring the future' section layout	2017-08-02 22:57:00 +02:00
ARvind Tiwari	8aac161196	Merge branch 'master' into task/3354/modal_restyling	2017-07-31 20:17:17 +05:30
ARvind Tiwari	bb061c67d0	Merge branch 'master' into task/3553	2017-07-31 18:17:30 +05:30
ARvind Tiwari	6b77d2eaff	Merge branch 'master' into task/3553	2017-07-31 18:14:02 +05:30
PCoder	dc5d45d674	Added trans tag to All rights reserved	2017-07-31 01:00:43 +05:30
ARvind Tiwari	6c63797e7c	merged PR #413	2017-07-29 18:51:13 +05:30
ARvind Tiwari	391d123f31	nav js modified	2017-07-29 18:37:56 +05:30
ARvind Tiwari	10108f7d93	merged master	2017-07-28 17:45:38 +05:30
ARvind Tiwari	d6b3ee5e09	merged master	2017-07-28 17:12:14 +05:30
ARvind Tiwari	9bd9ec5971	merged master	2017-07-28 16:48:50 +05:30
Arvind Tiwari	2724cbd375	merged from master	2017-07-28 16:43:03 +05:30
Pcoder	53fc982837	Merge pull request #418 from pcoder/task/3615/decouple_landing_page_from_opennebula ... Task/3615/decouple landing page from opennebula	2017-07-27 23:34:49 +02:00
Pcoder	cb4d827f0b	Merge pull request #417 from ungleich/siarheipuhach-task3577 ... Siarheipuhach task3577 Added backend cpu, ram, ssd fields validation.	2017-07-27 22:39:44 +02:00
Pcoder	8dd1cbda19	Merge pull request #415 from tiwariav/bugfix/3553/navbar ... Task #3553 fix page "blinks" on click on navbar link	2017-07-27 21:55:27 +02:00
ARvind Tiwari	33c56b8890	why datacenterlight page, 'we bring the future' section layout changed to flex and mobile layout fixed	2017-07-27 18:35:17 +05:30
ARvind Tiwari	08155c379b	Merge branch 'master' into task/3354/modal_restyling	2017-07-27 16:02:39 +05:30
M.Ravi	f3cfe19e68	Reformatted the template file and used opennebula_vm_template_id instead of template_id	2017-07-26 20:38:53 +02:00
ARvind Tiwari	2c7a42e447	removed class url from <a> tags which redirect to other page	2017-07-26 16:54:49 +05:30
PCoder	fff468f95f	Merge branch 'task3577' of https://github.com/siarheipuhach/dynamicweb into siarheipuhach-task3577	2017-07-26 01:30:24 +05:30
Pcoder	a05b5b6918	Merge pull request #412 from amarynets/bugfix/change_text_on_button ... Change text on button Order now -> Continue!	2017-07-25 20:36:13 +02:00
ARvind Tiwari	8e1a5a0221	added back href to links, removed blinking	2017-07-25 19:44:19 +05:30
ARvind Tiwari	0e4a488dc1	footer links :hover :fpcus :active color changed to #ddd	2017-07-25 18:59:07 +05:30
ARvind Tiwari	1e55c6679a	removed the language dropdown, replaced with link to the only other language	2017-07-25 18:17:59 +05:30
ARvind Tiwari	7319cc4e1d	language options using bootstrap dropdown	2017-07-24 22:16:37 +05:30
Andrii Marynets	0db218cfbf	Change text on button Order now!	2017-07-24 18:52:28 +03:00
ARvind Tiwari	918e13bf91	modal close button thinner, some icons changed, vertical alignment changed to middle	2017-07-24 18:52:23 +05:30
ARvind Tiwari	c26e9a692a	social icons underbars removed	2017-07-21 21:10:33 +05:30
Polycarp Okock	032059c965	Merge branch 'master' into bugfix/#3553-2	2017-07-20 23:30:04 +03:00
Andrii Marynets	72ece2ec29	Merge branch 'master' into bugfix/hover_on_mobile_device_#3588	2017-07-20 22:17:58 +03:00
Polycarp Okock	39b06775a7	Merge pull request #399 from pcoder/task/3581/change_font_weight ... Added font-weight-> 300 to .split-section .split-text .lead in dcl	2017-07-20 22:14:01 +03:00
Andrii Marynets	884fd6cda1	Fix :hover on mobile device	2017-07-20 22:10:09 +03:00
Polycarp Okock	50f7227b10	Updated Order_detail ... Added the tag to load the Card holder name entered from the billing address	2017-07-20 15:00:14 +03:00
PCoder	af46927b9d	Changed the font weight of the lead text to 300	2017-07-18 01:35:33 +05:30
PCoder	f4aec68bfd	Added style to right align date in desktop view in Order Confirm page	2017-07-18 00:30:32 +05:30
PCoder	3f6250862b	Changed text align left to the date in the order_detail.html both in dcl and hosting	2017-07-17 02:57:24 +05:30
PCoder	ec4b47ccb6	Fixed overlapping issue of date and billing address in dcl order_detail.html	2017-07-17 02:50:59 +05:30
Siarhei Puhach	b30f41219c	Added backend cpu,ram,ssd fields validation	2017-07-14 11:34:40 +03:00
Miguel Cardenas	407b3f0a8c	Merge branch 'master' into bugfix/#3553-2	2017-07-13 14:30:06 -05:00
PCoder	b4e943849c	Added DE translations and periods for all validation texts	2017-07-13 23:58:54 +05:30
Siarhei Puhach	290bfe272f	Changed field error messages, made fields wider	2017-07-13 12:59:05 +03:00
Miguel Cardenas	696221acb5	add cursor pointer	2017-07-11 20:16:34 -05:00
Miguel Cardenas	fa277af33f	prevent blink after click of menu elements	2017-07-11 20:04:32 -05:00
PCoder	8980c7deb0	Added bottom padding to tayga image	2017-07-09 16:18:15 +05:30
Pcoder	2e97640a03	Merge pull request #383 from pcoder/bug/order_now_button_disabled_on_page_load ... This PR fixes the "Order Now" button appearing blue (active) momentarily on page load. Also, calculator form is now refactored.	2017-07-09 10:33:55 +02:00
PCoder	87fb40400b	Refactored calculator form code and disabled the Order Now button by default	2017-07-09 13:44:22 +05:30
PCoder	11108a4d59	Refactored calculator form	2017-07-09 13:43:30 +05:30
PCoder	25069f1579	Added the movement text	2017-07-09 12:49:16 +05:30
Pcoder	4fe245901f	Merge pull request #375 from karthikvrao/refactor/dcl_remove_duplicate_script_imports ... Task #3545: Remove repeated script imports from dcl's success.html	2017-07-08 00:00:00 +02:00
PCoder	27ad654f43	Merged refactor/dcl_insert_body_end_tag from karthik into karthikvrao-refactor/dcl_insert_body_end_tag	2017-07-08 02:34:30 +05:30
Karthik Rao	fd0e689562	Correct the indentation in the html template files of dcl.	2017-07-06 20:38:22 +05:30
Karthik Rao	3a673bdbac	Remove repeated script imports from dcl's success.html	2017-07-05 21:03:54 +05:30
Karthik Rao	66d0df7196	Insert missing body end tag to dcl's base.html	2017-07-05 17:09:03 +05:30
M.Ravi	d12687015b	opensource -> open source and some text adjustment	2017-07-04 22:18:23 +02:00
Mondi Geetha	cac84f5433	Changed some text	2017-07-04 00:10:23 +05:30
Mondi Geetha	e19d2e3c13	Updated Pricing Form with updated error messages	2017-07-03 23:31:35 +05:30
Mondi Geetha	36976d923e	Merged master into whydcl	2017-07-03 23:03:51 +05:30
M.Ravi	e17792badb	Merge branch 'master' of https://github.com/ungleich/dynamicweb	2017-07-02 23:38:07 +02:00
M.Ravi	8b9359ede5	Reverted back to the default behavior of bootstrap-validator	2017-07-02 23:37:31 +02:00
Andrii Marynets	a91de372e0	Merge branch 'master' into feature/add_google_analytics	2017-07-02 23:01:42 +03:00
M.Ravi	f67343ab5c	Added missing validation code	2017-07-02 21:26:10 +02:00
Mondi Geetha	3a865bd010	Increased minimum length of the name to 3	2017-07-02 23:33:33 +05:30
Mondi Geetha	5b6a069137	Added DE translations for error messages	2017-07-02 23:16:19 +05:30
Mondi Geetha	fd856d7613	Reverted back email templates as they are part of another PR	2017-07-02 20:55:08 +05:30
Andrii Marynets	303d99d70d	Merge branch 'master' into feature/add_google_analytics ... # Conflicts: # datacenterlight/templates/datacenterlight/order_detail.html	2017-07-02 17:56:07 +03:00
Mondi Geetha	2045c424ca	Added padding to LOGO in user activation email	2017-07-02 03:00:02 +05:30
Mondi Geetha	6cbbbc70be	Alinged Logo, Text, Signature to left side	2017-07-02 02:45:22 +05:30
Mondi Geetha	0a2b2c815d	Aligned Logo, Text, Signature to left	2017-07-02 02:14:18 +05:30
Mondi Geetha	e4cfcbf618	Added some classes and divs for error msg alignment alongside the input field	2017-07-01 18:01:08 +05:30
Mondi Geetha	afcec7eb03	Removed unwanted code and add bootstrap-validator cdn js	2017-07-01 17:59:34 +05:30
PCoder	285ce2e710	Added OS configuration to the Order Confirmation page	2017-07-01 02:16:24 +05:30
PCoder	dfd910465c	Added dcl translations used in new flow	2017-07-01 01:40:17 +05:30
Mondi Geetha	05a23bb545	Left aligned We bring future to you section	2017-07-01 00:47:29 +05:30
Mondi Geetha	6247deb27c	Changed img alt text	2017-06-30 23:22:34 +05:30
Mondi Geetha	3a26b93082	Fixed Lato light font and navbar alignment	2017-06-30 21:18:45 +05:30
Mondi Geetha	34395f68eb	Fixed lead text align with 100% IPv6	2017-06-30 14:42:10 +05:30
Mondi Geetha	6a96a86fd1	Fixed paragraph text back to old color	2017-06-30 13:55:55 +05:30
PCoder	1deeec4c33	Added the locale time code to new flow order detail	2017-06-30 12:18:31 +05:30
PCoder	d32d2a8976	Added a form in order confirmation page	2017-06-30 12:06:41 +05:30
PCoder	d0376f35f8	Now getting info in Order Confirmation from session and context	2017-06-30 11:05:34 +05:30
Andrii Marynets	2ad984504c	Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID	2017-06-30 01:23:35 +03:00
Mondi Geetha	94a69a4836	Fixed navbar dropdown that works for mobile device	2017-06-30 01:28:29 +05:30
Mondi Geetha	4ec47c687b	Added dropdown toggle function for highlets menu	2017-06-29 21:56:09 +05:30
Mondi Geetha	445e8e3583	Adjusted some sections as per templates	2017-06-29 20:25:30 +05:30
Mondi Geetha	14bf3ad8b5	Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into task/3488/create_whydcl_page	2017-06-29 17:35:05 +05:30
geethamondi	7eaaea58e3	Fixed some spelling mistakes	2017-06-29 14:00:31 +02:00
geethamondi	2608892537	Fixed typos	2017-06-29 13:53:10 +02:00
Mondi Geetha	e7fea1ea39	Changed the background pattren of Whydatacenterlight page header	2017-06-29 14:49:03 +05:30
PCoder	a3c3a5cd2e	Changed the way we get info in dcl order_detail template	2017-06-29 13:04:13 +05:30
Geetha Mondi	1a994d1e70	Removed unnecassary href link from nav logo	2017-06-28 17:52:19 +05:30
Geetha Mondi	4f793d516e	Changed some divs for responsive	2017-06-28 15:09:17 +05:30
Geetha Mondi	4bf4d250c9	Changed URLs of sections as pages that redirect to home page from whydatacerterlight page	2017-06-28 15:08:12 +05:30
Geetha Mondi	ab5b35f066	Created seperate page for whydatacenterlight page	2017-06-28 13:10:45 +05:30
Geetha Mondi	36fd7913fe	Added nav dropdown and added OR condition for Whydatacenterlight page	2017-06-28 13:03:32 +05:30
Andrii Marynets	007fc794c3	Add google analytics to data center light	2017-06-27 23:47:30 +03:00
M.Ravi	796fbbe1f8	Removed status from the order page	2017-06-23 04:38:10 +05:30
M.Ravi	aca831adac	Resolved conflicts while merging pcoder-new_flow	2017-06-23 04:35:33 +05:30
M.Ravi	3ca7153414	Changed invoice text	2017-06-23 01:34:31 +05:30
M.Ravi	31c389e72c	Added order_detail.html for dcl	2017-06-22 13:23:13 +05:30
M.Ravi	a7e9946a4f	Refactored user activation html email template to use proper translation and parameters	2017-06-19 12:34:01 +05:30
M.Ravi	bf941539d7	Refactored user_activation.txt email template	2017-06-19 12:32:08 +05:30
Levi Velázquez	5271591cf3	Merge pull request #324 from pcoder/feature/3296/confirm_emails ... Feature/3296/confirm emails	2017-06-15 15:22:00 -05:00
Levi Velázquez	3aa9b573cc	Merge pull request #343 from ungleich/fix_translation ... Fixed translations of validation messages	2017-06-15 13:38:16 -05:00
M.Ravi	6c588e3531	Deleted the order.html	2017-06-15 23:31:19 +05:30
M.Ravi	a56d08e729	Fixed translations of validation messages	2017-06-15 06:29:31 +05:30
Henry Bravo	739a92505d	deleted home.htm	2017-06-14 17:29:26 -05:00
Henry Bravo	fb860b9a8d	fixed typo and delete .mo	2017-06-14 17:16:43 -05:00
Henry Bravo	b2379f7a02	Fixed DE Typo, and added text in calculator box	2017-06-14 16:51:42 -05:00
Henry Bravo	8acd249b4d	Create Templatetag for change language whit the current path	2017-06-13 22:35:15 -05:00
Levi	8ec290a59f	cleaned up index.html	2017-06-13 14:11:11 -05:00
Levi	9333532662	Merge branch 'master' into develop	2017-06-13 14:07:52 -05:00
Levi	11e59c8ea3	added translations	2017-06-13 13:47:55 -05:00
Henry Bravo	a03f2f8f89	Fix conflicts	2017-06-13 10:36:39 -05:00
Levi	b5bb26e445	added missing translations for datacenterlight	2017-06-13 01:48:36 -05:00
Levi	c7d29be24c	Merge branch 'master' into develop	2017-06-12 23:51:03 -05:00
Sanghee Kim	f2aa5377d8	month added to landing calculator box	2017-06-11 23:32:37 +02:00
M.Ravi	d7a2335cf4	Merge branch 'master' into telmich-feature/nonhtml-email	2017-06-11 19:56:35 +05:30
M.Ravi	8e95ed304b	Updated the text in dcl index.html template	2017-06-11 16:57:20 +05:30
M.Ravi	24402a2ec8	Refactored the styles	2017-06-11 16:53:57 +05:30
M.Ravi	47d882d1fc	Moved the calculator to the index.html template	2017-06-11 16:29:24 +05:30
M.Ravi	32e5011241	Added user_activation email templates	2017-06-11 05:08:13 +05:30
M.Ravi	9b40af3975	Removed the unnecessary new_order_notification* email templates as we no longer use them.	2017-06-10 15:41:25 +05:30
Henry Bravo	d2e9096cc2	Fix conflicts in url footer and fix navbar language	2017-06-09 16:47:39 -05:00
Henry Bravo	7004536a19	Fix conflicts	2017-06-09 16:18:41 -05:00
Levi	24ecdd2f26	footer links	2017-06-09 16:08:37 -05:00
Henry Bravo	54b339a546	Staging fix and cleaned html	2017-06-09 15:37:14 -05:00
Levi	d43855adda	fixed #3350, #3328, #3316, #3339	2017-06-09 15:36:14 -05:00
Levi	331b7dea98	Merge branch 'master' into develop	2017-06-09 10:37:06 -05:00
M.Ravi	47970fb00a	Added load staticfiles and i18n and extended datacenterlight/base.html explicitly	2017-06-09 11:32:51 +05:30
Nico Schottelius	b15bae4940	Add template base.html	2017-06-08 21:55:35 +02:00
M.Ravi	d8ef935fae	Updated text on the button to Request Beta Access to go along the text alongside	2017-06-07 02:13:21 +05:30
M.Ravi	06f95dc5ed	Made to take the user to /order on click of Order Now button	2017-06-07 02:12:35 +05:30
M.Ravi	94bac7222c	Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before.	2017-06-07 02:02:31 +05:30
M.Ravi	bef6b03872	Reverted pricing.html to what was before. We should create a new template for order.	2017-06-07 01:35:05 +05:30
M.Ravi	366f11be83	Fixed an issue related to redirection to datacenterlight/order url	2017-06-07 01:07:47 +05:30
M.Ravi	663ea2d713	Merged master into feature/manualorder	2017-06-07 00:41:27 +05:30
M.Ravi	69001db65f	Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files.	2017-06-07 00:16:54 +05:30
M.Ravi	d31b05a219	Added jquery validation for the order form	2017-06-06 05:26:02 +05:30
M.Ravi	474e0ddc95	Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this)	2017-06-06 04:22:03 +05:30
M.Ravi	f4a81e9096	Fixed getting template name from template id	2017-06-06 03:43:50 +05:30
M.Ravi	d7625712f1	Changed template variable name in email template for new order notification	2017-06-06 03:02:57 +05:30
M.Ravi	4ad45dfd43	Added notification email template	2017-06-06 02:55:07 +05:30
Henry Bravo	b44ab0ce0a	Add input fields (email, name) in Calculator (Pricing page)	2017-06-05 14:30:41 -05:00
Henry Bravo	ba03cf232e	'what is it' section text change and fixed typo	2017-06-03 21:57:21 -05:00
Levi Velázquez	8d47018aae	Merge pull request #301 from levivm/develop ... removed more info button	2017-06-02 10:37:24 -05:00
Levi	83705984d0	removed more info button	2017-06-02 10:36:17 -05:00
Henry Bravo	a7c28f5644	Fix conflic translates	2017-05-29 15:05:11 -05:00
modulos	1d95f87b8d	Merge branch 'develop' into dcl_i18n	2017-05-29 15:25:18 +02:00
Henry Bravo	8d8b387cc7	Fix select languages in dcl	2017-05-27 12:49:42 -05:00
Henry Bravo	ac28ab0d6b	Fix texts bugs and hosting mobile design	2017-05-27 10:39:30 -05:00
modulos	f8bbd94f8f	Change 15 to 10 GB Storage	2017-05-26 17:12:37 +02:00
modulos	5869c6dd87	Add i18n to datacenterlight ... The pricing page is now fully i18n as well as the subscription modal	2017-05-26 15:53:21 +02:00
Henry Bravo	22a876e134	Fix and add input values in calc	2017-05-25 16:16:18 -05:00
Henry Bravo	792219f6ac	Fix image beta	2017-05-25 15:18:42 -05:00
Henry Bravo	549acd400a	Merge branch 'develop' of github.com:ungleich/dynamicweb into develop	2017-05-25 13:31:16 -05:00
Henry Bravo	c91a61b33c	Fix order columns in hosting/payment	2017-05-25 13:27:47 -05:00
Noe Thalheim	1ff411e426	Merge branch 'develop' of https://github.com/ungleich/dynamicweb/	2017-05-25 18:38:58 +02:00
Noe Thalheim	cb73bf7b80	Replace lorem ipsum text	2017-05-25 18:37:42 +02:00
Henry Bravo	f2649251c2	Merge branch 'develop' of github.com:ungleich/dynamicweb into develop	2017-05-23 18:32:21 -05:00
Henry Bravo	c205bb05e8	Fixed Pricing pages bugs	2017-05-23 18:32:06 -05:00
modulos	229c8b9cfc	Disable checkbox	2017-05-23 20:27:26 +02:00
modulos	e6f2157b83	Correct pricing page redriection	2017-05-23 19:58:29 +02:00
Henry Bravo	398b7062e0	resolve conflicts	2017-05-23 12:13:44 -05:00
Henry Bravo	c383156c42	Pass params in form pricing	2017-05-23 12:06:48 -05:00
Levi	e278ff742d	Merge branch 'develop' of github.com:ungleich/dynamicweb into develop	2017-05-23 11:48:25 -05:00
Levi	8d81220202	changed virtual machine list	2017-05-23 11:48:02 -05:00
Levi Velázquez	21d37ffca4	Merge pull request #263 from Modulos/beta_modal ... Show modal after beta access signup	2017-05-23 11:10:01 -05:00
Henry Bravo	506fbca204	Design calculator page	2017-05-22 23:35:29 -05:00
Henry Bravo	30f042cdc3	Fixed bugs style dcl	2017-05-22 13:00:27 -05:00
modulos	88731d6371	Change buy now to order now and add link	2017-05-22 18:25:56 +02:00
modulos	920e7669dc	Show modal after beta access signup ... The beta access form is now in it's own html page. this makes it easier to work with djangos form validation with reloading the whole page.	2017-05-22 18:03:33 +02:00
Levi	3503e6568e	Merge branch 'develop' into opennebula_api	2017-05-20 11:23:13 -05:00
Levi	ec198c74f9	fixed translations	2017-05-20 11:19:58 -05:00
Henry Bravo	00101921c7	Fixed typo bugs dcl	2017-05-19 22:41:10 -05:00
Henry Bravo	767e95895a	Redesign DCL Page	2017-05-18 00:13:00 -05:00
M.Ravi	1ca884e1f6	Removed 'More info' button from datacenterlight index page.	2017-05-14 21:09:16 +05:30
M.Ravi	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
M.Ravi	d537fcb118	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
HenryGBC	80ecb963b3	Add name field i beta program	2017-03-30 20:21:15 -04:30
HenryGBC	227d69178f	Add modal sucess	2017-02-17 09:43:32 -04:30
Levi	38934b0883	added request beta notification	2017-02-16 22:32:14 -05:00
Levi	ea2f6444db	Added alplora and datacenter beta program	2017-02-14 23:34:06 -05:00
Levi	41362fc948	added translations	2017-01-23 22:34:22 -05:00
Levi	896c07930b	fixing language swticher	2017-01-13 12:26:03 -05:00
Levi	640819c7de	Fixed #2806 and #2863	2017-01-09 19:49:10 -05:00
Levi	ef07f5da83	#2905	2017-01-09 09:34:25 -05:00
Levi	f9387cd6b8	Finished #2883	2017-01-06 10:24:34 -05:00
Levi	bf82aa61f1	Fixed #2862. Fixed #2861. Fixed #2864. Fixed #2865	2017-01-04 20:31:53 -05:00
Levi	ed28fc411e	fixed some index datacenterlight issues	2016-12-21 01:24:04 -05:00
Levi	db13e642fc	fixed datacenter index link	2016-12-21 01:06:27 -05:00
Levi	abfab6915c	added datacenterlight	2016-12-20 18:05:20 -05:00