moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 13233d19c7 Merge pull request #82 from levivm/develop Levi Velázquez 2016-06-03 01:10:15 -05:00
  • 4da733f5b1 Merge pull request #82 from levivm/develop Levi Velázquez 2016-06-03 01:10:15 -05:00
  • 8c304dedb9 Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price Levi 2016-06-03 00:59:46 -05:00
  • 18c7691d92 Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price Levi 2016-06-03 00:59:46 -05:00
  • a72c1446b4 Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan Levi 2016-06-03 00:07:47 -05:00
  • d472d37fab Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan Levi 2016-06-03 00:07:47 -05:00
  • c03ff34aec Merge pull request #81 from levivm/develop Levi Velázquez 2016-05-30 16:44:31 -05:00
  • 350d09f339 Merge pull request #81 from levivm/develop Levi Velázquez 2016-05-30 16:44:31 -05:00
  • 63eebbb2b0 Added mark a notification as read feature, Fixed some errors Levi 2016-05-29 13:37:43 -05:00
  • a846f42bf6 Added mark a notification as read feature, Fixed some errors Levi 2016-05-29 13:37:43 -05:00
  • 7a9ea58a89 Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved Levi 2016-05-27 00:51:10 -05:00
  • c33c4f4148 Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved Levi 2016-05-27 00:51:10 -05:00
  • 081370c062 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-25 01:23:47 -05:00
  • 5da39e8ed3 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-25 01:23:47 -05:00
  • 02e716106e Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM Levi 2016-05-25 01:23:32 -05:00
  • b443d4d21e Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM Levi 2016-05-25 01:23:32 -05:00
  • d8536dbe5a Merge pull request #80 from levivm/develop Levi Velázquez 2016-05-24 01:27:58 -05:00
  • 3893bfbfde Merge pull request #80 from levivm/develop Levi Velázquez 2016-05-24 01:27:58 -05:00
  • 83a5a27791 fixed cdn fonts url Levi 2016-05-24 01:27:10 -05:00
  • 71f3d30549 fixed cdn fonts url Levi 2016-05-24 01:27:10 -05:00
  • 6273144411 Merge pull request #79 from levivm/develop Levi Velázquez 2016-05-24 01:22:36 -05:00
  • 38b2a5b3d6 Merge pull request #79 from levivm/develop Levi Velázquez 2016-05-24 01:22:36 -05:00
  • b4164e56ab Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH Levi 2016-05-24 01:19:49 -05:00
  • 8376d0106c Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH Levi 2016-05-24 01:19:49 -05:00
  • 35e312411f Merge pull request #78 from tmslav/develop tmslav 2016-05-22 17:37:44 +02:00
  • d160344130 Merge pull request #78 from tmslav/develop tmslav 2016-05-22 17:37:44 +02:00
  • 154f6a77bf hosting: https://redmine.ungleich.ch/issues/2292, fixed footer Tomislav R 2016-05-22 17:36:28 +02:00
  • ed95a7ada4 hosting: https://redmine.ungleich.ch/issues/2292, fixed footer Tomislav R 2016-05-22 17:36:28 +02:00
  • a06199448f Merge pull request #77 from tmslav/develop tmslav 2016-05-21 00:04:41 +02:00
  • 3beb220f90 Merge pull request #77 from tmslav/develop tmslav 2016-05-21 00:04:41 +02:00
  • 6eb5565537 https://redmine.ungleich.ch/issues/2290 Tomislav R 2016-05-21 00:03:17 +02:00
  • f6fbf13023 https://redmine.ungleich.ch/issues/2290 Tomislav R 2016-05-21 00:03:17 +02:00
  • 784ed0976b Merge pull request #76 from levivm/develop Levi Velázquez 2016-05-20 16:43:48 -04:30
  • b4bd728e35 Merge pull request #76 from levivm/develop Levi Velázquez 2016-05-20 16:43:48 -04:30
  • 419f08aff8 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-20 16:43:17 -04:30
  • 88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-20 16:43:17 -04:30
  • d4a44b2b6c Fixed Login Error Style , Started view to generating SSH key for a VM Levi 2016-05-20 16:41:42 -04:30
  • 5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM Levi 2016-05-20 16:41:42 -04:30
  • b8be9f3915 delete orders Tom 2016-05-20 15:00:06 +00:00
  • 418c257978 delete orders Tom 2016-05-20 15:00:06 +00:00
  • c8c7926a91 Merge pull request #75 from tmslav/develop tmslav 2016-05-20 15:00:41 +02:00
  • bb13644b06 Merge pull request #74 from tmslav/cancel_plans tmslav 2016-05-20 14:23:43 +02:00
  • aa4782607d Merge pull request #74 from tmslav/cancel_plans tmslav 2016-05-20 14:23:43 +02:00
  • 9671ec5f05 resolve conflicts Tomislav R 2016-05-20 14:22:51 +02:00
  • 2a7603778a resolve conflicts Tomislav R 2016-05-20 14:22:51 +02:00
  • b4fef1e296 Merge pull request #73 from levivm/develop Levi Velázquez 2016-05-19 01:51:25 -04:30
  • f1b1faa631 Merge pull request #73 from levivm/develop Levi Velázquez 2016-05-19 01:51:25 -04:30
  • 768a990040 Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message Levi 2016-05-19 01:47:16 -04:30
  • e26eecf2eb Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message Levi 2016-05-19 01:47:16 -04:30
  • d3b579a41c add delete hosting order Tomislav R 2016-05-19 00:58:28 +02:00
  • 04d8c263bf add delete hosting order Tomislav R 2016-05-19 00:58:28 +02:00
  • 150ab173a7 "Merge branch 'master' of https://github.com/ungleich/dynamicweb tmslav 2016-05-18 18:44:46 +00:00
  • c35366d1d6 change db name app_new -> app tmslav 2016-05-18 18:44:13 +00:00
  • ac51ce9290 Merge pull request #72 from ungleich/develop tmslav 2016-05-17 02:04:25 +02:00
  • 76c0fc092a Merge remote-tracking branch 'remotes/origin/master' into develop Tom 2016-05-16 23:48:11 +00:00
  • c3abf806c6 Merge remote-tracking branch 'remotes/origin/master' into develop Tom 2016-05-16 23:48:11 +00:00
  • 1ec01f9b57 Merge pull request #64 from sgoudelis/feature/orders_admin feature/vm_pricing tmslav 2016-05-17 01:39:44 +02:00
  • 0162038c02 Merge pull request #71 from sgoudelis/bugfix/usermanage#2286 tmslav 2016-05-17 01:39:30 +02:00
  • 72194df811 Merge pull request #71 from sgoudelis/bugfix/usermanage#2286 tmslav 2016-05-17 01:39:30 +02:00
  • 9658d6937a Registered CustomUser model in the admin panel. Efstratios Goudelis 2016-05-16 16:48:26 +03:00
  • 22bf60ae86 Registered CustomUser model in the admin panel. Efstratios Goudelis 2016-05-16 16:48:26 +03:00
  • d890770bcc Merge pull request #70 from sgoudelis/bugfix/blog_publish Nico Schottelius 2016-05-16 21:58:04 +09:00
  • 39c7f4858d Merge pull request #70 from sgoudelis/bugfix/blog_publish Nico Schottelius 2016-05-16 21:58:04 +09:00
  • 8fc0ad20a6 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now. Efstratios Goudelis 2016-05-16 15:56:05 +03:00
  • adcde9d5c7 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now. Efstratios Goudelis 2016-05-16 15:56:05 +03:00
  • 8d531a2995 Merge pull request #69 from sgoudelis/bugfix/blog_publish Nico Schottelius 2016-05-16 21:39:16 +09:00
  • 318e4af169 Merge pull request #69 from sgoudelis/bugfix/blog_publish Nico Schottelius 2016-05-16 21:39:16 +09:00
  • 9c83f29b94 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Efstratios Goudelis 2016-05-16 15:34:45 +03:00
  • 32e488d457 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Efstratios Goudelis 2016-05-16 15:34:45 +03:00
  • 7c88ebe9f5 Merge branch 'master' of github.com:ungleich/dynamicweb Nico Schottelius 2016-05-14 22:30:05 +02:00
  • 4f40fd1efa Merge branch 'master' of github.com:ungleich/dynamicweb Nico Schottelius 2016-05-14 22:30:05 +02:00
  • ec3b872650 remove open calls Nico Schottelius 2016-05-14 22:29:57 +02:00
  • f7701e31e7 remove open calls Nico Schottelius 2016-05-14 22:29:57 +02:00
  • c37094cb35 add mindmap Nico Schottelius 2016-05-14 22:29:33 +02:00
  • 56a2c25b14 add mindmap Nico Schottelius 2016-05-14 22:29:33 +02:00
  • b1e585026d Merge pull request #68 from levivm/develop Levi Velázquez 2016-05-14 02:21:32 -04:30
  • 7ed480e924 Merge pull request #68 from levivm/develop Levi Velázquez 2016-05-14 02:21:32 -04:30
  • cd0bbd4063 removed RailsBetaUser Levi 2016-05-14 02:20:45 -04:30
  • c869f4ec0b removed RailsBetaUser Levi 2016-05-14 02:20:45 -04:30
  • 9ec6f679c4 Merge pull request #67 from levivm/develop Levi Velázquez 2016-05-14 02:15:08 -04:30
  • 70ef0e338c Merge pull request #67 from levivm/develop Levi Velázquez 2016-05-14 02:15:08 -04:30
  • 8c71468921 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-14 02:12:53 -04:30
  • 9909a98a10 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-14 02:12:53 -04:30
  • e8e58066a0 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view Levi 2016-05-14 02:12:42 -04:30
  • 994b489c63 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view Levi 2016-05-14 02:12:42 -04:30
  • 87480b6f14 Merge pull request #66 from levivm/develop Levi Velázquez 2016-05-12 02:11:39 -05:00
  • 68c552c6a4 Merge pull request #66 from levivm/develop Levi Velázquez 2016-05-12 02:11:39 -05:00
  • 32d9b6719d added model mommy to requirements.txt Levi 2016-05-12 02:11:18 -05:00
  • 2a1bcbc904 added model mommy to requirements.txt Levi 2016-05-12 02:11:18 -05:00
  • eebf7abb66 Merge pull request #65 from levivm/develop Levi Velázquez 2016-05-12 02:04:59 -05:00
  • d4ea68f74e Merge pull request #65 from levivm/develop Levi Velázquez 2016-05-12 02:04:59 -05:00
  • fbb19c55f5 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-12 01:58:23 -05:00
  • 8304205537 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-05-12 01:58:23 -05:00
  • 8be59499b6 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data Levi 2016-05-12 01:57:34 -05:00
  • bf17e80df4 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data Levi 2016-05-12 01:57:34 -05:00
  • 849c5a2270 Added human readable representations of hosting order models to better manage order from the admin interface. Efstratios Goudelis 2016-05-11 13:02:35 +03:00
  • 32b64f2eb7 Merge branch 'develop' Tom 2016-05-08 18:14:51 +00:00
  • 5c544e6a8d Merge branch 'develop' Tom 2016-05-08 18:14:51 +00:00
  • 700406a16c Merge pull request #63 from tmslav/develop tmslav 2016-05-08 20:01:38 +02:00
  • 3186194b3f Merge pull request #63 from tmslav/develop tmslav 2016-05-08 20:01:38 +02:00