b576fce1f7
Modified files for accessory report.
2015-08-11 16:35:18 -07:00
c476eda868
Removed link on location until location view is fixed
2015-08-11 13:20:58 -07:00
b3249dcf48
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/UsersController.php
# app/models/Model.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/users/index.blade.php
# composer.lock
2015-08-11 13:20:25 -07:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
afbe23c214
Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
...
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
9540db424a
Fixes #948 - validate on model name+modelno+manufacturer combination
2015-08-06 05:58:50 -07:00
84d81184fa
Fixes #1009 - Add MAC address to search
2015-08-06 05:13:27 -07:00
106ed6a9a0
Added location to user listing
2015-08-06 03:59:23 -07:00
449ad4f86b
Fixes #1014 - error if no assets are unaccepted
2015-08-04 13:22:13 -07:00
3c730c691b
Fixes #1010 - better errors on large file uploads
2015-08-04 12:45:17 -07:00
24edf81b27
Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport
2015-08-01 12:29:29 -04:00
b195934a4a
Finished building out the report, and refactoring to make the code more expressive
...
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
794dc5998a
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-08-01 12:20:48 -04:00
8f68bdb318
Working through getting the dataset correctly from the asset logs so that we can generate a report
2015-08-01 12:17:13 -04:00
e560cc2ee2
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-07-31 19:29:44 -04:00
305c22f72d
Added request to dashboard
2015-07-30 14:59:24 -07:00
78835a8b1f
Add requestable as bulk-edit option
2015-07-30 14:32:25 -07:00
948c443829
Fix for edit/clone
2015-07-29 20:50:23 -07:00
8c30c5d879
Fixed issue in routes file
2015-07-29 19:09:32 -04:00
20f94ce418
Closing brackets are helpful
2015-07-29 14:27:03 -04:00
cced7a93a5
Update AssetsController.php
2015-07-29 14:25:49 -04:00
6430f7a4a7
Update AssetsController.php
2015-07-29 14:24:30 -04:00
0c9018289b
Fixes #970
2015-07-28 20:24:58 -07:00
e4ad1011da
Merge pull request #969 from snipe/inline_adding
...
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
de8180ec70
Abililty to inline-add things when you are creating a new asset
2015-07-27 23:27:45 -07:00
9184dd5303
Fix for sad action column with button wrapping
2015-07-27 15:28:41 -07:00
7aba5f3a84
Request #961 - Clone button on license list view
2015-07-28 07:33:51 +09:30
5e7bfe314a
Fix missing ]
2015-07-27 21:20:19 +09:30
a099d16714
Only send email if an email address was given
2015-07-26 22:08:26 -07:00
b32e3a3475
Shwo username instead of email
2015-07-26 21:21:42 -07:00
28304556a9
First pass at this, the ugly way. Just to see wha it looks like.
2015-07-26 18:15:06 -07:00
5701b4d38e
Return accessories as well
2015-07-25 00:05:59 -07:00
23866bce26
Use redirect to route instead of back because POST
2015-07-24 23:08:33 -07:00
0f0dab556d
Fixes #807 - bad link for subfolders
2015-07-24 22:48:29 -07:00
6dea227c3e
Fixes #851 - bulk user delete
2015-07-24 22:37:15 -07:00
59b739c1c4
Fixes #902 - redirect to group listing page after group create
2015-07-24 17:43:33 -07:00
fbb55c14d6
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-24 15:56:10 -07:00
00bcae7feb
Add email to postCheckin
2015-07-24 10:24:14 +09:30
6d96d6cba4
Add email to postCheckin
2015-07-24 10:22:54 +09:30
e3f0815012
Add Checkin_email to Create and Edit
2015-07-24 10:21:51 +09:30
d62d6ebf05
Add extra fields for email
2015-07-24 09:28:17 +09:30
e4277b47e8
Add extra fields for email
2015-07-24 09:27:44 +09:30
0de1d45492
Merge pull request #944 from madd15/Feature/Additional-Email-Info
...
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
2015-07-23 16:16:19 -07:00
fdee3ee93e
Merge pull request #933 from madd15/patch-4
...
#916 - Change Userlist identifier from email to username
2015-07-23 16:16:02 -07:00
ef045c61ca
Merge pull request #931 from madd15/patch-3
...
Fix #930 - Add reassignable to create
2015-07-23 16:15:53 -07:00
6d1197a144
Fix edit model cat list showing deleted categories
2015-07-24 08:44:53 +09:30
e455b2af6e
Only update email if password locking isn't set to true
2015-07-23 12:30:44 -07:00
d26c40b26e
Fixed issue where email not saved on edit
2015-07-23 12:28:26 -07:00
8ba55b4bf2
Fix missing checkedout_at
2015-07-23 12:40:22 +09:30
root