ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,210 Commits 84 Branches 293 Tags
480fd78c51bd7b3fac65c4e800855eb5227e00a0
Commit Graph

272 Commits

Author SHA1 Message Date
snipe 480fd78c51 Disllow delete if parent 2015-07-28 20:45:32 -07:00
snipe 0c9018289b Fixes #970 2015-07-28 20:24:58 -07:00
snipe 8b5de894df Updated language files 2015-07-27 10:24:21 -07:00
snipe 5781a01311 Added English, Indonesian 2015-07-27 10:24:08 -07:00
snipe de1adf227b New language files 2015-07-27 10:18:40 -07:00
snipe 08ce08db62 Missing language strings for accept/decline 2015-07-26 23:01:31 -07:00
snipe a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined 2015-07-26 22:53:48 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe 59963b88f5 Fixes #941 - looser restrictions on alpha_space custom validator 2015-07-24 17:29:47 -07:00
madd15 e8c8509ed3 Add checkin_email Lang 2015-07-24 10:25:52 +09:30
snipe 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
madd15 d12d1f161f Add Expected Checkin Date 2015-07-23 11:52:04 +09:30
Vincent Sposato 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
Vincent Sposato 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
Vincent Sposato 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
Vincent Sposato 0da0998e44 Made sure that all language files were there, even though they were blank 2015-07-20 21:04:46 -04:00
Vincent Sposato 60d3af7bb7 Added all of the language items needed 2015-07-20 21:03:51 -04:00
Vincent Sposato 3e2bd02ce5 Fixed issue with migration that left off the deleted_at field 2015-07-20 21:02:04 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 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
madd15 8b77be9da3 Update for change to username on sign in 2015-07-16 10:04:20 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00
snipe 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
snipe 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
snipe 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
snipe 05f0b94bf6 Fixed language string 2015-07-08 13:05:17 -07:00
Vincent Sposato 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
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 6915987239 Added demo language string 2015-06-30 22:38:19 -07:00
Vincent Sposato 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
Vincent Sposato 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
Vincent Sposato 78f1c0f11f Made sure that all language files were there, even though they were blank 2015-06-27 14:36:07 -04:00
Vincent Sposato 95f8e9fbe8 Added all of the language items needed 2015-06-27 14:35:37 -04:00
Vincent Sposato a5292d4b71 Fixed issue with migration that left off the deleted_at field 2015-06-27 12:26:40 -04:00
snipe 3caded990a Added parent string 2015-06-23 18:32:06 -07:00
snipe 3bca2566d7 Added missing create/update consumable string 2015-06-23 16:35:38 -07:00
snipe 8ef3d00f22 Fixed language string for users 2015-06-23 14:10:15 -07:00
snipe 26540b1aac Updated bad data string 2015-06-23 14:02:01 -07:00
snipe 17ca66f4a2 Added update string 2015-06-23 12:59:19 -07:00
snipe f30285eaea Added text string for consumable name 2015-06-23 11:39:28 -07:00
snipe 74a9a176e9 New language strings 2015-06-23 10:25:44 -07:00
snipe e8e0c7bfe4 Missing filetype info string 2015-06-22 17:57:21 -07:00
snipe ccdda7b8e8 Missing reassignable string 2015-06-22 17:57:09 -07:00
snipe 40c59e664b Backup language string 2015-06-19 17:37:58 -07:00
snipe df59e7f699 New strings 2015-06-19 11:44:19 -07:00
snipe 49b746a811 QTY strings 2015-06-18 15:00:23 -07:00
snipe 1013580236 Fixed typo 2015-06-18 15:00:16 -07:00
snipe 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00