Commits · 08a3542bc28c2a68474312f107e130812fdbcd03 · Gelencsér Szabolcs / circlestack · GitLab

03 Sep, 2014 13 commits
- Merge branch 'master' into connect-via-client · 08a3542b
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-detail.html
	circle/dashboard/views.py
```
  Őry Máté committed Sep 03, 2014
  08a3542b Browse Files
- fix msgfmt error · 8eea8de7
  Őry Máté committed Sep 03, 2014
  
  8eea8de7 Browse Files
- locale: update Hungarian translation · 74f52a6c
  Őry Máté committed Sep 03, 2014
  
  74f52a6c Browse Files
- update PO templates · 79092f48
  Őry Máté committed Sep 03, 2014
  
  79092f48 Browse Files
- Merge branch 'feature-template-list' into 'master' · 90122b75
```
Template list upgrade and show deleted vms

Closes #234
Closes #258
```
  Őry Máté committed Sep 03, 2014
  90122b75 Browse Files
- Merge branch 'master' into feature-template-list · 986782b5
```
Conflicts:
	circle/dashboard/views.py
```
  Őry Máté committed Sep 03, 2014
  986782b5 Browse Files
- dashboard: more compact doctest · 6ad5c00e
  Őry Máté committed Sep 03, 2014
  
  6ad5c00e Browse Files
- Merge branch 'custom-connect-command' into 'master' · 0963fa06
```
Custom Connect Command
```
  Őry Máté committed Sep 03, 2014
  0963fa06 Browse Files
- dashboard: rephrase ConnectCommandListTable empty text · 09959441
  Őry Máté committed Sep 03, 2014
  
  09959441 Browse Files
- dashboard: add doctest to connect_command_template_validator · d5336b37
  Őry Máté committed Sep 03, 2014
  
  d5336b37 Browse Files
- Merge branch 'feature-improve-inline-helps' into 'master' · 7a3602eb
```
Feature Improve Inline Helps

🚧 halp!
```
  Őry Máté committed Sep 03, 2014
  7a3602eb Browse Files
- Merge branch 'feature-vm-ipv6' into 'master' · 6278f2fc
```
Feature Vm Ipv6
```
  Bach Dániel committed Sep 03, 2014
  6278f2fc Browse Files
- dashboard: mark missing string for translation · a7b16627
  Őry Máté committed Sep 03, 2014
  
  a7b16627 Browse Files
02 Sep, 2014 15 commits
- dashboard: fix flake8 · cdf10bc0
  Kálmán Viktor committed Sep 02, 2014
  
  cdf10bc0 Browse Files
- dashboard: add ip and lease for vm list · 045df7bb
  Kálmán Viktor committed Sep 02, 2014
  
  045df7bb Browse Files
- dashboard: fix doctests (again) · 2fc29987
```
Dict order
```
  Kálmán Viktor committed Sep 02, 2014
  2fc29987 Browse Files
- dashboard: fix filtermixin doctest · 9a6fa0e9
  Kálmán Viktor committed Sep 02, 2014
  
  9a6fa0e9 Browse Files
- firewall: fix copypaste error :( · 06519506
  Bach Dániel committed Sep 02, 2014
  
  06519506 Browse Files
- dashboard: add doctest for magic method · 221785a7
  Kálmán Viktor committed Sep 02, 2014
  
  221785a7 Browse Files
- dashboard: change span to label · 49359325
  Kálmán Viktor committed Sep 02, 2014
  
  49359325 Browse Files
- firewall: rename host.ipv6_with_prefixlen · a7fca356
  Bach Dániel committed Sep 02, 2014
  
  a7fca356 Browse Files
- firewall: simplify Host.get_network_config() · ab7f458e
  Bach Dániel committed Sep 02, 2014
  
  ab7f458e Browse Files
- agent: call send_networking_commands() in AddInterfaceOperation · 1767d22c
  Bach Dániel committed Sep 02, 2014
  
  1767d22c Browse Files
- Merge branch 'issue-266' into 'master' · af05a3bd
```
Link base template of instances
```
  Kálmán Viktor committed Sep 02, 2014
  af05a3bd Browse Files
- dashboard: a little description about connection strings · 9e888e97
  Kálmán Viktor committed Sep 02, 2014
  
  9e888e97 Browse Files
- dashboard: add validator conn command · 4701cfb4
  Kálmán Viktor committed Sep 02, 2014
  
  4701cfb4 Browse Files
- dashboard: nicer code · 8bb412e3
  Kálmán Viktor committed Sep 02, 2014
  
  8bb412e3 Browse Files
- dashboard: link base template of instance · 97d83242
```
Also fixing a dog issue
```
  Kálmán Viktor committed Sep 02, 2014
  97d83242 Browse Files
01 Sep, 2014 12 commits
- trans changed into blocktrans for big block of texts · dbcacac7
  Csók Tamás committed Sep 01, 2014
  
  dbcacac7 Browse Files
- HTML tags now inside the translatable string · d7e69b47
  Csók Tamás committed Sep 01, 2014
  
  d7e69b47 Browse Files
- vm: add change_ip task · 05b07694
  Bach Dániel committed Sep 01, 2014
  
  05b07694 Browse Files
- vm: use request.user instead of inst.owner in MountStoreOperation · 8e3bcfa1
  Bach Dániel committed Sep 01, 2014
  
  8e3bcfa1 Browse Files
- Merge branch 'master' into custom-connect-command · db31f971
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
```
  Kálmán Viktor committed Sep 01, 2014
  db31f971 Browse Files
- storage: add dev_num parameter to Disk.create() · 3732fbb4
  Bach Dániel committed Sep 01, 2014
  
  3732fbb4 Browse Files
- dashboard: connect command select js fixes · d0ae4fc4
  Kálmán Viktor committed Sep 01, 2014
  
  d0ae4fc4 Browse Files
- dashboard: rename title · 394c567f
  Kálmán Viktor committed Sep 01, 2014
  
  394c567f Browse Files
- dashboard: remove application field · 70996b00
  Kálmán Viktor committed Sep 01, 2014
  
  70996b00 Browse Files
- Merge branch 'feature-dev-prod' into 'master' · 824c85f5
```
Make development server work with production settings
```
  Őry Máté committed Sep 01, 2014
  824c85f5 Browse Files
- settings: make devserver and production settings work together · 7e899bbd
  Őry Máté committed Sep 01, 2014
  
  7e899bbd Browse Files
- dashboard: rename connect cmd files · 0bb60732
  Kálmán Viktor committed Sep 01, 2014
  
  0bb60732 Browse Files