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

• 07a6473f62 url structure fix ungleich Tomislav R 2016-04-24 01:15:58 +02:00
• c57db296aa url structure fix ungleich Tomislav R 2016-04-24 01:15:58 +02:00
• 3f4d29c38f Merge pull request #47 from tmslav/develop tmslav 2016-04-23 23:48:38 +02:00
• 0b498dec32 Merge pull request #47 from tmslav/develop tmslav 2016-04-23 23:48:38 +02:00
• 84ce57b2c2 added dist Tomislav R 2016-04-23 23:48:03 +02:00
• 74ca696bfc added dist Tomislav R 2016-04-23 23:48:03 +02:00
• 2d74d06691 Merge pull request #46 from tmslav/develop tmslav 2016-04-23 23:38:54 +02:00
• 12b00348d1 Merge pull request #46 from tmslav/develop tmslav 2016-04-23 23:38:54 +02:00
• 2f7b9e4ad4 change remove files loading Tomislav R 2016-04-23 23:38:09 +02:00
• 27d4a43e12 change remove files loading Tomislav R 2016-04-23 23:38:09 +02:00
• 4c7c3c5141 Merge pull request #45 from tmslav/develop tmslav 2016-04-23 20:40:02 +02:00
• f29e15375d Merge pull request #45 from tmslav/develop tmslav 2016-04-23 20:40:02 +02:00
• 8ea8ff216c font-awesome local version Tomislav R 2016-04-23 20:39:02 +02:00
• 849d5e313d font-awesome local version Tomislav R 2016-04-23 20:39:02 +02:00
• f1da9bd24b Merge pull request #44 from tmslav/develop tmslav 2016-04-23 20:27:55 +02:00
• 5544c40337 Merge pull request #44 from tmslav/develop tmslav 2016-04-23 20:27:55 +02:00
• 8bf18c2833 https Tomislav R 2016-04-23 20:27:13 +02:00
• 9215655d6c https Tomislav R 2016-04-23 20:27:13 +02:00
• 0150801e93 Merge pull request #43 from tmslav/develop tmslav 2016-04-23 20:13:34 +02:00
• 17788cafb9 Merge pull request #43 from tmslav/develop tmslav 2016-04-23 20:13:34 +02:00
• 5d0b49b6d9 new url structure Tomislav R 2016-04-23 20:12:55 +02:00
• b72a2795f0 new url structure Tomislav R 2016-04-23 20:12:55 +02:00
• a6256964e8 Merge branch 'tmslav-updating_calendar' into develop Tomislav R 2016-04-23 19:09:59 +02:00
• 49f50117d8 Merge branch 'tmslav-updating_calendar' into develop Tomislav R 2016-04-23 19:09:59 +02:00
• f7ec020838 :Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar Tomislav R 2016-04-23 19:08:23 +02:00
• c653917358 :Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar Tomislav R 2016-04-23 19:08:23 +02:00
• 9057b3ac7e Merge pull request #41 from levivm/feature/vm_pricing tmslav 2016-04-23 19:01:16 +02:00
• 81281e9cd7 Merge pull request #41 from levivm/feature/vm_pricing tmslav 2016-04-23 19:01:16 +02:00
• 213f295394 digitalglarus booking update Tomislav R 2016-04-23 19:00:20 +02:00
• ae0c404951 digitalglarus booking update Tomislav R 2016-04-23 19:00:20 +02:00
• 4777484245 Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows Levi 2016-04-23 02:22:44 -05:00
• 5456c4c341 Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows Levi 2016-04-23 02:22:44 -05:00
• 2827275bdc Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-22 19:58:30 -05:00
• 9fa83e6f9a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-22 19:58:30 -05:00
• 0bad2870f9 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors Levi 2016-04-22 08:36:38 -05:00
• 38801abed7 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors Levi 2016-04-22 08:36:38 -05:00
• 82377a2dcc :Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop Tomislav R 2016-04-22 10:08:33 +02:00
• 4389230b60 :Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop Tomislav R 2016-04-22 10:08:33 +02:00
• 4a68857717 wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop Tomislav R 2016-04-22 10:04:00 +02:00
• f4fb538b9e wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop Tomislav R 2016-04-22 10:04:00 +02:00
• de70ae3acd Merge pull request #38 from sgoudelis/hosting-urls tmslav 2016-04-22 09:59:04 +02:00
• 4f8502dfa2 Merge pull request #38 from sgoudelis/hosting-urls tmslav 2016-04-22 09:59:04 +02:00
• cccea5d67a Merge pull request #40 from levivm/feature/vm_pricing tmslav 2016-04-22 09:58:29 +02:00
• dede0246ec Merge pull request #40 from levivm/feature/vm_pricing tmslav 2016-04-22 09:58:29 +02:00
• 64a484e749 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors Levi 2016-04-20 01:03:32 -05:00
• 4e23adcea6 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors Levi 2016-04-20 01:03:32 -05:00
• 2e4c7caf9c Merge pull request #39 from levivm/feature/vm_pricing Levi Velázquez 2016-04-20 01:02:31 -05:00
• 04425f751f Merge pull request #39 from levivm/feature/vm_pricing Levi Velázquez 2016-04-20 01:02:31 -05:00
• cb51e08cef Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change Levi 2016-04-19 01:04:15 -05:00
• 9694681dd2 Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change Levi 2016-04-19 01:04:15 -05:00
• 4442501786 Added extra URLs for the hosting pages: Efstratios Goudelis 2016-04-18 12:16:29 +03:00
• 805707e905 Added extra URLs for the hosting pages: Efstratios Goudelis 2016-04-18 12:16:29 +03:00
• 3015399692 registered VM types model in the admin Levi 2016-04-17 20:05:39 -05:00
• 5e1419cd1c registered VM types model in the admin Levi 2016-04-17 20:05:39 -05:00
• 368cfcecd1 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-17 19:52:32 -05:00
• d881620c42 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-17 19:52:32 -05:00
• 05e73b1d5e Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database Levi 2016-04-17 19:52:19 -05:00
• 7c891fe9c4 Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database Levi 2016-04-17 19:52:19 -05:00
• 8a6b4d695d Merge pull request #36 from levivm/develop Levi Velázquez 2016-04-15 22:58:07 -05:00
• 7c29726166 Merge pull request #36 from levivm/develop Levi Velázquez 2016-04-15 22:58:07 -05:00
• bdbf328375 fixed login urls Levi 2016-04-15 22:57:16 -05:00
• 5397fd9a63 fixed login urls Levi 2016-04-15 22:57:16 -05:00
• 8efa851430 Merge pull request #35 from levivm/develop Levi Velázquez 2016-04-15 22:41:59 -05:00
• 90f59286b0 Merge pull request #35 from levivm/develop Levi Velázquez 2016-04-15 22:41:59 -05:00
• 5198333013 fixing url translations Levi 2016-04-15 22:25:57 -05:00
• 043d5f28c3 fixing url translations Levi 2016-04-15 22:25:57 -05:00
• 7c3bb07c9a Merge pull request #34 from levivm/develop Levi Velázquez 2016-04-15 21:43:13 -05:00
• 7b875efb22 Merge pull request #34 from levivm/develop Levi Velázquez 2016-04-15 21:43:13 -05:00
• 1cfc52cf94 Adding correct home menu option Levi 2016-04-15 21:42:21 -05:00
• 8ebeb1dc76 Adding correct home menu option Levi 2016-04-15 21:42:21 -05:00
• 98cc38b1cf Merge branch 'develop' into updating_calendar Tomislav R 2016-04-16 03:43:49 +02:00
• b546300891 Merge branch 'develop' into updating_calendar Tomislav R 2016-04-16 03:43:49 +02:00
• c80eb8bdad Merge pull request #33 from levivm/develop Levi Velázquez 2016-04-15 20:21:39 -05:00
• 2f4e668371 Merge pull request #33 from levivm/develop Levi Velázquez 2016-04-15 20:21:39 -05:00
• e075be8534 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-15 20:18:54 -05:00
• b0be58ac1d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-15 20:18:54 -05:00
• ab75b12ffa Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page Levi 2016-04-15 20:18:29 -05:00
• d2238106e8 Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page Levi 2016-04-15 20:18:29 -05:00
• 3f9b4abc6b Merge pull request #32 from levivm/develop Levi Velázquez 2016-04-13 01:27:54 -05:00
• 673fb73209 Merge pull request #32 from levivm/develop Levi Velázquez 2016-04-13 01:27:54 -05:00
• 997f3145db Fixed admin urls Levi 2016-04-13 01:27:11 -05:00
• 488bb76c76 Fixed admin urls Levi 2016-04-13 01:27:11 -05:00
• 14f5faf843 Merge pull request #31 from levivm/develop Levi Velázquez 2016-04-13 01:11:30 -05:00
• e8720422fd Merge pull request #31 from levivm/develop Levi Velázquez 2016-04-13 01:11:30 -05:00
• 85c0b8348f Removing files Levi 2016-04-13 01:02:48 -05:00
• 830018f41c Removing files Levi 2016-04-13 01:02:48 -05:00
• 6c11aaaa0c Adding .psd to gitignore Levi 2016-04-13 00:50:11 -05:00
• 363dc15afe Adding .psd to gitignore Levi 2016-04-13 00:50:11 -05:00
• 8544efc898 Cleaning files Levi 2016-04-13 00:46:09 -05:00
• 74a4002654 Cleaning files Levi 2016-04-13 00:46:09 -05:00
• 2395b2fe97 Cleaning psd files Levi 2016-04-13 00:38:26 -05:00
• a768ce35a2 Cleaning psd files Levi 2016-04-13 00:38:26 -05:00
• fd66c33299 Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls Levi 2016-04-13 00:31:19 -05:00
• c09fc89197 Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls Levi 2016-04-13 00:31:19 -05:00
• 5a04fc4969 Moved ungleich landing into django Levi 2016-04-12 22:03:18 -05:00
• 202c3f5b46 Moved ungleich landing into django Levi 2016-04-12 22:03:18 -05:00
• 09a787e1ac Merge pull request #29 from levivm/develop Levi Velázquez 2016-04-12 00:54:02 -05:00
• 6f8bb26c95 Merge pull request #29 from levivm/develop Levi Velázquez 2016-04-12 00:54:02 -05:00
• 1469f077bd Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-12 00:51:02 -05:00
• ce6d98c931 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-12 00:51:02 -05:00