Commits · 7100627bbfc5fc9b39f15dc98ed7cfb265a82610 · Gelencsér Szabolcs / cloud · GitLab

27 Jun, 2014 2 commits
- Merge branch 'issue-174' · 7100627b
```
Conflicts:
	circle/dashboard/templates/dashboard/operate.html

dashboard: fix icon on operate template
```
  Őry Máté committed Jun 27, 2014
  7100627b Browse Files
- Merge branch 'feature-stacked-activites' into 'master' · 4833c479
```
Feature Stacked Activites

Closes  #141
```
  Kálmán Viktor committed Jun 27, 2014
  4833c479 Browse Files
26 Jun, 2014 4 commits
- Merge branch 'issue-vm-ops' into 'master' · 695cd9bd
```
Issue Vm Ops

VM operations with form were kinda after an unsuccessful try. Without Javascript they still redirect to a page that seems to miss context data, but if javascript is enabled they work nice.
```
  Kálmán Viktor committed Jun 26, 2014
  695cd9bd Browse Files
- dashboard: fix icon on operate template · c2a45e45
```
fixes #174
```
  Őry Máté committed Jun 26, 2014
  c2a45e45 Browse Files
- Merge branch 'issue-177' into 'master' · d48175e1
```
Issue 177
```
  Őry Máté committed Jun 26, 2014
  d48175e1 Browse Files
- vm: allow renotifying if last action not a notification · 3b9457cc
```
fixes #177
```
  Őry Máté committed Jun 26, 2014
  3b9457cc Browse Files
25 Jun, 2014 11 commits
- dashboard: add comments to vm-ops js · 7916199f
  Kálmán Viktor committed Jun 25, 2014
  
  7916199f Browse Files
- dashboard: add/remove disk operation buttons on state change · 00b87bac
  Kálmán Viktor committed Jun 25, 2014
  
  00b87bac Browse Files
- dashboard: wait modal to disappear · 9cc124e8
  Kálmán Viktor committed Jun 25, 2014
  
  9cc124e8 Browse Files
- dashboard: js modal for all vm operations · 064dbddf
  Kálmán Viktor committed Jun 25, 2014
  
  064dbddf Browse Files
- dashboard: fade out alert messages · 82a3942b
  Kálmán Viktor committed Jun 25, 2014
  
  82a3942b Browse Files
- dsahboard: update jquery · 64648e1b
  Kálmán Viktor committed Jun 25, 2014
  
  64648e1b Browse Files
- Merge branch 'feature-ssh-key' into 'master' · 1ee90a64
```
Feature ssh key management
```
  Bach Dániel committed Jun 25, 2014
  1ee90a64 Browse Files
- dashboard: rename add ssh key button · 0b3d2280
  Bach Dániel committed Jun 25, 2014
  
  0b3d2280 Browse Files
- dashboard: don't be merge activites with different user · e6a26476
  Kálmán Viktor committed Jun 25, 2014
  
  e6a26476 Browse Files
- dashboard: don't display date for merged activites · a95515ec
  Kálmán Viktor committed Jun 25, 2014
  
  a95515ec Browse Files
- dashboard: only update activity feed if something has changed · 7e1d125c
  Kálmán Viktor committed Jun 25, 2014
  
  7e1d125c Browse Files
24 Jun, 2014 1 commit
- vm: add whitelist to merged_activities · 7451f913
  Kálmán Viktor committed Jun 24, 2014
  
  7451f913 Browse Files
23 Jun, 2014 3 commits
- dashboard: add tests · e34471aa
  Bach Dániel committed Jun 23, 2014
  
  e34471aa Browse Files
- dashboard: add ssh key tasks · 3ef0bd43
  Bach Dániel committed Jun 23, 2014
  
  3ef0bd43 Browse Files
- set time of suspend on instance clean · 2a386b8e
  Bach Dániel committed Jun 23, 2014
  
  2a386b8e Browse Files
20 Jun, 2014 1 commit
- dashboard: add ssh key views · 9306e681
  Bach Dániel committed Jun 20, 2014
  
  9306e681 Browse Files
18 Jun, 2014 11 commits
- dashboard: fix modal · f0217b57
  Kálmán Viktor committed Jun 18, 2014
  
  f0217b57 Browse Files
- dashboard: fix activity not updating itself sometimes · c9159549
  Kálmán Viktor committed Jun 18, 2014
  
  c9159549 Browse Files
- dashboard: remove button from disk download · 5adb859d
  Kálmán Viktor committed Jun 18, 2014
  
  5adb859d Browse Files
- dashboard: handle wrong inputs for vmforms · 03862384
  Kálmán Viktor committed Jun 18, 2014
  
  03862384 Browse Files
- vm: remove list cast from get merged activites · 6f16e36c
  Kálmán Viktor committed Jun 18, 2014
  
  6f16e36c Browse Files
- dashboard: make disk download percentage bold · 1a9df87d
  Kálmán Viktor committed Jun 18, 2014
  
  1a9df87d Browse Files
- dashboard: merge same activites · c290cae3
  Kálmán Viktor committed Jun 18, 2014
  
  c290cae3 Browse Files
- vm: add missing 'continue' statement · 99df6972
  Bach Dániel committed Jun 18, 2014
  
  99df6972 Browse Files
- settings: add default value for GRAPHITE_* vars · 897d2191
  Bach Dániel committed Jun 18, 2014
  
  897d2191 Browse Files
- vm: remove calvin · 6213a8f3
  Bach Dániel committed Jun 18, 2014
  
  6213a8f3 Browse Files
- dashboard: remove debug code · 8e95b11f
  Bach Dániel committed Jun 18, 2014
  
  8e95b11f Browse Files
17 Jun, 2014 7 commits
- dashboard: more place for connection host · fb896048
  Kálmán Viktor committed Jun 17, 2014
  
  fb896048 Browse Files
- dashboard: connection info is nicer · d86c3ab7
  Kálmán Viktor committed Jun 17, 2014
  
  d86c3ab7 Browse Files
- vm: destroy disks on template delete · cceea9b2
  Bach Dániel committed Jun 17, 2014
  
  cceea9b2 Browse Files
- dashboard: fix calvin · 3886665c
  Bach Dániel committed Jun 17, 2014
  
  3886665c Browse Files
- vm: fix CreateDiskOperation.check_precond() · 15a3ba50
  Bach Dániel committed Jun 17, 2014
  
  15a3ba50 Browse Files
- vm: fix imports · 72dddbf6
  Bach Dániel committed Jun 17, 2014
  
  72dddbf6 Browse Files
- vm: destroy disks if save_as operation fails · 4f1d9ed1
  Bach Dániel committed Jun 17, 2014
  
  4f1d9ed1 Browse Files