mravi
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,178 Commits 59 Branches 86 Tags 315 MiB
Commit Graph

647 Commits

Author SHA1 Message Date
PCoder 144a780105 Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...' 2018-08-24 11:58:01 +02:00
PCoder e230f2ac8c Merge master into 5151/gdpr_modal 2018-08-22 23:25:11 +02:00
PCoder 78e44332b5 Remove an unnecessary question mark 2018-08-22 23:16:26 +02:00
PCoder 29172a9df7 Use a separate class for warning block 2018-08-22 23:06:20 +02:00
PCoder 4425aa7c88 Change modal text 2018-08-22 22:57:32 +02:00
PCoder 1e5cf08273 Move the warning to the bottom 2018-08-22 22:47:49 +02:00
PCoder 7e790e7027 Add warning div 2018-08-22 22:36:29 +02:00
M.Ravi 9381327a12 Change author of various cms pages to ungleich glarus ag 
(Being consistent)
 2018-08-20 11:52:27 +02:00
PCoder 069cd18268 Add gdpr banner to all base templates 2018-07-21 13:27:15 +02:00
PCoder 0db4a113e6 Add some styles and do not let user remove card if he has only one 2018-07-05 23:06:47 +02:00
PCoder 8e742852a5 Show all cards in landing and hosting payment page 2018-07-04 02:03:08 +02:00
PCoder 23630d4473 Move csrf_token call outside the for loop 2018-06-12 11:11:37 +02:00
PCoder cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
Arvind Tiwari 8fb0d9a48a order detail divider lines full width 2018-05-12 21:59:06 +05:30
Arvind Tiwari b09604d30f add space befor CHF 2018-05-12 03:56:04 +05:30
Arvind Tiwari f39f95e1f7 remove template filter from translation 2018-05-12 03:47:54 +05:30
Arvind Tiwari 20f1df8a70 blocktrans variable fix 2018-05-12 03:39:38 +05:30
Arvind Tiwari 39f7898259 edit order detail footer text 2018-05-12 03:15:07 +05:30
Arvind Tiwari 55889499df order detail style fix 2018-05-12 02:47:27 +05:30
Arvind Tiwari a14407182f font weight for discount name 2018-05-11 17:21:02 +05:30
Arvind Tiwari 73e3dce8d4 order detail page font format 2018-05-11 17:18:19 +05:30
Arvind Tiwari 0fdb88b8aa invoice discount amount fix 2018-05-07 07:50:32 +05:30
Arvind Tiwari eeed9b2e72 discount name in templates 2018-05-07 06:25:50 +05:30
Arvind Tiwari f8dc2c6bbe discount option added to calculator 2018-05-07 05:07:58 +05:30
Arvind Tiwari 89ed869780 hosting calculator styles 2018-04-25 23:31:27 +05:30
Arvind Tiwari f66d768ecb hosting payment page 2018-04-25 15:55:58 +05:30
Arvind Tiwari 3bf064a017 add calculator placeholder to cms_integration 2018-04-25 14:52:25 +05:30
PCoder 4e3211b62f Make total and subtotal texts bold 2018-04-18 21:37:12 +02:00
PCoder 2ac1ac7d97 Add subtotal and VAT to hosting order detail too 2018-04-17 22:20:36 +02:00
PCoder 731fef8ad9 Show VAT details in hosting/order_details if it is set 2018-04-16 04:39:21 +02:00
PCoder 6cc40cb67f virtual machine detail: show price upto 2 decimal places 2018-04-16 04:34:40 +02:00
PCoder 5738dc8e1b Virtual machine detail: use hostingorder for obtaining the price, 
rather than the serializer
 2018-04-16 04:32:08 +02:00
PCoder adbb8a269e Hostingorders: limit amount to 2 decimal places 2018-04-16 04:16:57 +02:00
Arvind Tiwari 403f9b5a08 change logo in hosting emails 2018-04-13 17:55:08 +05:30
Arvind Tiwari 368fe0d08f merge master 2018-03-29 01:04:26 +05:30
Arvind Tiwari d52c061709 use humanize to add comma to numbers 2018-03-27 19:38:09 +05:30
Arvind Tiwari 52dafc99d3 ungleich gmbh -> ungleich glarus ag, settings page fix 2018-03-27 00:54:44 +05:30
Arvind Tiwari 849cdec0e2 unlocalize vm id 2018-03-21 01:29:28 +05:30
Arvind Tiwari c9ee9f6ec3 merge master 2018-03-21 01:09:47 +05:30
Arvind Tiwari eefe9ba940 company fiscal number added to hosting invoice footer 2018-03-09 03:47:18 +05:30
Arvind Tiwari fc659cab9f number localization format for de set same as en 2018-03-07 19:22:13 +05:30
Arvind Tiwari 80ed92eece merged master 2018-02-23 18:14:31 +05:30
PCoder 8aeefd7144 Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png 
and corresponding references in the code
 2018-02-20 19:56:22 +01:00
