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 |
|
PCoder
|
aaff4f048d
|
Removed some unnecessary code
|
2017-07-07 23:25:38 +05:30 |
|
PCoder
|
79df35a765
|
Merge branch 'task/3354/modal_restyling' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3354/modal_restyling
|
2017-07-07 23:21:27 +05:30 |
|
Siarhei Puhach
|
53f797472b
|
Update base.py
|
2017-07-07 18:13:00 +03:00 |
|
Siarhei Puhach
|
1279d4efbb
|
Merge branch 'master' into feature/ssh_keys
|
2017-07-07 17:49:22 +03:00 |
|
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 |
|
Siarhei Puhach
|
759bfd75a3
|
Added question image file
|
2017-07-06 14:18:57 +03:00 |
|
Siarhei Puhach
|
d2d96e9951
|
Added private_key field to UserHostingkey model, some html updates
|
2017-07-06 14:18:22 +03:00 |
|
Siarhei Puhach
|
8986aa6550
|
Added generation button with no field input required (generate ssh key name)
|
2017-07-06 11:47:12 +03:00 |
|
Karthik Rao
|
3a673bdbac
|
Remove repeated script imports from dcl's success.html
|
2017-07-05 21:03:54 +05:30 |
|
Siarhei Puhach
|
7cc70a95ac
|
Added new page(Choice ssh key generate/upload), changed design of generate ssh form
|
2017-07-05 16:57:49 +03:00 |
|
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 |
|
siarheipuhach
|
f49d6b398f
|
Changed ssh keys design(+ mobile ver.)
|
2017-07-05 08:41:50 +03:00 |
|
M.Ravi
|
44d1a4aaed
|
Merge branch 'master' into set_debug_false
|
2017-07-05 00:57:51 +02:00 |
|
deaspo
|
86c4e7b408
|
Task: Improve credit card section - letting the user know that they're not making any payment there but on the next page
Signed-off-by: deaspo <polycarpokock@live.com>
|
2017-07-05 01:53:01 +03:00 |
|
Polycarp Okock
|
e524aea1e5
|
Merge pull request #4 from ungleich/master
Pulling all the latest commits
|
2017-07-05 01:51:34 +03:00 |
|
M.Ravi
|
3304d862cb
|
Moved static images urlpattern out of DEBUG case
|
2017-07-05 00:07:06 +02:00 |
|
M.Ravi
|
4bdae326f7
|
Refactored the call to import local and prod files
|
2017-07-04 23:16:27 +02:00 |
|
Pcoder
|
dafd11c592
|
Merge pull request #370 from ungleich/geethamondi-task/3488/create_whydcl_page
Geethamondi task/3488/create whydcl page
|
2017-07-04 22:28:29 +02:00 |
|
M.Ravi
|
d12687015b
|
opensource -> open source and some text adjustment
|
2017-07-04 22:18:23 +02:00 |
|
M.Ravi
|
6496b5202d
|
Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3488/create_whydcl_page
|
2017-07-04 22:14:30 +02:00 |
|
M.Ravi
|
6d7a1d4e4a
|
Added memcached cache
|
2017-07-04 21:00:00 +02:00 |
|
M.Ravi
|
41220ef172
|
Added bool_env function to retrieve env variable and convert to python boolean
|
2017-07-04 20:46:42 +02:00 |
|
M.Ravi
|
ceb10d116e
|
Added python-memcached to requirements.txt
|
2017-07-04 20:44:59 +02:00 |
|
Siarhei Puhach
|
b96d13772e
|
SSH keys list template changed
|
2017-07-04 17:55:43 +03:00 |
|
Siarhei Puhach
|
de0bada84a
|
SSH key change design init
|
2017-07-04 15:00:08 +03:00 |
|
Mondi Geetha
|
feb46a4b0a
|
Merge branch 'master' into task/3354/modal_restyling
|
2017-07-04 13:06:33 +05:30 |
|
M.Ravi
|
8bb7eee418
|
Corrected some mistakes
|
2017-07-04 08:48:04 +02:00 |
|
M.Ravi
|
f419ce784f
|
Fixed some flake8 warnings
|
2017-07-03 23:53:37 +02:00 |
|
M.Ravi
|
f9c3c80864
|
Merged the latest master into siarheipuhach-feature/flake8
|
2017-07-03 23:47:56 +02:00 |
|
Pcoder
|
b6b218a401
|
Merge pull request #367 from amarynets/bugfix/fix_404_favicon.ico_on_digitalglarus.ch
Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch
|
2017-07-03 23:15:16 +02:00 |
|
Mondi Geetha
|
d3e1204446
|
Merge branch 'master' into task/3354/modal_restyling
|
2017-07-04 01:16:39 +05:30 |
|
Andrii Marynets
|
bc73ad3c4c
|
Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch
|
2017-07-03 22:32:32 +03:00 |
|
Mondi Geetha
|
8aa7ffa2d3
|
Added Heading to Modals and styles
|
2017-07-04 00:56:49 +05:30 |
|
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 |
|
Mondi Geetha
|
49ae9adcb8
|
Added icons for modals
|
2017-07-03 22:34:39 +05:30 |
|