snipe
5519e2d4ae
Fixes custom fields sorting on asset listings
...
I need a silkwood shower :(
2017-10-18 09:27:34 -07:00
snipe
6285a8b5b2
Merge branch 'develop'
2017-10-18 08:54:35 -07:00
snipe
a3139c6fc6
Fix accessories route for invalid accessory ID
2017-10-18 08:53:25 -07:00
snipe
389ba9059f
Merge branch 'develop'
2017-10-18 08:45:22 -07:00
snipe
c0e50be03e
Duh. Helps if you actually assign the array first.
2017-10-18 08:45:05 -07:00
snipe
447833c996
Only try to process model bulk editing if at least one model was selected
2017-10-18 08:15:54 -07:00
snipe
809e310565
Recrypt the LDAP password properly
...
Older installs should add a line to their .env:
`LEGACY_CIPHER=rijndael-256`
2017-10-18 08:15:23 -07:00
snipe
38dd03b5ad
Merge branch 'develop'
2017-10-18 07:16:19 -07:00
snipe
68f6385eba
Fixes 500 in bulk checkout if no asset is selected
2017-10-18 07:15:16 -07:00
snipe
bd376a4992
Possible fix for #4227
2017-10-18 07:02:18 -07:00
snipe
97f65ceac0
Merge branch 'develop'
2017-10-18 06:25:01 -07:00
snipe
9e39abcc32
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-18 06:24:41 -07:00
snipe
5cd2857d5d
Use footer sumformatter for cost totals
2017-10-18 06:24:36 -07:00
snipe
585fcfb7d4
Use maintenances report API to populate the maintenances report
2017-10-18 05:47:47 -07:00
snipe
d9135a8aac
Disallow deleting suppliers with associated assets, licenses or maintenances
2017-10-18 05:47:20 -07:00
snipe
081a64223a
Add @TonisOrmisson as a contributor
2017-10-18 05:45:14 -07:00
Tõnis Ormisson
a4eeff01f0
FIXED upgrade Recrypt not working with changed cipher ( #4245 )
...
* FIX legacy cipher change
* FIX Recrypt Custom fields column names
* FIX ReCrypt Clean un-needed code
2017-10-18 05:43:54 -07:00
snipe
eedbe468ac
Fix licenses not saving supplier id on edit
2017-10-18 05:43:15 -07:00
snipe
463d9513e2
Merge branch 'develop'
2017-10-18 04:49:16 -07:00
snipe
ed4aa7dec2
Account for deleted suppliers in asset maintenances report
...
This should all be reworked via the API though anyway
2017-10-18 04:48:52 -07:00
snipe
d6bbe15a76
Added upload state back to log test
2017-10-18 04:04:05 -07:00
snipe
ea0a0a4a69
Merge branch 'develop'
2017-10-18 02:35:43 -07:00
snipe
34442362ca
Fixes bad route for new groups
2017-10-18 02:35:30 -07:00
snipe
b846bb20c6
Merge branch 'develop'
2017-10-18 01:23:01 -07:00
snipe
ab3f5f4f4d
Bumped version
2017-10-18 01:21:50 -07:00
snipe
ea63ced2bd
Fixes table alias bug in complex queries for Laravel
2017-10-18 01:21:08 -07:00
snipe
6bd49bfb72
Fixes #4191 - user search
2017-10-18 01:20:50 -07:00
snipe
b80d3ce50d
Hopefully fixes #4218
2017-10-18 00:36:52 -07:00
snipe
c069829b33
Fixes #906 - groups view
2017-10-17 21:43:57 -07:00
Geoff Young
665a113ed8
Update account history query ( #4237 )
...
This will limit the action_log records displayed when a user is viewing
their own assets and history since both target_type and target_id must
be set for a where condition to be added to the history query.
2017-10-17 20:39:49 -07:00
snipe
aa7091d962
Fixes #4226 - adds log_max_files to app config and sample env
2017-10-17 20:04:07 -07:00
snipe
ceff6a9617
Merge branch 'develop'
2017-10-17 19:27:31 -07:00
snipe
c01850fc73
Corrected Italian to Irish in language selector
2017-10-17 19:19:46 -07:00
snipe
4c04dc7b84
Merge branch 'develop'
2017-10-17 18:55:49 -07:00
snipe
c0103cd878
Bumped version
2017-10-17 18:55:30 -07:00
snipe
1f1d9d5461
Merge branch 'develop'
2017-10-17 18:53:21 -07:00
snipe
c776fa4f7b
Updated language strings
2017-10-17 18:52:20 -07:00
snipe
dc91d10395
More possible fixes for #4210
2017-10-17 17:35:48 -07:00
snipe
4df10ad26c
Merge branch 'develop'
2017-10-17 17:19:15 -07:00
snipe
668a88bc86
Add autocomplete=off to settings forms for #4210
2017-10-17 17:18:17 -07:00
snipe
d6e0012818
Merge branch 'develop'
2017-10-17 17:05:38 -07:00
snipe
1d5fb52bfc
Fix for LDAP where location ou is not null but blank
2017-10-17 16:59:50 -07:00
snipe
8efb02a0ee
Merge branch 'develop'
2017-10-17 16:23:59 -07:00
snipe
dea42db18b
Reversed order of withTrashed for deleted asset QR codes
2017-10-17 16:21:50 -07:00
snipe
78d5d3947f
Merge branch 'develop'
2017-10-17 16:18:14 -07:00
snipe
a1f5e11517
Fix for broken QR code on deleted assets
2017-10-17 16:01:53 -07:00
snipe
99ad096a8a
Added a space next to crowdin badge
2017-10-17 15:26:16 -07:00
snipe
65b4ffeed9
Higher res crowdin badge
2017-10-17 15:25:34 -07:00
snipe
0dac88816a
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
# Conflicts:
# README.md
2017-10-17 15:20:53 -07:00
snipe
f7626404b7
Add @BlueHatbRit as a contributor
2017-10-17 15:18:27 -07:00
