Commits · d53b0c8d2913f3fa9319680e943c09d4513ca675 · OskarStenberg / SnipeIt

14 Jul, 2021 6 commits
- Update backup.sh · d53b0c8d
  OskarStenberg authored Jul 14, 2021
  
  d53b0c8d
- Updated backup with package installations · c42c32c1
  OskarStenberg authored Jul 14, 2021
  
  c42c32c1
- Updated backup · 1d7cace0
  OskarStenberg authored Jul 14, 2021
  
  1d7cace0
- Updated backup · cf2a423a
  OskarStenberg authored Jul 14, 2021
  
  cf2a423a
- Merge branch 'importMinAmt' of https://gitlab.control.lth.se/OskarS/snipeit into importMinAmt · 8954a020
  OskarStenberg authored Jul 14, 2021
  
  8954a020
- Added csv backup, and support for newlines in file names · 8c8c8193
  OskarStenberg authored Jul 14, 2021
  
  8c8c8193
13 Jul, 2021 6 commits
- Update install.sh · 0cd0c53b
  OskarStenberg authored Jul 13, 2021
  
  0cd0c53b
- Updated backup script to patch images and env-files as well · 9257d5e1
  OskarStenberg authored Jul 13, 2021
  
  9257d5e1
- Updated install script · 785d7d31
  OskarStenberg authored Jul 13, 2021
  
  785d7d31
- Updated install scripts · eaf2d1ad
  OskarStenberg authored Jul 13, 2021
  
  eaf2d1ad
- Added an incremental backup script · efb76dbd
  OskarStenberg authored Jul 13, 2021
  
  efb76dbd
- Merged bulkConsumableActions · 797b04d2
  OskarStenberg authored Jul 13, 2021
  
  797b04d2
12 Jul, 2021 2 commits
- Added Consumable bulk actions · f1437063
  OskarStenberg authored Jul 12, 2021
  
  f1437063
- Added import for min_amt for consumables · 5b587449
  OskarStenberg authored Jul 12, 2021
  
  5b587449
06 Jul, 2021 6 commits

Updated production assets · 60b8320b
snipe authored Jul 06, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
60b8320b
Merge remote-tracking branch 'origin/develop' · 721b749a
snipe authored Jul 06, 2021

721b749a
Updated assets · 11d9b1ba
snipe authored Jul 06, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
11d9b1ba

Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of... · 2f10d946

snipe authored Jul 06, 2021

Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of https://github.com/Godmartinz/snipe-it

 into develop

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/mix-manifest.json

2f10d946

Merge pull request #9778 from inietov/fixes/users_departments_not_being_imported · 6e0355fa
snipe authored Jul 06, 2021
```
Fixes #9730. Remove an else statement that doesn't allow to continue the importer flow.
```
6e0355fa
Fixes Vue issue with the import process. · 131a285e
Ivan Nieto Vivanco authored Jul 06, 2021

131a285e

01 Jul, 2021 1 commit
- Remove an else statement that doesn't allow to continue the importer flow. · 55454575
  Ivan Nieto Vivanco authored Jul 01, 2021
  
  55454575
30 Jun, 2021 5 commits
- Merge pull request #9774 from uberbrady/snipeit_restore_php73 · 19994e20
  snipe authored Jun 30, 2021
```
Better debugging output, and remove non-PHP-7.3-compatible option
```
  19994e20
- Better debugging output, and remove non-PHP-7.3-compatible option · 102591b0
  Brady Wetherington authored Jun 30, 2021
  
  102591b0
- Merge remote-tracking branch 'origin/develop' · b46e2b59
  snipe authored Jun 30, 2021
  
  b46e2b59
- Components checkin/checkout via API · 868419b3
  snipe authored Jun 30, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  868419b3
- Fixed company resource route · df7e0e56
  snipe authored Jun 29, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  df7e0e56
29 Jun, 2021 3 commits
- Merge pull request #9768 from svpernova09/vagrant-ansible-fix · 86b3f834
  snipe authored Jun 29, 2021
```
Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook
```
  86b3f834
- Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook · fbf5c705
  Joe Ferguson authored Jun 29, 2021
  
  fbf5c705
- Table striping on dark mode skins is too [ch16594] · aba91200
  Godfrey M authored Jun 28, 2021
  
  aba91200
28 Jun, 2021 10 commits
- Merge pull request #9764 from uberbrady/develop · 15b82997
  snipe authored Jun 28, 2021
```
Regenerate assets after repairing Vue integration
```
  15b82997
- Regenerate assets after repairing Vue integration · dce1dd41
  Brady Wetherington authored Jun 28, 2021
  
  dce1dd41
- Merge remote-tracking branch 'origin/develop' · f504d7ef
  snipe authored Jun 28, 2021
  
  f504d7ef
- Merge pull request #9761 from snipe/features/9745_add_notes_to_statuslabels · 9ba7e7a0
  snipe authored Jun 28, 2021
```
Added #9745 - adds searchable, sortable notes to statuslabels index
```
  9ba7e7a0
- Hide notes field by default · 30297e47
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  30297e47
- Make notes field searchable on status labels · 19413a63
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  19413a63
- Fixed #9745 - added searchable, sortable notes field to status labels · a4fd0c9c
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  a4fd0c9c
- Merge remote-tracking branch 'origin/develop' · 5b5b70e6
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
```
  5b5b70e6
- Bumped version · 6521f16b
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  6521f16b
- Fixed #9743 - Vue screens not loading · 9b2cb19f
  snipe authored Jun 28, 2021
```
Signed-off-by: snipe <snipe@snipe.net>
```
  9b2cb19f
24 Jun, 2021 1 commit
- Merge remote-tracking branch 'origin/develop' · 3ca3de9e
  snipe authored Jun 23, 2021
  
  3ca3de9e