21bb2f8b44
Updated language string for asset request
2015-08-17 11:11:09 -07:00
e7d7cc6fc2
Added space after error intro
2015-08-14 21:33:39 -07:00
e14ebd0daa
Improved error messages and error handling
2015-08-14 20:50:01 -07:00
676bedc9be
LDAP UI language strings
2015-08-14 20:15:24 -07:00
b576fce1f7
Modified files for accessory report.
2015-08-11 16:35:18 -07:00
9540db424a
Fixes #948 - validate on model name+modelno+manufacturer combination
2015-08-06 05:58:50 -07:00
77bff707fa
English is hard :(
2015-08-04 12:54:45 -07:00
183f8ae1bf
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/commands/ImportCommand.php
# app/lang/en/admin/users/message.php
# app/lang/en/general.php
2015-08-04 12:51:35 -07:00
3c730c691b
Fixes #1010 - better errors on large file uploads
2015-08-04 12:45:17 -07: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
57e21193c9
Added language strings for not requestable
2015-07-30 14:50:06 -07:00
480fd78c51
Disllow delete if parent
2015-07-28 20:45:32 -07:00
0c9018289b
Fixes #970
2015-07-28 20:24:58 -07:00
8b101b10ec
Updated language files
2015-07-27 10:25:35 -07:00
de1adf227b
New language files
2015-07-27 10:18:40 -07:00
a901a648af
Fixes #875 - allow user to decline asset and check asset back in if declined
2015-07-26 22:53:48 -07:00
e8c8509ed3
Add checkin_email Lang
2015-07-24 10:25:52 +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
d12d1f161f
Add Expected Checkin Date
2015-07-23 11:52:04 +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
3df0550b19
Built the report and the export for the Improvements report
...
Added the links on the navigation
2015-07-20 21:26:23 -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
0da0998e44
Made sure that all language files were there, even though they were blank
2015-07-20 21:04:46 -04:00
60d3af7bb7
Added all of the language items needed
2015-07-20 21:03:51 -04:00
3e2bd02ce5
Fixed issue with migration that left off the deleted_at field
2015-07-20 21:02:04 -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
1e730078c1
Add file uploads to Users
2015-07-10 09:23:34 +09:30
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
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
05f0b94bf6
Fixed language string
2015-07-08 13:05:17 -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
269f73205a
Built the report and the export for the Improvements report
...
Added the links on the navigation
2015-06-28 15:00:55 -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
78f1c0f11f
Made sure that all language files were there, even though they were blank
2015-06-27 14:36:07 -04:00
95f8e9fbe8
Added all of the language items needed
2015-06-27 14:35:37 -04:00
a5292d4b71
Fixed issue with migration that left off the deleted_at field
2015-06-27 12:26:40 -04:00
3caded990a
Added parent string
2015-06-23 18:32:06 -07:00
3bca2566d7
Added missing create/update consumable string
2015-06-23 16:35:38 -07:00
f30285eaea
Added text string for consumable name
2015-06-23 11:39:28 -07:00
e8e0c7bfe4
Missing filetype info string
2015-06-22 17:57:21 -07:00
ccdda7b8e8
Missing reassignable string
2015-06-22 17:57:09 -07:00
40c59e664b
Backup language string
2015-06-19 17:37:58 -07:00
df59e7f699
New strings
2015-06-19 11:44:19 -07:00
1013580236
Fixed typo
2015-06-18 15:00:16 -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
snipe