Commits · master-cakephp · smradius / smradius

01 Oct, 2014 1 commit
- Merge branch 'permission93' into 'master-cakephp' · 9d898e13
  Nigel Kukard authored Oct 01, 2014
```
Permission93

Please accept permission93

See merge request !375
```
  9d898e13
29 Sep, 2014 17 commits
- Merge branch 'permission92' into 'master-cakephp' · 42d8c58b
  Nigel Kukard authored Sep 29, 2014
```
Permission92

Please accept permission92

See merge request !374
```
  42d8c58b
- Implemented some changes on 'View/RealmMembers/index.ctp' in 'permission93' branch. · 3e1047c5
  shail authored Sep 29, 2014
  
  3e1047c5
- Merge branch 'permission91' into 'master-cakephp' · 62fcdec4
  Nigel Kukard authored Sep 29, 2014
```
Permission91

Please accept permission91

See merge request !373
```
  62fcdec4
- Implemented some changes on 'View/RealmAttributes/index.ctp' in 'permission92' branch. · d8cbd3fa
  shail authored Sep 29, 2014
  
  d8cbd3fa
- Implemented some changes on 'View/Realms/index.ctp' in 'permission91' branch. · 0ee39744
  shail authored Sep 29, 2014
  
  0ee39744
- Merge branch 'permission90' into 'master-cakephp' · 8d9cc5f6
  Nigel Kukard authored Sep 29, 2014
```
Permission90

Please accept permission90

See merge request !372
```
  8d9cc5f6
- Implemented some changes on 'View/UserTopups/index.ctp' in 'permission90' branch. · 8033923b
  shail authored Sep 29, 2014
  
  8033923b
- Merge branch 'permission88' into 'master-cakephp' · af46a38b
  Nigel Kukard authored Sep 29, 2014
```
Permission88

Please accept permission88

See merge request !370
```
  af46a38b
- Merge branch 'permission89' into 'master-cakephp' · a50cf632
  Nigel Kukard authored Sep 29, 2014
```
Permission89

Please accept permission89

See merge request !371
```
  a50cf632
- Merge branch 'permission87' into 'master-cakephp' · 10309451
  Nigel Kukard authored Sep 29, 2014
```
Permission87

Please accept permission87

See merge request !369
```
  10309451
- Merge branch 'permission86' into 'master-cakephp' · dc9b1527
  Nigel Kukard authored Sep 29, 2014
```
Permission86

Please accept permission86

See merge request !368
```
  dc9b1527
- Merge branch 'permission85' into 'master-cakephp' · 8f70fd9d
  Nigel Kukard authored Sep 29, 2014
```
Permission85

Please accept permission85

See merge request !367
```
  8f70fd9d
- Implemented some changes on 'View/UserAttributes/index.ctp' in 'permission88' branch. · 3c87286d
  shail authored Sep 26, 2014
  
  3c87286d
- Implemented some changes on 'View/UserGroups/index.ctp' in 'permission89' branch. · 49cd5d8c
  shail authored Sep 26, 2014
  
  49cd5d8c
- Implemented some changes on 'View/Users/index.ctp' in 'permission87' branch. · 89585a9c
  shail authored Sep 26, 2014
  
  89585a9c
- Implemented cool bootstrap buttons for pagination on... · e419e4ae
  shail authored Sep 26, 2014
```
Implemented cool bootstrap buttons for pagination on 'View/WebuiUsers/index.ctp' in 'permission86' branch.
```
  e419e4ae
- Implemented cool bootstrap buttons for pagination on... · b9e69442
  shail authored Sep 25, 2014
```
Implemented cool bootstrap buttons for pagination on 'View/UserTypeMembers/index.ctp' in 'permission85' branch.
```
  b9e69442
26 Sep, 2014 4 commits
- Merge branch 'permission81' into 'master-cakephp' · e7f3ce41
  Nigel Kukard authored Sep 26, 2014
```
Permission81

Please accept permission81

See merge request !363
```
  e7f3ce41
- Implemented new methods in 'Controller/WebuiUsersController.php' in 'permission81' branch. · 5e7ae2be
  shail authored Sep 25, 2014
  
  5e7ae2be