PCoder a5ad1a9edf Remove unused beta access templates and js 2018-02-20 19:48:52 +01:00
Arvind Tiwari 909067e11f removed vendor files from hosting and using the ones from dataccenterlight 2018-02-09 06:50:17 +05:30
Arvind Tiwari b9c53717e3 Merge branch 'master' into task/3713/clean_up_css 2018-02-08 17:11:41 +05:30
Arvind Tiwari b0548b6bb4
Update order_detail.html 2018-02-07 19:30:53 +05:30
Arvind Tiwari e93eda8845 update html2canvas to fix bugs 2018-02-07 02:23:23 +05:30
Arvind Tiwari 4ebd52cd69 fix user keys layout, adjust @media breakpoints to bs4, fix more unused css, optimize script 2018-02-04 03:20:27 +05:30
Arvind Tiwari fb6ddd3512 moved styles to common.css, removed more unused styles 2018-01-17 16:31:46 +05:30
Arvind Tiwari 4fd761c396 removed unused classes from datacenterlight css files 2018-01-10 02:47:25 +05:30
PCoder b0993d8728 Fix address: Bahnhotstrasse to Bahnhofstrasse 2017-12-27 23:44:27 +01:00
PCoder 4dff4e07cb Change minimum required RAM from 2GB to 1GB 2017-12-21 01:25:52 +01:00
Arvind Tiwari 8d64915d71 invoice footer added 2017-12-11 00:47:55 +05:30
PCoder f9bd849333 Remove redundant "previous" text 2017-10-31 09:05:49 +01:00
PCoder 62f30bf03c Remove some commented and unnecessary code 2017-10-29 22:03:19 +01:00
PCoder bafb4e7b68 Remove hasCreditcard js code - not used anymore 2017-10-28 23:42:30 +02:00
PCoder db8dd9af54 Hosting payment: select card text update 2017-10-28 23:18:10 +02:00
PCoder c47b5cdc72 Add form to send selected card in settings page 2017-10-28 22:17:46 +02:00
PCoder 175180e193 Show DEFAULT text against the default card in the settings page 2017-10-28 20:45:00 +02:00
PCoder de5035d12e Add id_card input element 2017-10-22 00:21:08 +02:00
PCoder bf91bf3822 Change text: delete card to remove card 2017-10-21 23:14:05 +02:00
PCoder 7f4993c3f0 Update hosting payment template to use added cards 2017-10-21 23:12:53 +02:00
PCoder be8181ec42 Add _messages template to hosting/settings.html 2017-10-21 17:02:24 +02:00
M.Ravi 60cfc24319 Merge branch task/3766/credit_card_options from tiwariav into task/3747/multiple_cards_support 2017-10-19 20:24:28 +02:00
Arvind Tiwari 2a71be354b conflicts resolved 2017-10-17 00:27:50 +05:30
M.Ravi de275c23ac Add modal for card delete 2017-10-16 16:18:17 +02:00
M.Ravi 52791f5e48 Refactor cc_brand to brand 2017-10-15 23:56:38 +02:00
M.Ravi f71c8e553d Add name to user details form button name 2017-10-15 19:54:01 +02:00
M.Ravi 1a25bbf11e Add name to card form button name 2017-10-15 19:51:58 +02:00
M.Ravi e6f92d9ae4 Manual merge 2017-10-15 16:14:33 +02:00
Arvind Tiwari 3370f06bff msg fix 2017-10-15 02:30:42 +05:30
Arvind Tiwari c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari 1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period 
task/3828 invoice period
 2017-10-15 01:27:02 +05:30
Arvind Tiwari ed1f1451ce [] removed around the vm name 2017-10-15 00:41:31 +05:30
Arvind Tiwari 2cd1850f02 password reset email fix 2017-10-15 00:30:52 +05:30
Arvind Tiwari 7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
Arvind Tiwari 25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
Arvind Tiwari f3832c1db9 content-dashboard removed for unregistered pages 2017-10-07 17:06:55 +05:30
Arvind Tiwari 7d7b8661ea translations 2017-10-07 16:19:53 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 88781e992c 24 hr fix 2017-10-06 04:20:38 +05:30
Arvind Tiwari d3d57ade37 formats fixed 2017-10-06 04:16:58 +05:30
Arvind Tiwari 8e5654bdb5 date time converted to locale 2017-10-06 04:11:40 +05:30
Arvind Tiwari 4dbf08f995 Merge branch 'master' into task/3828/invoice_period 2017-10-06 02:39:07 +05:30
Arvind Tiwari ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari bd3c59eb3e card_input template 2017-10-06 01:17:50 +05:30
Arvind Tiwari 6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
Arvind Tiwari 5e8b34d39c Update hosting favicon to dcl favicon 2017-10-06 01:02:14 +05:30
Arvind Tiwari fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text 
task/3811 create vm page lead text added
 2017-10-04 01:00:03 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari 0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon 
