Commits · 1a9d84cdcc3ac40e733ad4f9a470bc39b40d6775 · CIRCLE / cloud

08 Jan, 2015 1 commit

Merge branch 'master' into issue-364 · 1a9d84cd

Conflicts:
	circle/dashboard/static/dashboard/vm-common.js
	circle/dashboard/templates/dashboard/store/index-files.html

committed Jan 08, 2015

1a9d84cd Browse Files

07 Jan, 2015 2 commits
- Merge branch 'gui-fixes' into 'master' · e70e03b7
```
Gui fixes

See merge request !281
```
  Bach Dániel committed Jan 07, 2015
  e70e03b7 Browse Files
- dashboard: fix search buttons · ed86412a
  Bach Dániel committed Jan 07, 2015
  
  ed86412a Browse Files
01 Jan, 2015 11 commits
- dashboard: fix toplist panel · 4a5f85ee
  Bach Dániel committed Jan 01, 2015
  
  4a5f85ee Browse Files
- dashboard: fix node list panel · fbe6d2db
  Bach Dániel committed Jan 01, 2015
  
  fbe6d2db Browse Files
- dashboard: fix invalid html · 8865ab59
  Bach Dániel committed Jan 01, 2015
  
  8865ab59 Browse Files
- dashboard: fix panels · 3b99558c
  Bach Dániel committed Jan 01, 2015
  
  3b99558c Browse Files
- dashboard: mark 'No result' text for translation · 5b434637
  Bach Dániel committed Jan 01, 2015
  
  5b434637 Browse Files
- dashboard: add missing modals · 45c688c5
  Bach Dániel committed Jan 01, 2015
  
  45c688c5 Browse Files
- Merge branch 'feature-remove-garbage' · 7fed7d2c
  Bach Dániel committed Jan 01, 2015
  
  7fed7d2c Browse Files
- Merge branch 'feature-node-salt' · 32e83265
  Bach Dániel committed Jan 01, 2015
  
  32e83265 Browse Files
- vm: fix UpdateNodeOperation · 8a293708
  Bach Dániel committed Jan 01, 2015
  
  8a293708 Browse Files
- dashboard: remove unnecessary perm check · f876f926
  Bach Dániel committed Jan 01, 2015
  
  f876f926 Browse Files
- dashboard: move activity vars · 67622b86
  Bach Dániel committed Jan 01, 2015
  
  67622b86 Browse Files
12 Dec, 2014 2 commits
- fix tests · 5f3e7e7b
  Bach Dániel committed Dec 12, 2014
  
  5f3e7e7b Browse Files
- dashboard: responsive list tables · 29adb58a
  Kálmán Viktor committed Dec 12, 2014
  
  29adb58a Browse Files
04 Dec, 2014 6 commits
- dashboard: js fixes · 038f663e
  Bach Dániel committed Dec 04, 2014
  
  038f663e Browse Files
- dashboard: improve VmCreate view · 226d2b8d
  Bach Dániel committed Dec 04, 2014
  
  226d2b8d Browse Files
- dashboard: fix play button · cdac5b0e
  Bach Dániel committed Dec 04, 2014
  
  cdac5b0e Browse Files
- dashboard: move vlan perm check to Instance.create · c2a42986
  Bach Dániel committed Dec 04, 2014
  
  c2a42986 Browse Files
- dashboard: remove unused renew template · 77236999
  Bach Dániel committed Dec 04, 2014
  
  77236999 Browse Files
- dashboard: fix forms · 7180bd8f
  Bach Dániel committed Dec 04, 2014
  
  7180bd8f Browse Files
01 Dec, 2014 1 commit
- Merge branch 'issue-363' into 'master' · c711f3c1
```
Vm detail without js ✅

closes #363

See merge request !275
```
  Kálmán Viktor committed Dec 01, 2014
  c711f3c1 Browse Files
29 Nov, 2014 1 commit
- Merge branch 'fix-shutdown-op' into 'master' · 15c8faf1
```
Fix shutdown op ✅

See merge request !280
```
  Bach Dániel committed Nov 29, 2014
  15c8faf1 Browse Files
28 Nov, 2014 1 commit
- dashboard: remove print 'hi' · b4596a86
  Bach Dániel committed Nov 28, 2014
  
  b4596a86 Browse Files
27 Nov, 2014 15 commits
- vm: fix test · 1d852711
  Bach Dániel committed Nov 27, 2014
  
  1d852711 Browse Files
- update requirements · 8328eea8
  Bach Dániel committed Nov 27, 2014
  
  8328eea8 Browse Files
- vm: add UpdateNodeOperation · 284053f9
  Bach Dániel committed Nov 27, 2014
  
  284053f9 Browse Files
- dashboard: display minion status in node list view · c2b89065
  Bach Dániel committed Nov 27, 2014
  
  c2b89065 Browse Files
- dashboard: move activity, operation js to activity.js · 6b11c860
  Bach Dániel committed Nov 27, 2014
  
  6b11c860 Browse Files
- dashboard: improve node detail · dae0a707
```
Conflicts:
	circle/dashboard/static/dashboard/node-details.js
	circle/dashboard/urls.py
	circle/dashboard/views/node.py
```
  Bach Dániel committed Nov 27, 2014
  dae0a707 Browse Files
- dashboard: fix close modal btn · d593d10c
  Bach Dániel committed Nov 27, 2014
  
  d593d10c Browse Files
- dashboard: remove unused code · 70debda7
  Bach Dániel committed Nov 27, 2014
  
  70debda7 Browse Files
- Merge branch 'issue-371' into 'master' · 38b6f781
```
Allow superusers too see all profiles ✅

Closes #371

See merge request !278
```
  Bach Dániel committed Nov 27, 2014
  38b6f781 Browse Files
- dashboard: make check more pythonic · 5c9ae9cb
  Kálmán Viktor committed Nov 27, 2014
  
  5c9ae9cb Browse Files
- dashboard: fix flake8 warning · fc6bc985
  Bach Dániel committed Nov 27, 2014
  
  fc6bc985 Browse Files
- dashboard: fix tests · d999a2f4
  Bach Dániel committed Nov 27, 2014
  
  d999a2f4 Browse Files
- dashboard: add base class for delete views · 18dea3b8
  Bach Dániel committed Nov 27, 2014
  
  18dea3b8 Browse Files
- dashboard: fix js · a6c7dcf3
  Bach Dániel committed Nov 27, 2014
  
  a6c7dcf3 Browse Files
- dashboard: allow superusers too see profiles without groups · beeed7fa
  Kálmán Viktor committed Nov 27, 2014
  
  beeed7fa Browse Files