Commits · 396dfcd3ed65b9716237ec82388b7cab8f38a742 · CIRCLE / cloud · GitLab

29 Aug, 2014 5 commits
- Merge branch 'master' into feature-mass-ops · 396dfcd3
```
Conflicts:
	circle/dashboard/templates/dashboard/_notifications-timeline.html
```
  Őry Máté committed Aug 29, 2014
  396dfcd3 Browse Files
- locale: update Hungarian translation · a340b19b
  Őry Máté committed Aug 29, 2014
  
  a340b19b Browse Files
- update PO templates · eedfd5d2
  Őry Máté committed Aug 29, 2014
  
  eedfd5d2 Browse Files
- dashboard: add tests · 68e773fe
  Őry Máté committed Aug 29, 2014
  
  68e773fe Browse Files
- dashboard: fix some mass_ops issues · 6d848036
  Őry Máté committed Aug 29, 2014
  
  6d848036 Browse Files
28 Aug, 2014 10 commits
- dashboard: show if mass op is denied by permission · bb377d91
  Őry Máté committed Aug 28, 2014
  
  bb377d91 Browse Files
- dashboard: do basic ownership auth for mass ops · 13bfd1ff
  Őry Máté committed Aug 28, 2014
  
  13bfd1ff Browse Files
- dashboard: use inheritance to implement MassMigrationView · 71b3d176
  Őry Máté committed Aug 28, 2014
  
  71b3d176 Browse Files
- dashboard: use Operation.check_perms in MassOperationView · 8b527a9e
  Őry Máté committed Aug 28, 2014
  
  8b527a9e Browse Files
- common: add OperatedMixin.get_operation_class · 245e39dd
  Őry Máté committed Aug 28, 2014
  
  245e39dd Browse Files
- common: add Operation.superuser_required · abfd7a2b
  Őry Máté committed Aug 28, 2014
  
  abfd7a2b Browse Files
- common: extract check_perms from Operation.check_auth · 9b8d6f51
  Őry Máté committed Aug 28, 2014
  
  9b8d6f51 Browse Files
- dashboard: use get_text filter in templates · 2158c32e
  Őry Máté committed Aug 28, 2014
  
  2158c32e Browse Files
- dashboard: add get_text template filter for HRO's · 3dcbf1fd
  Őry Máté committed Aug 28, 2014
  
  3dcbf1fd Browse Files
- common: extend HumanReadable* · 2296749b
  Őry Máté committed Aug 28, 2014
  
  2296749b Browse Files
27 Aug, 2014 19 commits
- dashboard: fix new notification icon · aea321fc
  Kálmán Viktor committed Aug 27, 2014
  
  aea321fc Browse Files
- Merge branch 'master' into feature-mass-ops · 57863a5b
```
Conflicts:
	circle/vm/operations.py
```
  Kálmán Viktor committed Aug 27, 2014
  57863a5b Browse Files
- dashboard: redirect to vm list after mass vm create · 1197f78d
  Kálmán Viktor committed Aug 27, 2014
  
  1197f78d Browse Files
- dashboard: better look for vm list controls on smaller resolution · a00b8718
  Kálmán Viktor committed Aug 27, 2014
  
  a00b8718 Browse Files
- dashboard: no migrate button for regular users · 79c214d4
  Kálmán Viktor committed Aug 27, 2014
  
  79c214d4 Browse Files
- Merge branch 'issue-264' into 'master' · 5ce861b8
```
Issue 264

fixes #264
```
  Guba Sándor committed Aug 27, 2014
  5ce861b8 Browse Files
- Merge branch 'feature-timeline-icons' into 'master' · 0c8fc223
```
Feature Timeline Icons
```
  Őry Máté committed Aug 27, 2014
  0c8fc223 Browse Files
- vm: fix operation texts · 9460f70f
  Guba Sándor committed Aug 27, 2014
  
  9460f70f Browse Files
- dashboard: use activity icons in templates · df43baaa
```
fixes #261
```
  Őry Máté committed Aug 27, 2014
  df43baaa Browse Files
- vm: handle IntegrityError exception at allocate_vnc · 490e1dac
  Guba Sándor committed Aug 27, 2014
  
  490e1dac Browse Files
- operation: add result message to deploy operation · 02ba97dc
  Guba Sándor committed Aug 27, 2014
  
  02ba97dc Browse Files
- dashboard: add activity icons to context · 7b84eaf8
  Őry Máté committed Aug 27, 2014
  
  7b84eaf8 Browse Files
- dashboard: add activity-icon lookup helpers · 62303312
  Őry Máté committed Aug 27, 2014
  
  62303312 Browse Files
- vm: add InstanceActivity.get_operation · 2115aff1
  Őry Máté committed Aug 27, 2014
  
  2115aff1 Browse Files
- operation: hotfix to properly set failed deploy operation status · 50bdf11a
  Guba Sándor committed Aug 27, 2014
  
  50bdf11a Browse Files
- dashboard: use xhr.statusText instead of unknown error · 8f8c512d
  Kálmán Viktor committed Aug 27, 2014
  
  8f8c512d Browse Files
- dashboard: mass op smart migrate · 7dbb9c7e
  Kálmán Viktor committed Aug 27, 2014
  
  7dbb9c7e Browse Files
- dashboard: use inheritance for MassOperationView.factory · e64d3033
  Őry Máté committed Aug 27, 2014
  
  e64d3033 Browse Files
- Merge branch 'master' into feature-mass-ops · db560b90
  Őry Máté committed Aug 27, 2014
  
  db560b90 Browse Files
26 Aug, 2014 6 commits
- dashboard: better way to construct ajax call params · 9f4783eb
  Kálmán Viktor committed Aug 26, 2014
  
  9f4783eb Browse Files
- dashboard: add instance count to mass ops · 6282576e
  Kálmán Viktor committed Aug 26, 2014
  
  6282576e Browse Files
- dashboard: move mass op html inline css · 4387a950
  Kálmán Viktor committed Aug 26, 2014
  
  4387a950 Browse Files
- dashboard: reuse mass operation attrs from regular operations · 24523323
  Kálmán Viktor committed Aug 26, 2014
  
  24523323 Browse Files
- dashboard: make op descriptions shorter · 106f963d
  Kálmán Viktor committed Aug 26, 2014
  
  106f963d Browse Files
- dashboard: fix hover issue · fe39a561
```
Closes #260
```
  Kálmán Viktor committed Aug 26, 2014
  fe39a561 Browse Files