d8df61bd32
Merge remote-tracking branch 'upstream/develop' into multiple-companies
...
Conflicts:
app/controllers/admin/UsersController.php
app/views/backend/hardware/index.blade.php
2015-11-12 09:30:11 +03:00
a0599712a6
Show model image if available and no asset image
2015-11-11 16:06:07 -08:00
d1a306cfd8
Yay, asset image progress!
2015-11-09 08:25:29 -07:00
6bf2a2875f
Add initial support for multiple companies
...
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0
https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03:00
4b2e7b9b06
Fixes #1013 - show location name on asset view page
2015-11-04 00:13:48 -08:00
2a43491792
Fixes #1291 on the asset view as well
2015-11-03 22:19:58 -08:00
0b0b55619b
Fixes #1291 - Use current currency, or sane fallback
2015-11-02 20:06:06 -08:00
efddda8665
Fixed expected_checkin error on asset view
2015-10-23 18:28:06 -07:00
20e7888bd9
Fixed expected checkin on view
2015-10-23 14:36:20 -07:00
4c3a5a99df
Use client-side bootstrap tables for reports
2015-10-22 03:11:34 -07:00
a3f5dc331d
Fixes #1007 and #1053
2015-10-22 02:11:39 -07:00
7087e86ca5
Nicer (tho non-ajaxy) table
2015-10-21 21:23:58 -07:00
0cb4b9e00b
Fixes #1181 - add title to maintenances in asset view
2015-09-20 23:51:56 -07:00
94e8b5f783
Fixed bug in expected checkin
2015-08-17 11:14:01 -07:00
358cd1eaf9
More consistent formatting for maintenances
2015-08-12 18:24:38 -07:00
2835905398
Fix dup file uploads and layout
2015-07-24 12:24:10 +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
4f1f21287c
Add Expected Checkin Date
2015-07-23 12:37:45 +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
2457003deb
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-07-20 21:16:06 -04:00
5ee4eb5871
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-07-20 21:15:46 -04:00
c253000af1
Updated the ImprovementsController to support date formatting for start and completion date on the data table
...
Updated the supplier and hardware view views to include the date formatting for start and completion date
2015-07-20 21:15:33 -04:00
c3439b41b8
Updated the view for a hardware asset so that we could see the improvements on an asset
2015-07-20 21:14:51 -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
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
4a5066054b
Display bugfixes for #819
2015-07-08 22:38:35 -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
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
b2847811ef
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-06-27 17:42:15 -04:00
b7f050aa3b
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-06-27 17:15:23 -04:00
cc67569425
Updated the ImprovementsController to support date formatting for start and completion date on the data table
...
Updated the supplier and hardware view views to include the date formatting for start and completion date
2015-06-27 15:55:56 -04:00
e406dd02ed
Updated the view for a hardware asset so that we could see the improvements on an asset
2015-06-27 14:38:12 -04:00
ea0f2c5f34
Fixes #833 - remove status label field if asset is checked out
2015-06-22 20:00:28 -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
7c95f4231e
Fixes #799 - missing text in file delete confirmation
2015-05-14 20:52:19 -07:00
ff23616bb5
Fix #712 - Change RTD to Deployed if checkedout
2015-04-01 09:36:54 +10:30
85c22c897a
Implement #630 - Add Licenses Serial to Asset View
2015-03-11 09:52:02 +10:30
94e8ca0c86
update icons
2015-03-10 13:27:02 +10:30
ac23e8fd02
Removed line
2015-03-01 15:16:38 -08:00
15a7e205be
Force Model Restore before Asset Restore
2015-02-27 07:33:48 +10:30
97d97fc4df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
eb5d4983de
more model functionality and icons
2015-02-27 00:53:16 +10:30
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
cd7461a3a8
Missed files. Composer to add new package and organized the view page label
2015-02-25 15:08:12 -05:00
7d87b3384c
Standardized colors for checkin/checkout in sidebar
2015-02-18 12:22:37 -08:00
30df21c7aa
Fixed missing checkedout-to info on asset view
2015-02-18 10:27:41 -08:00
063e5c407c
Fixed the depreciation report, fixes to calculate current depreciated
...
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
2015-02-17 18:51:13 -08:00
88dc0700f0
Make date functions work; create negative intervals for depreciation,
...
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
2015-02-17 17:40:16 -08:00
1e4071b51d
First stab at cleaning up Depreciation
...
Conflicts:
app/models/Asset.php
It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
2015-02-17 17:39:39 -08:00
Abdullah Alansari