Commit graph

2436 commits

Author SHA1 Message Date
Siarhei Puhach
b30f41219c Added backend cpu,ram,ssd fields validation 2017-07-14 11:34:40 +03:00
Miguel Cardenas
aa7856ebc0 change color of header 2017-07-13 18:26:14 -05:00
Pcoder
05db0517bb Merge pull request #393 from amarynets/bugfix/include_GA_on_all_pages_by_domain
Bugfix: include GA on all pages by domains #3568
2017-07-14 00:27:33 +02:00
Miguel Cardenas
626598d8c5 fix indentation to 4 spaces 2017-07-13 16:49:52 -05:00
Andrii Marynets
c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets
6f99c94919 Merge branch 'master' of https://github.com/ungleich/dynamicweb into bugfix/include_GA_on_all_pages_by_domain 2017-07-13 22:53:56 +03:00
Andrii Marynets
a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00
Miguel Cardenas
407b3f0a8c Merge branch 'master' into bugfix/#3553-2 2017-07-13 14:30:06 -05:00
Pcoder
e32b8434ba Merge pull request #392 from ungleich/siarheipuhach-feature/task3564
This is @siarheipuhach PR #391 plus the german translations and period terminations to all validation texts.
2017-07-13 20:40:17 +02:00
PCoder
c7a99b4ad2 Added periods to german validation texts 2017-07-14 00:04:20 +05:30
PCoder
270354b22d Removed some fuzzy translations 2017-07-14 00:02:35 +05:30
PCoder
b4e943849c Added DE translations and periods for all validation texts 2017-07-13 23:58:54 +05:30
Miguel Cardenas
df55757be3 Change font family for header 2017-07-13 12:04:05 -05:00
Siarhei Puhach
d727e64b93 Update landing-page.css 2017-07-13 15:06:18 +03:00
Siarhei Puhach
2ad62daa10 Update landing-page.css 2017-07-13 14:53:43 +03:00
Siarhei Puhach
290bfe272f Changed field error messages, made fields wider 2017-07-13 12:59:05 +03:00
Siarhei Puhach
82ad7db0f7 Merge remote-tracking branch 'upstream/master' 2017-07-13 11:28:29 +03:00
Siarhei Puhach
062ca69d9d Update views.py 2017-07-12 08:21:43 +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
f6ef24d8e6 Merge pull request #388 from ungleich/credit_card_text_change
Credit card text change in the new flow.

Place Order in payment page renamed to "Submit"
"Payment Details" -> Credit card
After placing your order..Submit Payment Page -> After submitting your card information, you will be taken to the Confirm Order Page.

And corresponding DE translations
2017-07-11 19:06:57 +02:00
PCoder
4bdee73bd5 Some more text changes 2017-07-11 00:04:23 +05:30
PCoder
975b13bc69 Some more modifications to text 2017-07-10 23:02:30 +05:30
PCoder
5d40830296 Some more change in payment page text 2017-07-10 22:51:14 +05:30
Pcoder
b3a10ca04a Merge pull request #387 from ungleich/deaspo-372-credit-card-text
This PR is @deaspo's 372 plus the DE translations as provided in #3570 by @moep.
Also I cleaned up some commented html code. The "Place Order" button in the payment page is called "Submit" to avoid duplication.
2017-07-10 08:25:07 +02:00
PCoder
fb7df2fdfc Changed the 'Place Order' text in payment to Submit 2017-07-10 11:42:44 +05:30
PCoder
32aaab2099 Added DE translations for credit card text and cleaned up unwanted text in payment.html 2017-07-10 02:01:27 +05:30
PCoder
7ca5fc32b7 Merge branch 'master' of https://github.com/deaspo/dynamicweb into deaspo-372-credit-card-text 2017-07-10 01:29:15 +05:30
PCoder
6261d3055d Merge branch 'master' of https://github.com/ungleich/dynamicweb 2017-07-09 20:38:28 +05:30
PCoder
90e0aa3479 Updated Changelog 2017-07-09 20:37:58 +05:30
Pcoder
e26036159b Merge pull request #385 from pcoder/bug/blog_date_missing_space
Added missing space in the blog's date text between "Posted on" and "Date"
2017-07-09 17:06:16 +02:00
PCoder
29b2688935 Added missing space in the blog's date text 2017-07-09 20:13:58 +05:30
Pcoder
a625e5d196 Merge pull request #384 from ungleich/bug/blog_lang_footer_missing
Moved google_analytics code to templates/analytics folder.
2017-07-09 16:11:55 +02:00
PCoder
9b10ac7deb Moved google_analytics code to templates/analytics folder. It was causing wrong footer to be loaded. 2017-07-09 19:21:30 +05:30
PCoder
8980c7deb0 Added bottom padding to tayga image 2017-07-09 16:18:15 +05:30
PCoder
8ba0c68410 Fixed the missing de translated text in whydcl page 2017-07-09 15:28:00 +05:30
PCoder
3c17a5957e Updated Changelog for the release 1.0.19 2017-07-09 14:46:55 +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
c06e49b4f1 Merge pull request #382 from pcoder/task/3552/why_dcl_translations
task/3552 Added DE translations for Why DCL page
2017-07-09 10:15:53 +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
e0e5ca4503 FLOSS -> FOSS 2017-07-09 13:03:07 +05:30
PCoder
c6880294a9 Removed fuzzy translation for FOSS text 2017-07-09 12:59:48 +05:30
PCoder
25069f1579 Added the movement text 2017-07-09 12:49:16 +05:30
PCoder
cf57a8c2e0 Updated tayga.png with that provided by Sanghee 2017-07-09 12:48:35 +05:30
PCoder
05fa92dbba Added 'movement' to english text of whydcl page 2017-07-09 12:48:00 +05:30
Polycarp Okock
73bda16b6d Merge pull request #6 from ungleich/master
Pulling Master Changes
2017-07-08 23:00:28 +03:00
Polycarp Okock
6a4e3011ed Merge pull request #5 from siarheipuhach/pull372test
Fixed Pull request #372
2017-07-08 22:58:11 +03:00
Polycarp Okock
d372de688c Merge branch 'master' into pull372test 2017-07-08 22:57:55 +03:00
PCoder
b918243e4a FLOSS -> FOSS and bieteteine -> bietet eine 2017-07-08 22:56:22 +05:30