7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
84d81184fa
Fixes #1009 - Add MAC address to search
2015-08-06 05:13:27 -07:00
3c730c691b
Fixes #1010 - better errors on large file uploads
2015-08-04 12:45:17 -07: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
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
de8180ec70
Abililty to inline-add things when you are creating a new asset
2015-07-27 23:27:45 -07:00
0f0dab556d
Fixes #807 - bad link for subfolders
2015-07-24 22:48:29 -07:00
00bcae7feb
Add email to postCheckin
2015-07-24 10:24:14 +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
8ba55b4bf2
Fix missing checkedout_at
2015-07-23 12:40:22 +09:30
4375d66d09
Add Expected Checkin Date
2015-07-23 10:05:16 +09:30
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a55309bfaef
2015-07-20 17:12:28 -07:00
9d949a5b89
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-20 16:34:55 -07:00
01c2968388
Revert "Fixes #863 - clickable order number in asset view"
...
This reverts commit 0c842fc772
2015-07-20 16:34:14 -07:00
41b711740a
Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
...
# Conflicts:
# app/controllers/admin/ReportsController.php
# app/lang/en/general.php
# app/routes.php
# app/views/backend/hardware/view.blade.php
# app/views/backend/layouts/default.blade.php
# composer.lock
2015-07-20 16:12:35 -07:00
0d0589800a
Add additional data for email fields
2015-07-20 14:35:07 +09:30
e29ab6b0d6
Change user list from email to username
2015-07-20 10:16:26 +09:30
0c842fc772
Fixes #863 - clickable order number in asset view
2015-07-16 21:21:09 -07:00
919df7ed56
Part of #863 - adds order number to asset listing
2015-07-16 19:54:56 -07:00
de62db5e18
Fixes #901 - added notes field to list view
2015-07-16 19:45:10 -07:00
24b0d83387
Fixes #912 - added clon button to list view
2015-07-16 19:33:39 -07:00
2659521dc9
Change user list to include email address
2015-07-16 10:22:57 +09:30
0154f240f3
Fixes JavaScript for edited assets
2015-07-10 22:48:21 -07:00
1c2a409e6a
Check that there is an assetstatus
2015-07-09 07:08:33 -07:00
15e1774a13
Centered checkboxes for select all
2015-07-09 03:57:20 -07:00
7255a8bb0c
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-09 01:24:34 -07:00
f5d4eb5842
Merge pull request #897 from madd15/patch-2
...
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-09 01:19:57 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
a22687abc5
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-07 14:38:28 +09:30
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
61836f20c5
Clear Mac Address on Clone
2015-07-07 08:23:51 +09:30
62d382d704
Remove serial and assigned_to when cloning asset
2015-07-07 08:19:58 +09:30
3746bc333b
Better checking for model name and category name
2015-07-06 14:12:49 -07:00
1b423f5b54
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-06 10:36:54 -04:00
7d5810b656
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/config/version.php
# app/controllers/admin/AssetsController.php
2015-07-02 17:23:06 -07:00
1601bdd4eb
Added rtd_location_id back into selected columns
2015-07-02 16:52:08 -07:00
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
62f8d002e3
Temp commented out some stuff
2015-06-30 22:05:21 -07:00
a8cb5c1e7d
Beginning QR mobile interface
2015-06-30 19:07:44 -07:00
2be1d64de3
Merge remote-tracking branch 'origin/develop' into 1.3.0
2015-06-16 12:56:14 -07:00
c3c4e9def2
Fixes #852 - localized string for file types, added zip and rar for asset upload
2015-06-16 12:54:53 -07:00
19604480bb
Consumables section
...
TODO:
- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
Brady Wetherington