sanghee
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,651 Commits 10 Branches 82 Tags 313 MiB
Commit Graph

1651 Commits

Author SHA1 Message Date
Nico Schottelius bc7f90b615 Merge branch 'master' into cleanup_201706 2017-06-05 18:41:22 +02:00
Modulos 25bfb41081 Typo public_key -> ssh_key 2017-06-05 15:51:56 +02:00
Nico Schottelius ccfa36bdd7 Update changelog 2017-06-05 15:32:39 +02:00
Nico Schottelius 6204cbc990 Add all domains to ALLOwED_HOSTS 2017-06-05 15:29:37 +02:00
Levi Velázquez f4997f041c Merge pull request #309 from levivm/develop 
fixed payment when user has already a card
 2017-06-04 17:42:34 -05:00
Levi 484ab5f1c6 fixed payment when user has already a card 2017-06-04 17:41:48 -05:00
Levi Velázquez c38b36a8a5 Merge pull request #308 from levivm/develop 
Merging ssh fix from modulos
 2017-06-04 17:24:21 -05:00
Levi 9d8ebed1cf Merge branch 'Modulos-feature/delete_ssh_key' into develop 2017-06-04 17:23:04 -05:00
Levi 5be46db5a3 Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key 2017-06-04 17:22:52 -05:00
Levi Velázquez 0f84373e19 Merge pull request #307 from levivm/develop 
Added DE support for stripe error
 2017-06-04 17:08:26 -05:00
Levi 8adcb75b8c Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-04 17:08:09 -05:00
Levi Velázquez 9f06c98554 Merge pull request #283 from Modulos/hosting_i18n 
Add i18n to hosting/order
 2017-06-04 17:07:17 -05:00
Levi 8598c540b9 removed pdb 2017-06-04 17:05:48 -05:00
Levi ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
Henry Bravo ba03cf232e 'what is it' section text change and fixed typo 2017-06-03 21:57:21 -05:00
Henry Bravo 9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -05:00
Nico Schottelius a6bc80e145 Add archlinux requirements 2017-06-03 21:43:23 +02:00
Nico Schottelius cdac6c664b remove more media files 
Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
 2017-06-03 19:24:47 +02:00
Nico Schottelius 4ab08a14d5 cleanup media folder 
Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
 2017-06-03 19:24:22 +02:00
Nico Schottelius 25fc0081db Newest changes goes to the top, not bottom 2017-06-03 16:07:56 +02:00
Nico Schottelius d2e0b26c40 Remove unused configs, unused requirements 2017-06-03 16:06:34 +02:00
Nico Schottelius 29c93c6f81 Remove log files 2017-06-03 16:04:31 +02:00
Nico Schottelius 266e33401e Remove old unused directory 2017-06-03 16:03:55 +02:00
Nico Schottelius d8bb051f23 Remove unused code 2017-06-03 16:03:02 +02:00
Nico Schottelius e7da97dc7f Shrink list of web admins 2017-06-03 15:56:36 +02:00
Nico Schottelius 596dde28c5 Delete unused files 2017-06-03 15:56:25 +02:00
Nico Schottelius 073fe76ece Delete old dump 2017-06-03 15:40:44 +02:00
Modulos 346733fbcd Allow users to delete ssh keys 2017-06-03 15:03:55 +02:00
modulos ab29b138c3 Add delete ssh key modal 2017-06-03 13:33:05 +02:00
modulos 31e9377818 Merge branch 'develop' into hosting_i18n 2017-06-03 09:59:48 +02:00
Levi Velázquez 77314d04c8 Merge pull request #303 from levivm/develop 
Develop
 2017-06-02 11:21:25 -05:00
Levi f2ee18deba Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-02 11:20:30 -05:00
Levi 35d3e73a52 Merge branch 'master' into develop 2017-06-02 11:19:39 -05:00
Levi Velázquez 7773b841c9 Merge pull request #302 from levivm/master 
hidden footbar on mobile devices
 2017-06-02 11:12:57 -05:00
Levi cd9c8938ed hidden footbar on mobile devices 2017-06-02 11:11:04 -05:00
Levi Velázquez 8d47018aae Merge pull request #301 from levivm/develop 
removed more info button
 2017-06-02 10:37:24 -05:00
Levi 83705984d0 removed more info button 2017-06-02 10:36:17 -05:00
Levi Velázquez 1ae8a627f2 Merge pull request #300 from ungleich/master 
Updating develop
 2017-06-02 09:45:49 -05:00
Levi Velázquez 78773eb5c3 Merge pull request #298 from Modulos/api/cleanup 
Api/cleanup
 2017-06-02 09:33:24 -05:00
modulos e4291083bd Append changes 2017-06-02 00:58:48 +02:00
modulos 715d092b96 Add ssh key to new vm 
Create_vm now stes to public key correctly
 2017-06-02 00:53:22 +02:00
modulos ef0589f691 Add german translation 2017-06-01 23:06:29 +02:00
Henry Bravo be04bee643 Fix center login pages 2017-06-01 15:40:19 -05:00
modulos 06f372e56d Fix tests, add remove_public_key 
The tests for VitualMachineSerializer were wrong. The manager now
contains a function to remove public keys from a user
 2017-06-01 22:25:10 +02:00
modulos d229d124e9 Merge branch 'develop' into api/cleanup 2017-06-01 21:51:15 +02:00
Henry Bravo 851ae298e9 Collapse navbar when i clicked url dcl 2017-06-01 14:49:05 -05:00
modulos 0db15d99a5 Add exceptions, merge for ssh key 
The replace variable of the add_public_key function is now a merge
variable in order to append new keys to a user
 2017-06-01 19:08:38 +02:00
modulos 88393c3da7 Merge branch 'develop' into hosting_i18n 2017-06-01 18:34:42 +02:00
Henry Bravo 024f7565df Fixed details in Hosting pages and translate in login 2017-06-01 11:24:50 -05:00
modulos ca63355914 Remove templates 
In the current setup the templates views are not necessary
 2017-06-01 17:30:53 +02:00