Commit graph

3356 commits

Author SHA1 Message Date
PCoder
91d340c4b1 Fix some bugs 2018-02-17 13:11:54 +01:00
Arvind Tiwari
40fa46a85a merge migrations 2018-02-09 02:19:05 +05:30
Arvind Tiwari
daf8d178ad Merge branch 'master' into task/4105/cms_ungleich_footer_plugin 2018-02-09 01:35:42 +05:30
Arvind Tiwari
873c7b6c7c
Merge pull request #560 from tiwariav/task/cms_plugin_remove_unused_headers
Task/4051 remove unused cms header plugins
2018-02-09 01:31:28 +05:30
Arvind Tiwari
a3fa4b138f facebook and youtube url added 2018-02-08 21:26:28 +05:30
Arvind Tiwari
c9e2413c4e removed static_placeholder, added previous default 2018-02-08 20:08:20 +05:30
Arvind Tiwari
3378bf7562
Merge pull request #559 from tiwariav/task/3995/cms_plugins_padding_fix
Task/3995 galsfaser section cms plugin padding fix
2018-02-08 16:21:50 +05:30
Arvind Tiwari
b0548b6bb4
Update order_detail.html 2018-02-07 19:30:53 +05:30
Arvind Tiwari
3049e84961
Merge pull request #568 from tiwariav/bugifx/order_pdf_resolution
bugfix/invoice_pdf_resolution
2018-02-07 19:15:09 +05:30
Arvind Tiwari
22121fa7bc use the minified js 2018-02-07 19:14:03 +05:30
Arvind Tiwari
d50e249ba2 add static_placeholder for footer to ungleich_cms_page, help text for footer link 2018-02-07 18:37:48 +05:30
Arvind Tiwari
426e56c4f3 help text for copyright text 2018-02-07 18:21:16 +05:30
Arvind Tiwari
e93eda8845 update html2canvas to fix bugs 2018-02-07 02:23:23 +05:30
Arvind Tiwari
69a11a6b06 remove unused template tags 2018-02-07 01:12:11 +05:30
Arvind Tiwari
2ea1a11f2b new footer plugin added 2018-02-07 01:06:03 +05:30
Arvind Tiwari
95370c7562
Update Changelog 2018-02-05 03:26:33 +05:30
Arvind Tiwari
cdd4a8e041
Merge pull request #566 from tiwariav/bugifx/order_pdf_resolution
bugfix/invoice pdf resolution
2018-02-05 03:25:19 +05:30
Arvind Tiwari
d73b0e2fde scale increased to 2 2018-02-05 03:17:33 +05:30
Arvind Tiwari
9f05298675 margin reduced for grid items 2018-02-04 19:56:11 +05:30
Arvind Tiwari
1f8fe3cb00 section-heading margin issue fix 2018-02-04 19:33:47 +05:30
PCoder
4408f54a5c Update Changelog 2018-01-23 22:44:53 +01:00
Pcoder
b1099d20b9
Merge pull request #558 from pcoder/task/4046/compute_hdd_sdd
Task/4046/Add sdd_size, hdd_size to VirtualMachineSerializer
2018-01-23 22:40:11 +01:00
PCoder
d7ce4ef4c5 Update Changelog 2018-01-23 22:07:33 +01:00
Pcoder
5595bf9b9f
Merge pull request #562 from pcoder/task/3670/shorten_ssh_key_name
Task/3670/shorten ssh key name
2018-01-23 22:01:51 +01:00
PCoder
58eec62fc3 Update Changelog 2018-01-23 21:51:51 +01:00
Pcoder
effb8ab37b
Merge pull request #565 from pcoder/task/4049/replace_blog_image
Update blog header background image
2018-01-23 21:47:10 +01:00
PCoder
5f127ceb3d Compress blog background image 2018-01-23 21:43:11 +01:00
PCoder
2549d70ca4 Update blog header background image 2018-01-22 00:13:53 +01:00
PCoder
63906a3b8a Update Changelog for 1.3.2 2018-01-16 00:32:28 +01:00
Pcoder
dcef5e5af2
Merge pull request #564 from pcoder/add_tos_to_dcl_footer
Add tos to dcl footer
2018-01-16 00:27:46 +01:00
PCoder
71071bf9ed Update dcl's django.po: Add translation for - Terms of Use 2018-01-16 00:13:40 +01:00
PCoder
b88c19c2c9 Add terms-of-service item to dcl's footer 2018-01-16 00:11:32 +01:00
PCoder
dd9b0d8fd9 Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX 2018-01-08 19:50:42 +01:00
PCoder
0706ac5909 Shorten generated ssh key and add seconds to the name 2018-01-08 19:35:39 +01:00
Arvind Tiwari
12fe1fa722
Update Changelog 2018-01-08 02:45:16 +05:30
Arvind Tiwari
eed63b1cf1
Merge pull request #561 from tiwariav/bugfix/4067/ungleich_landing_navbar
bugfix/4067 ungleich landing navbar fix
2018-01-08 02:44:27 +05:30
Arvind Tiwari
24bd5a1880 navbar closes on click, smooth scroll enabled 2018-01-08 02:33:04 +05:30
Arvind Tiwari
205274be42 removed ununsed templates 2018-01-07 20:40:38 +05:30
PCoder
aff4288cd9 Update Changelog 2018-01-07 09:29:54 +01:00
Pcoder
5ad2f2c429
Merge pull request #557 from pcoder/bug/4000/replace_ungleichcom_ungleichch
Replace all ungleich.com with ungleich.ch
2018-01-07 09:26:27 +01:00
PCoder
6dd69b24fa Replace another occurrence in a commented block 2018-01-07 08:42:52 +01:00
Arvind Tiwari
3ef2aa4bfb removed unused header plugins 2018-01-05 18:31:24 +05:30
Arvind Tiwari
74626a59dc galsfaser section cms plugin extra padding fix 2018-01-05 05:18:35 +05:30
PCoder
b4fbd59144 Merge branch 'master' into task/4046/compute_hdd_sdd 2018-01-03 09:22:25 +01:00
PCoder
c368aa0272 Merge branch 'master' into bug/4000/replace_ungleichcom_ungleichch 2018-01-03 08:59:48 +01:00
PCoder
3d1738871b Replace all ungleich.com with ungleich.ch 2018-01-03 08:54:19 +01:00
PCoder
43999d803a Add sdd_size, hdd_size to VirtualMachineSerializer 2018-01-03 08:43:57 +01:00
PCoder
554335ae19 Update Changelog for 1.3.1 2017-12-31 18:28:41 +01:00
Pcoder
e85993eabf
Merge pull request #556 from pcoder/feature/use_email_smarthost
Obtain email host, port and tls settings from env
2017-12-31 18:14:46 +01:00
PCoder
ace2abc47e Obtain email host, port and tls settings from env 2017-12-31 00:58:37 +01:00