Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• 7c9ec6fdde Added contact us migrations after --merge with the existing migrations PCoder 2017-08-27 13:38:08 +05:30
• 28bcef082c Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message PCoder 2017-08-27 13:19:05 +05:30
• 6cca92ec3a Reformatted dcl's _navbar.html. PCoder 2017-08-21 23:16:30 +05:30
• b044acab5d Refactored class names to better names M.Ravi 2017-08-21 18:00:41 +02:00
• 929d790517 Renamed faq.html to cms_page.html M.Ravi 2017-08-21 17:59:56 +02:00
• 597541a2ee Updated _navbar to show menu on other pages except for index and whydcl M.Ravi 2017-08-21 17:52:57 +02:00
• 8caeaf0217 Added cms.css and renamed faq.html to cms_page.html M.Ravi 2017-08-21 17:51:17 +02:00
• 8ab52c3398 faq.html now referred as DCL.Faq PCoder 2017-08-19 06:41:29 +05:30
• 189adbadfb Added cms_tags, sekizai_tags and cms_toolbar PCoder 2017-08-19 06:39:56 +05:30
• cd67bb9938 Added faq.html cms template PCoder 2017-08-19 06:37:40 +05:30
• 464b48000d Added cdist requirement PCoder 2017-08-27 12:52:30 +05:30
• 6c1307d1d3 Reverted back to original title in base.html PCoder 2017-08-26 21:01:21 +05:30
• 67880d5d60 Added configuration for datacenterlight_cms_page_title_tag PCoder 2017-08-26 20:52:47 +05:30
• af713a0e96 cms_page.html: Added placeholder for title tag PCoder 2017-08-26 20:49:17 +05:30
• 0be3266ed3 Moved cms toolbar before title tag PCoder 2017-08-26 20:46:51 +05:30
• 0ee0d96e0f Added default text plugin for the cms page title PCoder 2017-08-26 02:56:05 +05:30
• 60cb27c728 Merge pull request #455 from pcoder/task/3709/faq_tos_cms_template Pcoder 2017-08-25 22:17:52 +02:00
• 8b5117ba80 Commented code that was causing the error when executing the tests PCoder 2017-08-25 13:28:16 +05:30
• 2ed07e25ff Corrected translation for 'You are not making payment ...' 1.1 PCoder 2017-08-25 09:49:55 +05:30
• 2a76167d10 Merge branch 'master' into task/3709/faq_tos_cms_template PCoder 2017-08-24 23:59:09 +05:30
• daa50d4672 settings page design Arvind Tiwari 2017-08-24 22:11:15 +05:30
• 9be42f3fd4 links added to the boxes Arvind Tiwari 2017-08-24 20:36:00 +05:30
• c87e2cd36b hosting settings url, view and template added Arvind Tiwari 2017-08-24 20:28:02 +05:30
• 23bf602a16 merged master, fixed translation Arvind Tiwari 2017-08-24 20:16:26 +05:30
• cfb1a303a1 new icons Arvind Tiwari 2017-08-24 19:56:30 +05:30
• bf304f9493 Fixed obtaining ga code from dict M.Ravi 2017-08-24 16:10:53 +02:00
• 01b64fec88 Attempt to fix no ga code in www. sites M.Ravi 2017-08-24 16:04:37 +02:00
• 63635f158e Updated requirements.txt M.Ravi 2017-08-24 15:39:10 +02:00
• eebbbcfa6d Updated Changelog for 1.1 M.Ravi 2017-08-24 14:27:52 +02:00
• 6206f25b56 Merge pull request #452 from pcoder/task/3701/enable_monthly_payments Pcoder 2017-08-24 13:42:42 +02:00
• c9357058f7 Added STRIPE_API_PRIVATE_KEY_TEST to the test case M.Ravi 2017-08-24 13:38:10 +02:00
• 7153b635e5 Removed (incl. VAT) text in hosting,dcl payment template M.Ravi 2017-08-24 13:29:34 +02:00
• 5e26d6df04 Simplified text -> You are not making payment + translation M.Ravi 2017-08-24 13:18:59 +02:00
• f32494af2f hosting po file: Removed fuzzy for a text M.Ravi 2017-08-24 13:05:26 +02:00
• 60df9a888c Added translation for month M.Ravi 2017-08-24 12:48:30 +02:00
• f2b0ff04ca Added text and styles for monthly payment clarification PCoder 2017-08-24 13:41:48 +05:30
• ebff2cbd94 hosting/payment.html: Added /month text and adjusted width PCoder 2017-08-24 12:55:22 +05:30
• 2ae88ae287 Added style for /month text PCoder 2017-08-24 12:54:12 +05:30
• 75da4a7711 hosting/models.py: Fixed bug extracting cc info from dict PCoder 2017-08-24 12:51:55 +05:30
• eab0c9fac1 Added price to specs as it is being used in create_vm_task PCoder 2017-08-24 12:30:17 +05:30
• 7c3a0b86d8 HostingOrder: Updated set_subscription_id to include cc details as parameter PCoder 2017-08-24 11:59:38 +05:30
• 16f000c723 dcl views.py: passing cc details to create_vm_task + reformatted code PCoder 2017-08-24 11:54:01 +05:30
• 3111255673 Updated test_create_vm_task for monthly subscriptions PCoder 2017-08-24 11:50:43 +05:30
• 0256b0bf03 Added credit card details as param for create_vm_task PCoder 2017-08-24 11:49:41 +05:30
• b5e488e326 Formatted utils/stripe_utils.py PCoder 2017-08-24 10:31:57 +05:30
• a964f2fb5b Merged master into task/3701/enable_monthly_payments PCoder 2017-08-24 04:06:48 +05:30
• 0026874f09 Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages Pcoder 2017-08-24 00:00:22 +02:00
• 703644ced4 Removed orphaned alt tag PCoder 2017-08-24 03:17:39 +05:30
• a77b7b0ab5 Merge pull request #460 from pcoder/add_test_create_vm_celery_task Pcoder 2017-08-23 23:24:49 +02:00
• 6484684ac5 Removed unncessary check for error for make_charge PCoder 2017-08-24 02:29:24 +05:30
• 4d18dc6f7c Corrected/added missing google analytics and reformated code PCoder 2017-08-24 01:20:32 +05:30
• 738e4fc93f removed duplicate for "See Invoice" Arvind Tiwari 2017-08-24 01:07:20 +05:30
• c0ce522dbe Merge pull request #457 from tiwariav/task/3698/my_orders_page Arvind Tiwari 2017-08-24 01:02:24 +05:30
• 30551e5ac5 merged master Arvind Tiwari 2017-08-24 00:59:17 +05:30
• 04d7a2b076 removed fuzzy Arvind Tiwari 2017-08-24 00:48:07 +05:30
• fc0ed90447 background and margin fix Arvind Tiwari 2017-08-24 00:39:47 +05:30
• ab4e7feedd Merge pull request #442 from tiwariav/bugfix/3645/modal-show Arvind Tiwari 2017-08-24 00:34:14 +05:30
• f1f166b798 Ihre virtuelle Maschine beenden -> Deine Virtuelle Maschine beenden Arvind Tiwari 2017-08-24 00:13:03 +05:30
• b2a0e0a385 Merge pull request #453 from tiwariav/task/3697/vm_details_page Arvind Tiwari 2017-08-24 00:01:08 +05:30
• 4cf6df64a8 btn link fixed Arvind Tiwari 2017-08-23 23:59:18 +05:30
• 17be01370b removed test url Arvind Tiwari 2017-08-23 23:52:09 +05:30
• a2dd55cf16 padding adjusted Arvind Tiwari 2017-08-23 23:49:29 +05:30
• 4cc2e09b0a Rearranged imports in base.py M.Ravi 2017-08-23 20:18:46 +02:00
• 4179d622aa changed border color for error input Arvind Tiwari 2017-08-23 23:46:59 +05:30
• 0846718893 Rearranged imports M.Ravi 2017-08-23 20:16:22 +02:00
• 82b73df6e7 Added test case to check whether celery task executes properly on production. M.Ravi 2017-08-23 20:12:50 +02:00
• 78c9931002 mobile view buttons shifted below Arvind Tiwari 2017-08-23 23:31:06 +05:30
• 788621bd2b test markup removed Arvind Tiwari 2017-08-23 23:07:40 +05:30
• e6e0bea9b4 increased padding Arvind Tiwari 2017-08-23 21:55:29 +05:30
• 302f17a3d3 increased padding Arvind Tiwari 2017-08-23 21:52:23 +05:30
• e50baf50e8 increased padding Arvind Tiwari 2017-08-23 21:51:56 +05:30
• 67362b5466 increase width Arvind Tiwari 2017-08-23 21:09:56 +05:30
• 9257f73739 ipv6 line break Arvind Tiwari 2017-08-23 21:07:35 +05:30
• e912acd3ca increase max-width for page contents Arvind Tiwari 2017-08-23 21:04:14 +05:30
• 4c23d2bd30 contact box, line break Arvind Tiwari 2017-08-23 19:42:49 +05:30
• e15cf7e164 translation fix Arvind Tiwari 2017-08-23 19:35:23 +05:30
• 0cac35831a code cleanup, translations fix Arvind Tiwari 2017-08-23 19:22:59 +05:30
• 27a233ffc4 translations added Arvind Tiwari 2017-08-23 18:14:33 +05:30
• 9bbcd1b9ab translations compiled Arvind Tiwari 2017-08-22 21:40:40 +05:30
• 12844ac0d9 dashboard page Arvind Tiwari 2017-08-22 21:35:30 +05:30
• c7b69ec4d9 Merge branch 'master' into task/3697/vm_details_page Arvind Tiwari 2017-08-22 20:45:47 +05:30
• 6890c82122 dashboard url, view,template and css added Arvind Tiwari 2017-08-22 20:45:18 +05:30
• 9eecfbda64 Added hdd parameter as an optional parameter to the subscription plan id PCoder 2017-08-22 02:12:43 +05:30
• 487ab6b927 Changed the subscription plan id field size to 256 characters PCoder 2017-08-22 01:55:45 +05:30
• 83df42b5df Fixed checking active status of subscription + redirection to payment page on error PCoder 2017-08-22 00:07:58 +05:30
• d8b76abda2 translations fixed Arvind Tiwari 2017-08-21 23:41:38 +05:30
• b256199d82 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-08-21 23:38:54 +05:30
• a0d5b4d04f removed Lato font files from web server, and its usage from css files Arvind Tiwari 2017-08-21 23:35:17 +05:30
• 6c80f94f67 Reformatted dcl's _navbar.html. PCoder 2017-08-21 23:16:30 +05:30
• 6339442bfe Merge branch 'master' into task/3709/faq_tos_cms_template M.Ravi 2017-08-21 18:01:28 +02:00
• 696af58bff Refactored class names to better names M.Ravi 2017-08-21 18:00:41 +02:00
• 7d7260ce6d Renamed faq.html to cms_page.html M.Ravi 2017-08-21 17:59:56 +02:00
• c8dcd65adc Updated _navbar to show menu on other pages except for index and whydcl M.Ravi 2017-08-21 17:52:57 +02:00
• 090f338878 Added cms.css and renamed faq.html to cms_page.html M.Ravi 2017-08-21 17:51:17 +02:00
• 506b5a904a Added missing code from the merge PCoder 2017-08-21 01:54:55 +05:30
• 29d36faef0 Refactored some code PCoder 2017-08-21 00:41:46 +05:30
• 7def893028 Merged origin/master into task/3701/enable_monthly_payments PCoder 2017-08-21 00:27:44 +05:30
• e20d42e84b Merge pull request #454 from pcoder/task/3711/show_ipv4 Pcoder 2017-08-20 20:09:38 +02:00
• 4a75da0140 Merge branch 'master' into task/3711/show_ipv4 PCoder 2017-08-20 23:31:29 +05:30
• 653b3654b8 merged master Arvind Tiwari 2017-08-20 22:04:48 +05:30