Commits · master · hsrmas / admintools

20 Aug, 2018 1 commit
- Update README.md · 2c50f33d
  Robin Ratcliff authored Aug 20, 2018
  
  2c50f33d
18 Aug, 2018 12 commits
- Merge branch 'master' of gitlab.fhnw.ch:hsrmas/admintools · fd22276e
  Slavisa Karalic authored Aug 18, 2018
  
  fd22276e
- workaround for starting mysql daemon · f436c959
  Slavisa Karalic authored Aug 18, 2018
  
  f436c959
- we need name here · 2299ecac
  Slavisa Karalic authored Aug 18, 2018
  
  2299ecac
- Update deploy_nginx.py · a878fbe3
  Slavisa Karalic authored Aug 18, 2018
  
  a878fbe3
- Update admin.py · c62192c2
  Slavisa Karalic authored Aug 18, 2018
  
  c62192c2
- Merge branch 'slavi-adding-wordpress' into 'master' · c97ced35
  Robin Ratcliff authored Aug 18, 2018
```
Adding New Container (Wordpress)

See merge request !51
```
  c97ced35
- Adding a Test · b05d8db6
  Slavisa Karalic authored Aug 18, 2018
  
  b05d8db6
- Adding New Container (Wordpress) · bfa3eae6
  Slavisa Karalic authored Aug 18, 2018
  
  bfa3eae6
- tests with new fixtures · 73170c2a
  Robin Ratcliff authored Aug 18, 2018
  
  73170c2a
- Cleanup some fixtures for presentation · b052e5cf
  Robin Ratcliff authored Aug 18, 2018
  
  b052e5cf
- Merge branch 'master' of gitlab.fhnw.ch:hsrmas/admintools · 75ab58df
  Robin Ratcliff authored Aug 18, 2018
  
  75ab58df
- Fix for Allow admin to approve proposals · bb400873
  Robin Ratcliff authored Aug 18, 2018
  
  bb400873
17 Aug, 2018 3 commits
- restart container instead of lxc-attach · d1e32a91
  Slavisa Karalic authored Aug 17, 2018
  
  d1e32a91
- Merge branch 'slavi-lxc-command' into 'master' · 63c74424
  Robin Ratcliff authored Aug 17, 2018
```
Add new deploy command - lxc

See merge request !50
```
  63c74424
- Add new deploy command - lxc · e76dd1b8
  Slavisa Karalic authored Aug 17, 2018
  
  e76dd1b8
13 Aug, 2018 1 commit
- Allow admin to approve proposals · 58afa990
  Robin Ratcliff authored Aug 13, 2018
  
  58afa990
07 Aug, 2018 2 commits
- Merge branch 'slavi-some-more-tests' into 'master' · 7fbc0183
  Robin Ratcliff authored Aug 07, 2018
```
adding some more tests

See merge request !49
```
  7fbc0183
- adding some more tests · d0bb0c6e
  Slavisa Karalic authored Aug 07, 2018
  
  d0bb0c6e
06 Aug, 2018 3 commits
- Merge branch 'slavi-plone-deployment' into 'master' · 88e1dff8
  Robin Ratcliff authored Aug 06, 2018
```
Fixing Plone CMS Container Deployment

See merge request !48
```
  88e1dff8
- Fixing Plone CMS Container Deployment · a2da7c5f
  Slavisa Karalic authored Aug 06, 2018
  
  a2da7c5f
- Update lxcrest.py increasing timeout for rest request · 5e6ce2f6
  Slavisa Karalic authored Aug 06, 2018
  
  5e6ce2f6
04 Aug, 2018 8 commits
- Update deploy_nginx.py · 601997b0
  Slavisa Karalic authored Aug 04, 2018
  
  601997b0
- Update deploy_nginx.py · 9f854475
  Slavisa Karalic authored Aug 04, 2018
  
  9f854475
- Update deploy_nginx.py · d4574b2c
  Slavisa Karalic authored Aug 04, 2018
  
  d4574b2c
- Merge branch 'slavi-container-cms-creation' into 'master' · a82b8f67
  Robin Ratcliff authored Aug 04, 2018
```
CMS Container creation

See merge request !47
```
  a82b8f67
- CMS Container creation · 9fff0037
  Slavisa Karalic authored Aug 04, 2018
  
  9fff0037
- Merge branch 'slavi-container-variety' into 'master' · 6ddae7ab
  Robin Ratcliff authored Aug 04, 2018
```
adding container varieties

See merge request !46
```
  6ddae7ab
- Fixed typos in rest descriptions · 45d1b12d
  Robin Ratcliff authored Aug 04, 2018
  
  45d1b12d
- adding container varieties · 63b979c1
  Slavisa Karalic authored Aug 04, 2018
  
  63b979c1
30 Jul, 2018 1 commit
- Use email as str-representation · 02ad28e9
  Robin Ratcliff authored Jul 30, 2018
  
  02ad28e9
28 Jul, 2018 4 commits
- Merge branch 'csrf' into 'master' · ff832225
  Robin Ratcliff authored Jul 28, 2018
```
Remove csrf validation

See merge request !45
```
  ff832225
- Remove csrf validation · 60f681ca
  Robin Ratcliff authored Jul 28, 2018
  
  60f681ca
- Merge branch 'rest_myuserdata_array' into 'master' · ba80ae75
  Arjan authored Jul 28, 2018
```
myuserdata in a list (array)

See merge request !44
```
  ba80ae75
- myuserdata in a list (array) · 48729b20
  Robin Ratcliff authored Jul 28, 2018
  
  48729b20
23 Jul, 2018 5 commits
- Merge branch 'slavi-lxcrest-tests' into 'master' · 8f531a63
  Robin Ratcliff authored Jul 23, 2018
```
adding some lxcrest tests

See merge request !43
```
  8f531a63
- adding settings variable · 8256bd61
  Slavisa Karalic authored Jul 23, 2018
  
  8256bd61
- adding some lxcrest tests · e50f31a3
  Slavisa Karalic authored Jul 23, 2018
  
  e50f31a3
- Merge branch 'userfields' into 'master' · 1d5437d9
  Slavisa Karalic authored Jul 23, 2018
```
Userfields Institut und tel

See merge request !42
```
  1d5437d9
- Changed telephoneNumber to telephone_number · 7d1939a2
  Robin Ratcliff authored Jul 23, 2018
  
  7d1939a2