Commits · 1e514d5bd9a51e700dd8389d9fa225d1a79b045a · CIRCLE / cloud

06 Feb, 2015 8 commits
- Merge branch 'feature-useradmin' into 'master' · 1e514d5b
```
Useradmin ✅

Closes #372

See merge request !286
```
  Kálmán Viktor committed Feb 06, 2015
  1e514d5b Browse Files
- vm: improve error handling in UpdateNodeOperation · 8c7786a6
  Bach Dániel committed Feb 06, 2015
  
  8c7786a6 Browse Files
- Merge branch 'issue-378' into 'master' · 857316e0
```
Firewall model to network GUI ✅

closes #378

See merge request !290
```
  Kálmán Viktor committed Feb 06, 2015
  857316e0 Browse Files
- Merge branch 'feature-host-filter' · 9e28c78c
```
Conflicts:
	circle/network/static/network/network.less
```
  Kálmán Viktor committed Feb 06, 2015
  9e28c78c Browse Files
- network: remove permalink decorators · ffa98f10
```
https://docs.djangoproject.com/en/1.7/ref/models/instances/#the-permalink-decorator
```
  Kálmán Viktor committed Feb 06, 2015
  ffa98f10 Browse Files
- fabfile: fix copypaste error · 6c69c5f0
  Bach Dániel committed Feb 06, 2015
  
  6c69c5f0 Browse Files
- vm: disable wait_for_result in NodeOperationView · d5cd72aa
  Bach Dániel committed Feb 06, 2015
  
  d5cd72aa Browse Files
- network: fix record views · 961d3f67
  Bach Dániel committed Feb 06, 2015
  
  961d3f67 Browse Files
29 Jan, 2015 1 commit

dashboard: user list features · ca4fcef5

- add org id to the dashboard list (and make it searchable)
- shorten "superuser status" text
- fix copypaste typos

committed Jan 29, 2015

ca4fcef5 Browse Files

26 Jan, 2015 6 commits
- network: fix flake8 · 0d4e5cfd
  Kálmán Viktor committed Jan 26, 2015
  
  0d4e5cfd Browse Files
- network: add rule list table to firewall detail · 57979689
  Kálmán Viktor committed Jan 26, 2015
  
  57979689 Browse Files
- Merge branch 'master' into issue-378 · 6562e1be
```
Conflicts:
	circle/network/static/network/network.less
```
  Kálmán Viktor committed Jan 26, 2015
  6562e1be Browse Files
- Merge branch 'network-fixes' into 'master' · 23ae8ecc
```
Network fixes 🚧

See merge request !285
```
  Kálmán Viktor committed Jan 26, 2015
  23ae8ecc Browse Files
- network: firewall CRUD · 015de106
  Kálmán Viktor committed Jan 26, 2015
  
  015de106 Browse Files
- dashboard: fix copypaste errors · 3ce61935
  Kálmán Viktor committed Jan 26, 2015
  
  3ce61935 Browse Files
22 Jan, 2015 2 commits
- vm: fix random unicode errors · 8916d530
```
Closes #377
```
  Bach Dániel committed Jan 22, 2015
  8916d530 Browse Files
- network: better position for search box · f8f3dc7a
  Kálmán Viktor committed Jan 22, 2015
  
  f8f3dc7a Browse Files
21 Jan, 2015 13 commits
- dashboard: fix tests · 20dd2231
  Bach Dániel committed Jan 21, 2015
  
  20dd2231 Browse Files
- locale: update hu translation · 8d1803e4
  Bach Dániel committed Jan 21, 2015
  
  8d1803e4 Browse Files
- dashboard: add UserEditForm · b0123844
  Bach Dániel committed Jan 21, 2015
  
  b0123844 Browse Files
- dashboard: rewrite UserCreationView · 18d3d7d9
  Bach Dániel committed Jan 21, 2015
  
  18d3d7d9 Browse Files
- network: fix jshint warnings · 0729a05c
  Kálmán Viktor committed Jan 21, 2015
  
  0729a05c Browse Files
- dashboard: i18n · bd2667df
  Kálmán Viktor committed Jan 21, 2015
  
  bd2667df Browse Files
- network: fix host list search looking bad on smaller screens · 154d7a4f
  Kálmán Viktor committed Jan 21, 2015
  
  154d7a4f Browse Files
- dashboard: add template search func · 0df9f5df
  Bach Dániel committed Jan 21, 2015
  
  0df9f5df Browse Files
- dashboard: fix jshint error · 47ecf19c
  Bach Dániel committed Jan 21, 2015
  
  47ecf19c Browse Files
- dashboard: fix race condition in search js · 073496de
  Bach Dániel committed Jan 21, 2015
  
  073496de Browse Files
- dashboard: rewrite search js · eb103640
  Bach Dániel committed Jan 21, 2015
  
  eb103640 Browse Files
- dashboard: add user list view · e9ee55cc
  Bach Dániel committed Jan 21, 2015
  
  e9ee55cc Browse Files
- network: filter host list · f6be607a
  Kálmán Viktor committed Jan 21, 2015
  
  f6be607a Browse Files
20 Jan, 2015 8 commits
- network: order hosts by noramlized hostname · 30d8fe06
  Kálmán Viktor committed Jan 20, 2015
  
  30d8fe06 Browse Files
- Revert "update requirements.txt" · 07195cac
```
This reverts commit f8759446.
```
  Bach Dániel committed Jan 20, 2015
  07195cac Browse Files
- network: fix flake8 warning · dd51b502
  Bach Dániel committed Jan 20, 2015
  
  dd51b502 Browse Files
- Merge branch 'feature-django-1.7' · 3d40e5f4
```
Conflicts:
	circle/dashboard/forms.py
```
  Bach Dániel committed Jan 20, 2015
  3d40e5f4 Browse Files
- Merge branch 'feature-jshint' into 'master' · 892f1470
```
Feature jshint

closes #376

See merge request !288
```
  Bach Dániel committed Jan 20, 2015
  892f1470 Browse Files
- update requirements.txt · f8759446
  Bach Dániel committed Jan 20, 2015
  
  f8759446 Browse Files
- Merge branch 'master' into feature-jshint · c5f2291b
```
Conflicts:
	circle/dashboard/static/dashboard/group-details.js
```
  Kálmán Viktor committed Jan 20, 2015
  c5f2291b Browse Files
- dashboard: fix jshint warnings · f47965c1
  Kálmán Viktor committed Jan 20, 2015
  
  f47965c1 Browse Files
19 Jan, 2015 2 commits
- Merge branch 'feature-group-rename' into 'master' · bd898707
```
Group rename without js

See merge request !287
```
  Kálmán Viktor committed Jan 19, 2015
  bd898707 Browse Files
- Merge branch 'issue-291' into 'master' · acfa3715
```
Trait fixes

closes #291

See merge request !284
```
  Kálmán Viktor committed Jan 19, 2015
  acfa3715 Browse Files