snipe
|
cffa76e627
|
Find first record, instead of hardcoded id 1
|
2016-06-01 15:50:50 -07:00 |
|
snipe
|
9c4cd9c3ce
|
Save email/username format in settings controller
|
2016-06-01 15:45:26 -07:00 |
|
snipe
|
eacf70ee3f
|
Updated validation
|
2016-06-01 15:45:05 -07:00 |
|
snipe
|
f3c6275f8d
|
Removed settings form request
|
2016-06-01 15:43:12 -07:00 |
|
Daniel Meltzer
|
1c1ef951e9
|
Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted.
|
2016-06-01 13:47:46 -05:00 |
|
Daniel Meltzer
|
3ddaa88694
|
Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800
|
2016-05-31 19:50:58 -05:00 |
|
Daniel Meltzer
|
fcc79456fd
|
Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff
|
2016-05-31 19:50:58 -05:00 |
|
snipe
|
11c400f12b
|
Merge pull request #2095 from dmeltzer/importer-improvements
Reduce Import error warnings in importer.
|
2016-05-31 17:45:29 -07:00 |
|
Daniel Meltzer
|
f2a5337ad2
|
Simplify
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
4af5cdd64f
|
asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy.
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
0fa82743a1
|
Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different.
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
45d93ffa8c
|
Use a transaction while creating license seats. Makes adding a license with a large number of seats much more managable.
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
4b98711e07
|
Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
a729038ccd
|
Fix typo.
|
2016-05-31 19:00:11 -05:00 |
|
Daniel Meltzer
|
dab2a50982
|
Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements.
|
2016-05-31 18:04:01 -05:00 |
|
snipe
|
0e0b31bba6
|
Company name length to 1
|
2016-05-31 15:04:13 -07:00 |
|
Daniel Meltzer
|
004c63cd5d
|
Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification.
|
2016-05-26 21:29:29 -05:00 |
|
Daniel Meltzer
|
715e385925
|
Two things. One, try to make the import uploads directory if it doesn't exist. Two, call the object importer instead of the old asset importer. TODO: Feed output from object importer back to import page.
|
2016-05-26 08:00:00 -05:00 |
|
Daniel Meltzer
|
891c37b2ed
|
Add warranty months. Also fix a merge issue where things reverted back to comment instead of log.
|
2016-05-25 21:13:26 -05:00 |
|
Daniel Meltzer
|
e353df588f
|
Importer improvements. If user real name doesn't exist don't try to create the user.
|
2016-05-25 20:47:46 -05:00 |
|
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 |
|