task/3823 hosting favicon link fixed
 2017-10-03 23:42:57 +05:30
Arvind Tiwari 96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input 
Bugfix/hosting_card_input
 2017-10-03 21:39:44 +05:30
Arvind Tiwari bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page 
Task/3785 update my bills page
 2017-10-03 21:31:27 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari 734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 22af001489 Merge upstream master 2017-10-02 00:09:38 +02:00
M.Ravi cf45a9ac75 Add messages to some hosting templates 2017-10-01 20:39:55 +02:00
M.Ravi 9e8d930a3b Refactor messages to includes/_messages.html 2017-10-01 20:16:05 +02:00
Arvind Tiwari bd91883369 end_date added 2017-09-30 17:55:49 +05:30
Arvind Tiwari 1fb7511292 favicon link changed 2017-09-30 17:08:40 +05:30
Arvind Tiwari c6173ed2e6 lead text added 2017-09-30 16:53:44 +05:30
M.Ravi 43e6fc45e2 Add de translations 2017-09-29 22:19:26 +02:00
Arvind Tiwari 7bd61f708c Merge branch 'master' into task/3785/my_bills_page 2017-09-28 18:38:49 +05:30
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
Arvind Tiwari b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari 88706b0088 merged master 2017-09-28 03:06:47 +05:30
Arvind Tiwari 4379cebbed default 'card' translated 2017-09-28 03:05:47 +05:30
Arvind Tiwari 3ba1f191a3 show period if dates exist 2017-09-28 02:47:58 +05:30
Arvind Tiwari df67fa3333 period added 2017-09-28 02:39:55 +05:30
Arvind Tiwari 7039ccd3b9 modal btn color changed 2017-09-28 02:09:03 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder 3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-28 01:14:37 +05:30
Arvind Tiwari 8b9935f677 padding fix 2017-09-28 00:59:49 +05:30
Arvind Tiwari 77b2684217 mobile alignment fix for btn 2017-09-28 00:50:38 +05:30
Arvind Tiwari 4194a7c2d7 table header fixed 2017-09-27 22:50:42 +05:30
Arvind Tiwari 11c1781839 fix for gmail autoformatiing 2017-09-27 04:37:02 +05:30
Arvind Tiwari 313b32e098 vm name bold in email 2017-09-27 04:24:22 +05:30
Arvind Tiwari 06bc37a977 paddings changed 2017-09-27 04:13:04 +05:30
Arvind Tiwari f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari 5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari 2d06173edb logo padding 2017-09-27 02:50:59 +05:30
Arvind Tiwari 8307636b9b Merge branch 'master' into task/3794/update_email_styles 2017-09-27 02:16:09 +05:30
Arvind Tiwari d3f2fd2aa0 dcl logo changed to png 2017-09-27 02:14:20 +05:30
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
Arvind Tiwari ce63d397be Merge pull request #504 from tiwariav/task/3812/modal_weight_fix 
Task/3812 modal font size and check icon weight fix
 2017-09-27 00:42:37 +05:30
PCoder e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
Arvind Tiwari 2dbaa1c693 template name 2017-09-26 03:57:07 +05:30
Arvind Tiwari 2a99d053dc text fixes 2017-09-26 03:42:10 +05:30
Arvind Tiwari 3cf28c793c form method fix 2017-09-26 03:29:38 +05:30
Arvind Tiwari 3c32abbf8e dcl form added 2017-09-26 03:18:19 +05:30
Arvind Tiwari 050f750322 merged master 2017-09-26 03:06:12 +05:30
Arvind Tiwari f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
Arvind Tiwari 1fdc533f4d bills list page updated 2017-09-26 01:18:39 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +05:30
PCoder 46d82268f4 Show terminated in invoice for VM that has been terminated 2017-09-25 02:04:40 +05:30
PCoder 84db1606a3 Added resend_activation_link.html template file 2017-09-24 18:04:11 +05:30
PCoder 24522908e0 Added resend activation link to login page 2017-09-24 16:02:06 +05:30
PCoder 09dc0cde13 Removed unwanted js code that was causing error 2017-09-24 04:39:00 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder 300997699a Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm 2017-09-24 01:08:15 +05:30
Arvind Tiwari 7456baac16 merged master 2017-09-23 23:05:10 +05:30
Arvind Tiwari 363017d85f Merge pull request #488 from tiwariav/task/3777/hosting_calculator 
Task/3777 hosting create vm calculator
 2017-09-23 22:50:25 +05:30
Arvind Tiwari e9721705ca margin fix 2017-09-23 20:30:53 +05:30
Arvind Tiwari 6983b6f72e all emails redesigned 2017-09-23 02:27:19 +05:30
Arvind Tiwari 057a2c77a6 password reset email, user activation email redesigned 2017-09-23 01:57:40 +05:30