DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-26 18:57:40 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
4237 commits 90 branches 265 tags 295 MiB
Commit graph

4237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Meltzer 5a84863873 Importer name/full name fixes. (#5072) 
Fix a bug where "name" was used ambigously and mapping "item name" to
"name" would confuse the importer into thinking it should also be a user
name.  Now we default to "full name" for the users name, and "item name"
for the item name.  These are still both configurable through the custom
mapping.

Also update sample csvs and remove an outdated sample.
 2018-02-21 16:42:36 -08:00
snipe 006b2b18b0 Added qty to sorting 2018-02-21 16:21:31 -08:00
snipe fb262e38a7 Added - make total sortable in components 2018-02-21 16:21:21 -08:00
snipe f8151284ee Fixed - removed extra components table 2018-02-21 16:20:46 -08:00
snipe 5d8c91b687 Fixed regression - Added sum footer back into accessories 2018-02-21 15:54:16 -08:00
snipe 0f23462607 Merge branch 'develop' 2018-02-21 15:51:33 -08:00
snipe ca50ea190f Applied master changes to develop 
Wrong branch :(
 2018-02-21 15:51:04 -08:00
snipe 31192abd2c Fixed ambniguous query in asset maintenance search 2018-02-21 10:28:05 -08:00
snipe 42c7f41d24 Added some alerting in custom fields if it looks like the db_column and real column do not match 2018-02-21 10:06:23 -08:00
snipe fade03e337 Added nicer gates for auditing 2018-02-21 08:13:18 -08:00
snipe d511d90a2f Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 06:50:42 -08:00
snipe 54d6cafda9 Bumped hash 2018-02-21 06:49:36 -08:00
snipe a730cd1c51 Fixed - better handle admin routes when user is not logged in 
Redirect to login instead of just showing forbidden
 2018-02-21 05:51:49 -08:00
snipe cccd75fc42 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 05:48:02 -08:00
snipe dbc16a6c9b Bumped hash 2018-02-21 05:47:12 -08:00
snipe 6ffad6043f Fixed issue where bootstrap tables didn’t use a default page size 2018-02-21 05:44:41 -08:00
snipe 4e398950a0 Merge branch 'develop' 2018-02-21 05:34:02 -08:00
snipe f5e51897e3 Added - sort by color on status labels 2018-02-21 05:29:50 -08:00
snipe 698ea36cc2 Added - Order location by manager 2018-02-21 05:09:40 -08:00
snipe 0cf9cdd3b1 Make department columns sortable 2018-02-21 05:04:20 -08:00
snipe 42c8de5620 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 04:44:48 -08:00
snipe ba4f63bca3 Bumped version 2018-02-21 04:43:52 -08:00
snipe 4ed2ef6298 Merge branch 'develop' 2018-02-21 04:42:03 -08:00
snipe d28c2af7de Fixed bootstrap table issue if per page was set to 10 2018-02-21 04:41:44 -08:00
snipe 1e8c32fbdb Fixed - missing table prefix for location parent search 2018-02-21 04:33:47 -08:00
snipe 97bd87773c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 02:40:23 -08:00
snipe b560828173 Bumped hash 2018-02-21 02:18:14 -08:00
snipe 0d7a43ab38 Fixed orderby parent location name 2018-02-21 02:17:18 -08:00
snipe 7865fbea7e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 01:27:11 -08:00
snipe 5fcbf9091e Bumped version 2018-02-21 01:23:19 -08:00
snipe fedd2b638c Merge branch 'develop' 2018-02-21 01:20:48 -08:00
snipe 22f44e342f Fixed incorrect next audit date if asset override 2018-02-21 01:18:21 -08:00
snipe f7eb013935 Reverse order on activity report 2018-02-20 15:42:44 -08:00
snipe 1c28f893e7 Fixed #5027 - remove link to non-existant reports page 2018-02-20 14:44:29 -08:00
snipe 195dfd752d Updated translations 2018-02-20 14:41:12 -08:00
snipe cc788d3b62 Added Slovenian 2018-02-20 14:37:22 -08:00
snipe e54021e7be Added Venzuelan spanish 2018-02-20 14:37:12 -08:00
snipe 918db39eba Merge branch 'develop' 2018-02-19 18:06:58 -08:00
snipe 213fe2ecea Fixed #5044 - incorrect env values for SSL DB paths 2018-02-19 18:03:50 -08:00
snipe 6e70352d0b Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-17 01:05:20 -08:00
snipe d2403cdadb Added image preview for uploads 2018-02-17 00:51:22 -08:00
snipe 9a4f5e0ba8 Bumped hash 2018-02-16 22:10:06 -08:00
snipe 502e4d672a Use image upload partial in asset edit/create 2018-02-16 22:08:49 -08:00
snipe 99205bf72e Merge branch 'develop' 2018-02-16 21:39:15 -08:00
snipe b3d673b0aa Fixed #5037 - use line breaks in notes in table view 2018-02-16 21:38:56 -08:00
snipe baf51eb430 Merge branch 'develop' 2018-02-16 21:19:03 -08:00
snipe d8fc50c351 Fixed #5033 - use PHP’s max filesize for image uploads 2018-02-16 21:17:41 -08:00
snipe ba5057181e Check for model in asset view 2018-02-16 18:04:11 -08:00
snipe 4c4dee0bf1 Use dropifexists for rollback 2018-02-16 17:45:40 -08:00
snipe 589c3a2be3 Fixed #4668 - wrong gate on manufacturer save 2018-02-16 17:45:27 -08:00