Daniel Meltzer
|
fd0d04eba4
|
Import status labels.
|
2016-05-25 20:46:01 -05:00 |
|
Daniel Meltzer
|
22c6f32e92
|
Instead of a field in the csv, set whether assets, consumables, or accessories are generated by an option on the command line. Also Adjustconsumables/accessories to function smoother.
|
2016-05-25 20:37:19 -05:00 |
|
Daniel Meltzer
|
04428d2d07
|
Replace console output in ObjectImporter with a logging mechanism. Also track all model/validation errors and output them at the end of the import, rather than inline.
|
2016-05-25 20:37:19 -05:00 |
|
snipe
|
37be587c39
|
Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet
|
2016-05-24 16:19:44 -07:00 |
|
snipe
|
0c33575962
|
Merge branch 'v3' of github.com:snipe/snipe-it into v3
|
2016-05-24 16:10:45 -07:00 |
|
snipe
|
bfc3f69adb
|
Better comments on model methods
|
2016-05-24 16:08:18 -07:00 |
|
snipe
|
cde0d49e18
|
Added assets method
|
2016-05-24 16:06:22 -07:00 |
|
snipe
|
abf027059f
|
Fixed comment
|
2016-05-24 16:06:15 -07:00 |
|
snipe
|
4edc2a7a66
|
Route and controller for dashboard chart
|
2016-05-24 16:06:09 -07:00 |
|
snipe
|
3b838ca867
|
Added static colors for charts
|
2016-05-24 16:05:51 -07:00 |
|
Daniel Meltzer
|
293b8c0dea
|
Fix strings for StatusLabels, they still referenced locations.
|
2016-05-24 17:54:44 -05:00 |
|
snipe
|
780c0e678d
|
Changed min dimensions to 500 from 300
|
2016-05-24 13:21:18 -07:00 |
|
snipe
|
de5e1ca86b
|
Add persedown helper
|
2016-05-24 10:21:33 -07:00 |
|
snipe
|
6c6e65b8ca
|
Fixes #2076
|
2016-05-24 09:46:43 -07:00 |
|
snipe
|
64d818e56e
|
Fixed License and LicenseSeat namespaces for importer
|
2016-05-24 02:17:10 -07:00 |
|
snipe
|
d6715914e1
|
Fixed supplier namespace
|
2016-05-24 02:13:28 -07:00 |
|
snipe
|
f10b3b7cdb
|
Fix for license importer
|
2016-05-24 01:51:47 -07:00 |
|
snipe
|
f844bf4b41
|
Nicer focus handling for asset search
|
2016-05-24 01:10:05 -07:00 |
|
snipe
|
cb91829729
|
Fixed division by zero error
|
2016-05-24 00:49:56 -07:00 |
|
snipe
|
fb35e40342
|
Search by asset tag
Compatible with barcode scanners
|
2016-05-20 17:02:28 -07:00 |
|
snipe
|
7fd6051514
|
Fixes #2062 - old permissions masks to new
|
2016-05-20 12:23:31 -07:00 |
|
snipe
|
2c7b345ad2
|
Merge pull request #2057 from dmeltzer/fix-settings-table-for-sqlite
Fix Settings Table for Sqlite
|
2016-05-19 20:27:56 -07:00 |
|
Daniel Meltzer
|
a6849fc689
|
Remove stray code from my commit and add a migration to fix the Settings issue the proper way.
|
2016-05-19 21:52:49 -05:00 |
|
snipe
|
db6305bf1f
|
Merge pull request #2056 from dmeltzer/make-categories-limit-work
Make limit/offset work in getDataView
|
2016-05-19 19:50:22 -07:00 |
|
snipe
|
cbcc155f27
|
Settings tweaks
|
2016-05-19 19:49:25 -07:00 |
|
Daniel Meltzer
|
1148750c9a
|
Make limit/offset work in getDataView
|
2016-05-19 21:45:48 -05:00 |
|
snipe
|
c4a699f109
|
Validation for new alert settings
|
2016-05-19 19:43:05 -07:00 |
|
snipe
|
2b1bf9f7f3
|
Merge branch 'v3' of github.com:snipe/snipe-it into v3
|
2016-05-19 19:34:11 -07:00 |
|
snipe
|
15eb6df1db
|
Add settings for alert interval threshold and inventory threshold
|
2016-05-19 19:33:53 -07:00 |
|
snipe
|
29e54830e1
|
Added 2D barcodes to labels
|
2016-05-19 19:12:42 -07:00 |
|
Daniel Meltzer
|
592ce4c2de
|
Readd sample.csv. Also port away from Sentry in the importer to be laravel5 compliant.
|
2016-05-18 23:33:18 -05:00 |
|
Daniel Meltzer
|
4f70fa88d9
|
Rename to snipeit:import
|
2016-05-18 22:40:02 -05:00 |
|
Daniel Meltzer
|
173c3de36a
|
Add the asset to the cache after creating it as well.
|
2016-05-18 22:40:02 -05:00 |
|
Daniel Meltzer
|
2a56148ec2
|
Remove extraneuous htmlentities() calls, now that we call it in array_smart_fetch
|
2016-05-18 22:40:02 -05:00 |
|
Daniel Meltzer
|
df749f26f5
|
Add the company/suppliers to the cache. This fixes some issues with duplicate items existing
|
2016-05-18 22:40:02 -05:00 |
|
Daniel Meltzer
|
191ae110d0
|
* Alphabetize the createOrFetch methods
* Move the html escaping to array_smart_fetch to avoid duplication
* Ensure string comparisons have === everywhere
|
2016-05-18 22:40:02 -05:00 |
|
Daniel Meltzer
|
5821127a79
|
Update/port ObjectImportComandd to work with v3. Also change to do one big transactional commit instead of writing to db after each item. Went from a 2 minute import to a 5 second import for a 2000 item file. I still need to do some more santization of the input and work on error handling, but this seems to be in decent shape.
|
2016-05-18 22:40:02 -05:00 |
|
snipe
|
5333c7083a
|
More dashboard fixes
|
2016-05-18 19:48:19 -07:00 |
|
snipe
|
c1c7fa143d
|
Components display on assets page
|
2016-05-18 19:26:50 -07:00 |
|
snipe
|
fb26188e41
|
Fixed dashboard for components
|
2016-05-18 19:16:43 -07:00 |
|
snipe
|
47c70141c7
|
Gross copypasta fix for #1932
|
2016-05-18 19:08:16 -07:00 |
|
snipe
|
23e416fd88
|
Make site name required
|
2016-05-18 18:24:28 -07:00 |
|
snipe
|
b0b7cfa999
|
Better handling for show/hide columns in depreciation report
|
2016-05-18 16:06:29 -07:00 |
|
snipe
|
7ee13113e0
|
Add depreciation name and months to depreciation report
|
2016-05-18 15:59:54 -07:00 |
|
snipe
|
0568e979e8
|
If permissions are blank, don't error out on json_decode
|
2016-05-18 14:38:17 -07:00 |
|
snipe
|
631aade6c4
|
Cleaned up language strings for categories
|
2016-05-17 21:16:12 -07:00 |
|
snipe
|
0ea5b090af
|
Fixes issue with HTTPS key not found on non-HTTPS installs
|
2016-05-17 21:15:48 -07:00 |
|
snipe
|
f9572ffa0c
|
Fixes #2048
|
2016-05-17 21:15:29 -07:00 |
|
snipe
|
e552c36a0a
|
Add model_no, item_no, and manufacturer to consumables
|
2016-05-16 17:11:31 -07:00 |
|
snipe
|
63f4bbe412
|
Temporarily remove clone option from categories view
|
2016-05-14 18:06:49 -07:00 |
|
snipe
|
8b072fddcf
|
Fixes middleware for locale
|
2016-05-14 17:25:56 -07:00 |
|
snipe
|
415b60a293
|
Added check for setup in Setting model
|
2016-05-14 16:09:00 -07:00 |
|
snipe
|
8ca71df7c9
|
Check for superuser
|
2016-05-14 15:05:35 -07:00 |
|
snipe
|
9a8e4a55e7
|
Check for DB table
|
2016-05-14 15:05:28 -07:00 |
|
snipe
|
1a14abed05
|
Check that the table exists
Should probably find a way to handle this that doesn't require a DB call
|
2016-05-14 15:05:20 -07:00 |
|
snipe
|
4dd3a95b6d
|
Fix https detection
|
2016-05-14 15:04:59 -07:00 |
|
snipe
|
beed74c0d0
|
Add extra tables for drop
|
2016-05-14 15:04:51 -07:00 |
|
snipe
|
f4490b14f8
|
[Feature] Re-order custom fields (drag and drop)
|
2016-05-14 14:06:59 -07:00 |
|
snipe
|
a726934cde
|
Fixed bulk delete+checkin for users
|
2016-05-12 21:01:31 -07:00 |
|
snipe
|
252b114b5f
|
Fixed case sensitive model for status labels
|
2016-05-12 17:23:51 -07:00 |
|
snipe
|
73327d31e3
|
Updated backup paths for config variables in laravel-backups 3.7.0
|
2016-05-12 17:16:10 -07:00 |
|
snipe
|
9cfde523b0
|
Updated laravel-backup package
Files are still not being generated. Open a ticket with the package maintainer
|
2016-05-12 16:54:07 -07:00 |
|
snipe
|
b9b8149234
|
Minor backups fixes
|
2016-05-12 16:20:23 -07:00 |
|
snipe
|
720274446e
|
Fixes #1997 - save user groups without Sentry crap
|
2016-05-12 15:26:48 -07:00 |
|
snipe
|
6d91774943
|
[Feature Request] Fixes #2030 - allow asset name change on checkin
|
2016-05-12 12:34:44 -07:00 |
|
snipe
|
062cbeb18f
|
Fixed bug in categories asset listing for hardware
|
2016-05-12 10:39:19 -07:00 |
|
snipe
|
ae8a03fec3
|
Add manufacturer name/sorting/searching on assets
|
2016-05-12 10:38:57 -07:00 |
|
snipe
|
c56c398d4c
|
Fixes #1996 - replace old Sentry methods with laravel native
|
2016-05-09 15:40:27 -07:00 |
|
snipe
|
a144fb77cd
|
Fixed hodor
|
2016-05-09 15:38:29 -07:00 |
|
snipe
|
d40289fbc9
|
Fixes #1997 and #1996 - replace sentry functions
|
2016-04-28 21:59:43 -07:00 |
|
snipe
|
ba01b20ad4
|
Use updated redirect() reference
|
2016-04-28 21:06:41 -07:00 |
|
snipe
|
8dd0e72284
|
Remove erroneous comment
|
2016-04-28 21:05:45 -07:00 |
|
snipe
|
d927aa3273
|
Fix delete method for groups
|
2016-04-28 21:03:56 -07:00 |
|
snipe
|
a0bff94de3
|
Moved selectedPermissionsArray
|
2016-04-28 20:57:07 -07:00 |
|
snipe
|
7d8af579cf
|
Updated controller with correct helper namespace
|
2016-04-28 20:57:02 -07:00 |
|
snipe
|
7783471cc3
|
Move selectedPermissionsArray to helper, since it can be used by users as well
|
2016-04-28 20:56:47 -07:00 |
|
snipe
|
8dc0dc0a07
|
Update permissions for cli user tool
|
2016-04-28 20:56:27 -07:00 |
|
snipe
|
7b489ad1ec
|
Ability to suppress users from checkoutable list
|
2016-04-28 20:19:22 -07:00 |
|
snipe
|
449163c875
|
Fixes #1995 - updated group admin to use native permissions
|
2016-04-28 14:03:54 -07:00 |
|
snipe
|
32c193b9bf
|
[Bugfix] Fixed Mail namespace
|
2016-04-23 04:02:52 -07:00 |
|
snipe
|
c3b7332e3b
|
[Bugfix] Fixed Mail namespace
|
2016-04-23 04:02:40 -07:00 |
|
snipe
|
96911b9e57
|
Fixes #1944 - add manufacturer to model list
|
2016-04-23 03:34:49 -07:00 |
|
snipe
|
3eb09871cf
|
Fixed model name
|
2016-04-23 03:12:39 -07:00 |
|
snipe
|
1b5ef695f2
|
Add custom fields to modals in create asset
|
2016-04-23 03:12:31 -07:00 |
|
snipe
|
97e218541b
|
Fixes date sanity check in checkout
|
2016-04-23 02:36:21 -07:00 |
|
snipe
|
7a65fe8f89
|
Only get fieldset rules if there if is a model selected
|
2016-04-23 02:35:31 -07:00 |
|
snipe
|
93e7715c28
|
Fixes dumb timestamp if the user manually removes date
|
2016-04-23 02:34:29 -07:00 |
|
snipe
|
7e0ab645bf
|
Removed junk text
|
2016-04-23 02:09:52 -07:00 |
|
snipe
|
4d4b4ffd36
|
Use new checkout/checkin method
|
2016-04-23 02:08:38 -07:00 |
|
snipe
|
466f660a63
|
Removed older commented out code
|
2016-04-23 02:08:18 -07:00 |
|
snipe
|
aa13b24bbc
|
Remove Parsefloat. Again.
|
2016-04-23 02:08:04 -07:00 |
|
snipe
|
8179fc2f90
|
Changed checkout method to be more generic, for checkin and checkout
|
2016-04-23 02:07:40 -07:00 |
|
snipe
|
c9d285cf47
|
Fixed float for purchase_cost
|
2016-04-21 22:23:08 -07:00 |
|
snipe
|
44f7305e12
|
Fix restore assets
|
2016-04-21 21:01:57 -07:00 |
|
snipe
|
6b982ec253
|
Check for accessories
|
2016-04-21 21:01:45 -07:00 |
|
snipe
|
a0b080b91d
|
Fixed restore again.
For some reason, $user->restore() isn't working? WTF.
|
2016-04-21 20:52:32 -07:00 |
|
snipe
|
0a5e7214aa
|
Fixed restore method
|
2016-04-21 20:27:03 -07:00 |
|
snipe
|
c39e27cc5e
|
Fixes #1955 - searching within locations
|
2016-04-19 20:23:04 -07:00 |
|
snipe
|
4efc30c63e
|
Escape search query text
|
2016-04-19 20:22:37 -07:00 |
|
snipe
|
f2d883e711
|
Removed box header
|
2016-04-19 07:43:49 -07:00 |
|