ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
2,104 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

2104 Commits

Author SHA1 Message Date
M.Ravi 55177646b4 Reformatted code 2017-08-06 16:33:37 +02:00
M.Ravi 68505e73a8 Added django-celery-results and setup redis as backend for celery tasks 2017-08-06 16:32:35 +02:00
M.Ravi 477c8e81a4 Added default celery.py code 2017-08-06 15:10:26 +02:00
M.Ravi d6d0b9c8c0 Added default init code for celery 2017-08-06 15:08:46 +02:00
M.Ravi bd2edf599a Merged views from master 2017-08-06 15:08:05 +02:00
M.Ravi 3ad5928aa0 A working version of celery create_vm_task added 2017-08-06 14:33:55 +02:00
PCoder d8592fc6d8 Added celery files 2017-08-06 12:30:56 +05:30
Pcoder 90f01c277b Merge pull request #436 from tiwariav/task/3660/webringfuture 
task #3660 whydatacenterlight 'we bring future' section
 2017-08-04 21:02:53 +02:00
Pcoder 2ae0d3186c Merge pull request #437 from ungleich/tiwariav-bugfix/modal_icons 
Tiwariav bugfix/modal icons

Added missing modal icons
 2017-08-04 20:42:51 +02:00
PCoder 1d4f86da14 Added translation for Delete SSH Key 2017-08-05 00:01:19 +05:30
PCoder 7d334fddb0 Merge branch 'bugfix/modal_icons' of https://github.com/tiwariav/dynamicweb into tiwariav-bugfix/modal_icons 2017-08-04 23:53:47 +05:30
Pcoder c1ad5e0b30 Merge pull request #422 from tiwariav/bugfix/3621/mobile_signup 
bugfix #3621 signup page layout fix mobile, confirm-reset-page layout fix
 2017-08-04 19:59:00 +02:00
Pcoder 5f71b19fb1 Merge pull request #429 from amarynets/bugfix/add_vmtemplate_mig_file 
Add file with VMTemplate hosting migrations
 2017-08-04 19:44:34 +02:00
M.Ravi d85afd56e0 Fixed an issue 
- Changed owner -> user
   - Reformatted code
 2017-08-04 17:49:55 +02:00
PCoder c6b23f6aa0 Added get_object method to verify if the user is the owner of the ssh key 2017-08-04 20:54:28 +05:30
ARvind Tiwari d93942fa0b heading sizes changed 2017-08-04 18:32:34 +05:30
ARvind Tiwari 6cef45beee lead line break and alignment fixed 2017-08-04 17:20:53 +05:30
Siarhei Puhach fd2bc6e5cf Merge branch 'feature/task3637' of https://github.com/siarheipuhach/dynamicweb into feature/task3637 2017-08-04 12:40:14 +03:00
Siarhei Puhach 8769c4cd1f Changed payment error message style 2017-08-04 12:38:24 +03:00
Siarhei Puhach 657e97fc6d Merge branch 'master' into feature/task3637 2017-08-04 11:05:37 +03:00
Siarhei Puhach 29fb771afb Changed payment error place, changed message source to Stripe errors handler 2017-08-04 11:01:32 +03:00
Pcoder 824749545c Merge pull request #426 from pcoder/bug/3633/copyright_translation 
Bug/3633/copyright translation
 2017-08-04 00:05:45 +02:00
PCoder 94bc552f75 Resolved conflicts 2017-08-04 03:25:47 +05:30
Pcoder 5b8e73984e Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix 
Bug/3623/hosting my orders header fix
 2017-08-03 23:38:22 +02:00
ARvind Tiwari 9f67af0739 modal icons fixed 2017-08-04 02:54:34 +05:30
PCoder 6175cf9617 Merge branch 'master' into bug/3638/ssh_key_without_download_option 2017-08-04 02:29:20 +05:30
Pcoder 3d051aee14 Merge pull request #428 from tiwariav/task/3620/ssh_keys 
task/3620 ssh_keys_choice page new design
 2017-08-03 22:53:12 +02:00
PCoder 23b927f7fb Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option 2017-08-04 02:07:25 +05:30
ARvind Tiwari 3560eede37 ssh list modal and table paddings 2017-08-04 02:05:27 +05:30
PCoder 0fa4c0ac94 Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option 2017-08-04 01:45:55 +05:30
Pcoder 0adc24c13a Merge pull request #423 from tiwariav/bugfix/3408/login_image 
new background image for login/signup
 2017-08-03 21:45:08 +02:00
ARvind Tiwari 75afb59d77 flex removed from dash-borad content, reset-password message added to login page 2017-08-04 00:28:15 +05:30
Pcoder 957c677e67 Merge pull request #427 from pcoder/bug/3627/outline_box 
bug/3627/Add missing outline border around the text
 2017-08-03 20:36:00 +02:00
ARvind Tiwari 6d2a6b6045 removed unused img file 2017-08-03 23:52:46 +05:30
ARvind Tiwari 87dc273c4b bootstrap file changed to default 2017-08-03 23:27:42 +05:30
ARvind Tiwari a86224f566 translation fix 2017-08-03 23:26:09 +05:30
ARvind Tiwari 0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
M.Ravi 60d107baee Improved the condition about when to generate ssh keys 2017-08-03 15:07:36 +02:00
Siarhei Puhach 34acf2310b Added stripe failed payment error handler 2017-08-03 12:47:34 +03:00
M.Ravi 2e9d838b64 Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option 2017-08-03 10:32:27 +02:00
Pcoder 146c19482f Merge pull request #431 from tiwariav/bugfix/whydatacenterlight 
Hotfix for missing translations in PR #420
 2017-08-03 00:00:05 +02:00
ARvind Tiwari 3081786f0b merged master, conflict resolved 2017-08-03 03:27:46 +05:30
ARvind Tiwari bbdea342cf merged master, conflict resolved 2017-08-03 03:20:59 +05:30
ARvind Tiwari fda20eacd6 translation fix and font-weight bold 2017-08-03 03:12:40 +05:30
Andrii Marynets d2beef2032 Add parameter to function for TravisCI 2017-08-03 00:24:16 +03:00
Pcoder 4d33837069 Merge pull request #420 from tiwariav/task/3553 
why datacenterlight page, 'we bring the future' section layout
 2017-08-02 22:57:00 +02:00
Pcoder 7ffcc18378 Merge pull request #410 from tiwariav/task/3354/modal_restyling 
task/3354/modal_restyling
 2017-08-02 22:42:11 +02:00
Andrii Marynets e13d802f28 Add file with VMTemplate hosting migrations 2017-08-02 23:40:00 +03:00
ARvind Tiwari bfd621e98b ssh_keys table updated 2017-08-03 01:27:29 +05:30
ARvind Tiwari 00ec5fb0db code reformating 2017-08-03 00:59:05 +05:30