mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1840 commits 59 branches 86 tags 315 MiB
Commit graph

1840 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
PCoder
9f71768d26 Fixed a typo in translation 2017-07-08 22:48:49 +05:30
PCoder
e19b55c97f Added DE translations for Why DCL page 2017-07-08 04:56:26 +05:30
Polycarp Okock
46859ffcbc Fixed missing border and alignment 2017-07-08 02:14:04 +03:00
Polycarp Okock
0da78502a5 Fixed second alignment issue 2017-07-08 01:44:52 +03:00
Polycarp Okock
37de810cc3 Fixed the alignment issue 2017-07-08 01:39:53 +03:00
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
Polycarp Okock
efd90f8ddd Removed the extra btn 2017-07-08 00:50:41 +03: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
Pcoder
545834d3d0 Merge pull request #377 from karthikvrao/refactor/dcl_better_indent_html 
Task #3547: Correct the indentation in the html template files of dcl.
 2017-07-07 22:33:33 +02:00
Polycarp Okock
e551ba911b Merge branch 'master' into master 2017-07-07 22:37:58 +03:00
Polycarp Okock
e90d0faa9e Fixing missing warning text and alignment 
Fixed the missing warning text and alignment for {% if credit_card_data.last4 %}
 2017-07-07 22:19:59 +03:00
Pcoder
81404715d8 Merge pull request #381 from pcoder/task/3562/remove_btn_outline 
Removed button outline when inactive
 2017-07-07 21:17:29 +02:00
PCoder
e298f86290 Removed button outline when inactive 2017-07-08 00:12:10 +05:30
Siarhei Puhach
705948fdb7 Merge remote-tracking branch 'upstream/master' 2017-07-07 17:26:25 +03:00
Pcoder
eec8caf5ad Merge pull request #378 from ungleich/pcoder-set_debug_false 
On prodcution we should always have Debug = False
Please refer to redmine bug report #3538 for details.
 2017-07-07 02:20:50 +02:00
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
Pcoder
a31cead827 Merge pull request #368 from ungleich/siarheipuhach-feature/flake8 
Introducing flake8 for maintaing good code standards
 2017-07-06 23:16:07 +02:00
PCoder
67da139106 Fixed one more flake warning 2017-07-07 01:23:56 +05:30
PCoder
ddacfeacf3 Fixed some flake8 errors 2017-07-07 01:20:16 +05:30
PCoder
1a20507c02 Merged master into siarheipuhach-feature/flake8 2017-07-07 00:53:58 +05:30
PCoder
cfc1210a9a We probably need creating HostingBill 2017-07-07 00:12:29 +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
Siarhei Puhach
e4d0ec43a8 Fixed Pull request #372 2017-07-05 13:11:01 +03:00
M.Ravi
44d1a4aaed Merge branch 'master' into set_debug_false 2017-07-05 00:57:51 +02:00