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

• 949d2a3e58 fix contact ungleich Tomislav R 2016-05-08 19:58:37 +02:00
• 05e752625e fix contact ungleich Tomislav R 2016-05-08 19:58:37 +02:00
• 43da718153 ungleich template - fix unused translatation tag Tom 2016-05-08 15:01:59 +00:00
• 88e6d068b6 ungleich template - fix unused translatation tag Tom 2016-05-08 15:01:59 +00:00
• 2c0f8c4530 update email sending tmslav 2016-05-08 01:04:03 +00:00
• 6e82b50f99 update email sending tmslav 2016-05-08 01:04:03 +00:00
• 44d0046ccc media Tom 2016-05-08 00:21:30 +00:00
• 55e92a1017 media Tom 2016-05-08 00:21:30 +00:00
• be1b03df85 update from development Tom 2016-05-07 23:02:29 +00:00
• 7d7c682cec update from development Tom 2016-05-07 23:02:29 +00:00
• f64c42e554 Merge pull request #62 from tmslav/develop tmslav 2016-05-07 23:07:22 +02:00
• b54c6eb99c Merge pull request #62 from tmslav/develop tmslav 2016-05-07 23:07:22 +02:00
• e137e8a26e resolve base.py conflict Tomislav R 2016-05-07 23:05:46 +02:00
• fbbee2839c resolve base.py conflict Tomislav R 2016-05-07 23:05:46 +02:00
• 073c9bf192 Merge remote-tracking branch 'upstream/develop' into develop Tomislav R 2016-05-07 23:02:49 +02:00
• 5e51fa6dbf Merge remote-tracking branch 'upstream/develop' into develop Tomislav R 2016-05-07 23:02:49 +02:00
• 3cad994970 Merge pull request #61 from levivm/develop Levi Velázquez 2016-05-05 09:03:44 -05:00
• 99b16b09fb Merge pull request #61 from levivm/develop Levi Velázquez 2016-05-05 09:03:44 -05:00
• 37e75ec355 Merge pull request #60 from levivm/feature/vm_pricing Levi Velázquez 2016-05-05 01:08:19 -05:00
• 9415041f64 Merge branch 'feature/vm_pricing' into develop Levi 2016-05-05 01:04:02 -05:00
• 36de71441a Merge branch 'feature/vm_pricing' into develop Levi 2016-05-05 01:04:02 -05:00
• 342512036d Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking Levi 2016-05-05 01:03:35 -05:00
• 14f78893d5 Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking Levi 2016-05-05 01:03:35 -05:00
• ca136d4e47 Merge branch 'develop' into feature/vm_pricing Levi 2016-05-04 22:07:30 -05:00
• bf0e152789 Merge branch 'develop' into feature/vm_pricing Levi 2016-05-04 22:07:30 -05:00
• 6e8004bfd0 Changed hostingorder to m2m with vm plan model Levi 2016-05-04 22:06:49 -05:00
• 90aca7c25c Changed hostingorder to m2m with vm plan model Levi 2016-05-04 22:06:49 -05:00
• 5480b51e92 Updated INSTALLATION doc Tomislav R 2016-05-04 20:13:31 +02:00
• 6abf5b1b53 Updated INSTALLATION doc Tomislav R 2016-05-04 20:13:31 +02:00
• 9cfdeb73c6 Updated INSTALLATION doc Tomislav R 2016-05-04 20:12:58 +02:00
• 7faf08bfde Updated INSTALLATION doc Tomislav R 2016-05-04 20:12:58 +02:00
• f536da4e01 Updated INSTALLATION doc Tomislav R 2016-05-04 20:11:15 +02:00
• d7b31c443a Updated INSTALLATION doc Tomislav R 2016-05-04 20:11:15 +02:00
• f1716410e6 payment bug resolve Tom 2016-05-04 17:59:25 +00:00
• a14135adff payment bug resolve Tom 2016-05-04 17:59:25 +00:00
• 9f859ef116 remove debugger Tom 2016-05-04 17:45:41 +00:00
• 358bacff85 remove debugger Tom 2016-05-04 17:45:41 +00:00
• 786dbbf895 remove debugger Tom 2016-05-04 17:45:12 +00:00
• 41bcdc92d0 remove debugger Tom 2016-05-04 17:45:12 +00:00
• 4c68bd8dbc Merge pull request #59 from tmslav/develop tmslav 2016-05-04 17:42:36 +02:00
• e33df5173d Merge pull request #59 from tmslav/develop tmslav 2016-05-04 17:42:36 +02:00
• 9f2b3a2a31 resolve merge conflicts Tomislav R 2016-05-04 17:36:54 +02:00
• 52ea4eec49 resolve merge conflicts Tomislav R 2016-05-04 17:36:54 +02:00
• ffb0b6b6fb Merge pull request #58 from levivm/feature/vm_pricing Levi Velázquez 2016-05-04 00:20:59 -05:00
• 1486843af0 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page Levi 2016-05-04 00:16:41 -05:00
• a99ea335c8 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page Levi 2016-05-04 00:16:41 -05:00
• 7455668161 Merge pull request #57 from levivm/feature/vm_pricing Levi Velázquez 2016-05-03 01:07:16 -05:00
• bbddb48ecc Changed redirect url after login Levi 2016-05-03 01:06:43 -05:00
• 539117741e Changed redirect url after login Levi 2016-05-03 01:06:43 -05:00
• ec5cecb7c3 Merge pull request #56 from levivm/feature/vm_pricing Levi Velázquez 2016-05-03 01:03:17 -05:00
• 7d697b3c3a Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page Levi 2016-05-03 00:59:40 -05:00
• 906df2a111 Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page Levi 2016-05-03 00:59:40 -05:00
• 3b387d61db added test Tomislav R 2016-05-02 02:00:38 +02:00
• b19e33b8da added test Tomislav R 2016-05-02 02:00:38 +02:00
• 45730e4eb1 update dg payment Tomislav R 2016-05-01 14:13:12 +02:00
• 65e3cdeb94 update dg payment Tomislav R 2016-05-01 14:13:12 +02:00
• 8a6c05eb7d Merge pull request #55 from levivm/feature/vm_pricing Levi Velázquez 2016-04-30 14:30:54 -05:00
• 3b3a366c23 Merge pull request #55 from levivm/feature/vm_pricing Levi Velázquez 2016-04-30 14:30:54 -05:00
• c4bf4fc6ff Fixed error creating stripe customer Levi 2016-04-30 14:29:16 -05:00
• 3a12308e85 Fixed error creating stripe customer Levi 2016-04-30 14:29:16 -05:00
• 9db711d686 Merge pull request #54 from levivm/feature/vm_pricing Levi Velázquez 2016-04-30 13:57:11 -05:00
• 03ec41b8e2 Merge pull request #54 from levivm/feature/vm_pricing Levi Velázquez 2016-04-30 13:57:11 -05:00
• 4d47564ea6 Added redirect urls after signup/login Levi 2016-04-30 13:55:55 -05:00
• 1c5fc6a437 Added redirect urls after signup/login Levi 2016-04-30 13:55:55 -05:00
• b06b0f9ebb Merge pull request #53 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 23:54:45 -05:00
• 61442e6f02 Merge pull request #53 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 23:54:45 -05:00
• 8f82a5b88e Fixed requirements file Levi 2016-04-29 23:53:36 -05:00
• 57b1ab7022 Fixed requirements file Levi 2016-04-29 23:53:36 -05:00
• 90833d5a19 Merge pull request #52 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 23:44:15 -05:00
• 7c8093734b Merge pull request #52 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 23:44:15 -05:00
• 46893a5f60 Fixed requirements file Levi 2016-04-29 23:43:34 -05:00
• bad0bd60d0 Fixed requirements file Levi 2016-04-29 23:43:34 -05:00
• fa29204a1a Merge pull request #51 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 01:58:42 -05:00
• 4d4c7cf84e Merge pull request #51 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 01:58:42 -05:00
• 9502580030 Merge pull request #50 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 01:53:55 -05:00
• 484c80d15a Merge pull request #50 from levivm/feature/vm_pricing Levi Velázquez 2016-04-29 01:53:55 -05:00
• 3459dc6cbc Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template Levi 2016-04-29 01:53:24 -05:00
• de48f1ce69 Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template Levi 2016-04-29 01:53:24 -05:00
• e0fc542673 fix merge conflict Tomislav R 2016-04-28 19:47:44 +02:00
• 69f9f4a416 fix merge conflict Tomislav R 2016-04-28 19:47:44 +02:00
• 0fc96880ef update dg Tomislav R 2016-04-28 19:42:01 +02:00
• a493ad225d update dg Tomislav R 2016-04-28 19:42:01 +02:00
• e7c8258427 Handled stripe payment errors , Added invoice template, Added view to handle invoice data Levi 2016-04-27 01:54:15 -05:00
• 46ab364184 Handled stripe payment errors , Added invoice template, Added view to handle invoice data Levi 2016-04-27 01:54:15 -05:00
• a5c24855a4 Merge pull request #49 from levivm/feature/vm_pricing Levi Velázquez 2016-04-27 01:53:38 -05:00
• df886a756c Merge pull request #49 from levivm/feature/vm_pricing Levi Velázquez 2016-04-27 01:53:38 -05:00
• fdf8722c8f Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer Levi 2016-04-26 01:16:03 -05:00
• bf334a38d4 Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer Levi 2016-04-26 01:16:03 -05:00
• 981be2dcf4 Merge branch 'develop' into feature/vm_pricing Levi 2016-04-24 19:20:17 -05:00
• f5978a7da9 Merge branch 'develop' into feature/vm_pricing Levi 2016-04-24 19:20:17 -05:00
• f1dfc205ac Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-24 19:19:47 -05:00
• 39d262bc24 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-24 19:19:47 -05:00
• 84e5178e9b Merge branch 'develop' into feature/vm_pricing Levi 2016-04-24 16:18:37 -05:00
• 34fcb403c7 Merge branch 'develop' into feature/vm_pricing Levi 2016-04-24 16:18:37 -05:00
• b770a9b2cc Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-24 16:16:39 -05:00
• 98c1740cd2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-24 16:16:39 -05:00
• fcc1f8fb4b reverted changes to url structure Tomislav R 2016-04-24 23:16:38 +02:00
• 2dff11d446 reverted changes to url structure Tomislav R 2016-04-24 23:16:38 +02:00
• 7ac715684e Merge pull request #48 from tmslav/develop tmslav 2016-04-24 01:16:38 +02:00
• f01390ec17 Merge pull request #48 from tmslav/develop tmslav 2016-04-24 01:16:38 +02:00