- Merge branch 'permission84' into 'master-cakephp' · 79d76329
  Nigel Kukard authored Sep 26, 2014
```
Permission84

Please accept permission84

See merge request !366
```
  79d76329
- Implemented delete confirmation box on delete link and cool bootstrap buttons... · 136cf595
  shail authored Sep 25, 2014
```
Implemented delete confirmation box on delete link and cool bootstrap buttons for pagination on 'View/UserTypes/index.ctp' in 'permission84' branch.
```
  136cf595
25 Sep, 2014 10 commits
- Merge branch 'permission83' into 'master-cakephp' · b19ed117
  Nigel Kukard authored Sep 25, 2014
```
Permission83

Please accept permission83

See merge request !365
```
  b19ed117
- Merge branch 'permission82' into 'master-cakephp' · 2a32e12c
  Nigel Kukard authored Sep 25, 2014
```
Permission82

Please accept permission82

See merge request !364
```
  2a32e12c
- Apply some changes on 'View/GroupAttributes/edit.ctp' in 'permission83' branch. · 12d11ec4
  shail authored Sep 25, 2014
  
  12d11ec4
- Apply some changes on 'View/GroupAttributes/add.ctp' in 'permission82' branch. · 854a2e13
  shail authored Sep 25, 2014
  
  854a2e13
- Merge branch 'shail-permission54' into 'master-cakephp' · e62fa8f8
  Nigel Kukard authored Sep 25, 2014
```
Shail permission54

See merge request !352
```
  e62fa8f8
- Shail Permission54, Changes to Controller/UserTypesController.php · ed57a968
  Charl Mert authored Sep 25, 2014
  
  ed57a968
- Merge branch 'permission76' into 'master-cakephp' · 1d00421b
  Nigel Kukard authored Sep 25, 2014
```
Permission76

Please accept permission76

See merge request !359
```
  1d00421b
- Merge branch 'permission75' into 'master-cakephp' · 389cc72f
  Nigel Kukard authored Sep 25, 2014
```
Permission75

Please accept permission75

See merge request !358
```
  389cc72f
- Merge branch 'permission74' into 'master-cakephp' · 5a11e2bf
  Nigel Kukard authored Sep 25, 2014
```
Permission74

Please accept permission74

See merge request !357
```
  5a11e2bf
- Merge branch 'permission73' into 'master-cakephp' · 2d6b9431
  Nigel Kukard authored Sep 25, 2014
```
Permission73

Please accept permission73

See merge request !351
```
  2d6b9431
24 Sep, 2014 4 commits
- Implemented index method and apply some changes on... · 75dafb09
  shail authored Sep 24, 2014
```
Implemented index method and apply some changes on 'Controller/WebuiUsersController.php' in 'permission76' branch.
```
  75dafb09
- Created new file 'View/WebuiUsers/edit.ctp' in 'permission75' branch. · 50a2f7cd
  shail authored Sep 24, 2014
  
  50a2f7cd
- Created new file 'View/WebuiUsers/add.ctp' in 'permission74' branch. · 8f174fd6
  shail authored Sep 24, 2014
  
  8f174fd6
- Implemented permission code and solve issue 16 on... · f46e5d5f
  shail authored Sep 23, 2014
```
Implemented permission code and solve issue 16 on 'View/GroupAttributes/index.ctp' in 'permission73' branch.
```
  f46e5d5f
23 Sep, 2014 4 commits
- Merge branch 'shail-permission72' into 'master-cakephp' · 3e82f666
  Nigel Kukard authored Sep 23, 2014
```
Shail permission72

See merge request !356
```
  3e82f666
- Merge branch 'shail-permission71' into 'master-cakephp' · 8ca65de3
  Nigel Kukard authored Sep 23, 2014
```
Shail permission71

See merge request !355
```
  8ca65de3
- Merge branch 'shail-permission66' into 'master-cakephp' · f8e9d5b7
  Nigel Kukard authored Sep 23, 2014
```
Shail permission66

See merge request !354
```
  f8e9d5b7
- Merge branch 'shail-permission55' into 'master-cakephp' · 72a90f20
  Nigel Kukard authored Sep 23, 2014
```
Shail permission55

See merge request !353
```
  72a90f20