ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,179 Commits 84 Branches 293 Tags
v1.2.2
Commit Graph

1179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe dede09e9c5 Merge remote-tracking branch 'origin/develop' v1.2.2 2015-01-22 15:41:36 -08:00
snipe 3787a3f4ba Fixed language strings for incrementing IDs 2015-01-22 15:34:19 -08:00
snipe 95141d49ba Fixes #432 - add model name to checkout 2015-01-22 15:20:16 -08:00
snipe d85e524680 Fixes #451 - allows spaces in state name 2015-01-22 14:29:53 -08:00
snipe 4a77dee79c Fixes #447 - added asset log entry on save 2015-01-22 14:16:09 -08:00
snipe 6fba41e026 Updated gitignore to ignore crowdin 2015-01-22 13:42:32 -08:00
snipe f39922f51f Merge remote-tracking branch 'origin/develop' 
Conflicts:
	CONTRIBUTING.md
 2015-01-22 13:31:19 -08:00
snipe 53085983f8 Added UK English language file v1.2.1 v1.2.0 2015-01-22 13:24:01 -08:00
snipe 4a2ac03ace New Spanish strings 2015-01-22 13:23:29 -08:00
snipe 548de1a1a2 Fixes #468 - updated ordering on license checkout 2015-01-22 13:03:07 -08:00
snipe 82560b1098 Updated language files with new strings 2015-01-22 13:00:38 -08:00
snipe 3c141e8f50 Fixes #467 2015-01-22 12:56:13 -08:00
snipe 5e496672c6 Fixes #469 2015-01-22 12:54:22 -08:00
snipe 4887c53f25 Merge pull request #452 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-01-12 15:16:57 -08:00
The Gitter Badger 2b79a61d65 Added Gitter badge 2015-01-12 23:15:02 +00:00
snipe 5268c579e2 Update CONTRIBUTING.md 2015-01-08 17:34:23 -08:00
snipe 21448ea8e6 Update CONTRIBUTING.md 2015-01-08 17:33:49 -08:00
snipe 778a7bb18c Additional translations 2015-01-08 17:24:13 -08:00
snipe 685881cf27 Too many thanks (too many thanks) 2015-01-08 17:19:02 -08:00
snipe cf4b80bbd5 Updated contributing guidelines 2015-01-08 17:18:19 -08:00
snipe 5c98dae57d Merge branch 'develop' 2015-01-08 11:34:19 -08:00
snipe e434616db8 Merge pull request #436 from rashivkp/fix-435 
fixed #435. using namespace with route groups to increase the readability
v1.2 		2015-01-04 21:50:07 -06:00
snipe 8a7b7418db Merge pull request #433 from thehereward/tidy-up-models 
Tidy up models
 2015-01-04 21:49:57 -06:00
Mohamed Rashid 533be7f942 fixed #435. using namespace with route groups to increase the readability 2015-01-05 01:24:16 +05:30
Hereward Mills 094ec50a68 TidyUp: Commonise the depreciate method of Asset and License. 2014-12-24 23:03:06 +00:00
Hereward Mills 98a29e460d TidyUp: Remove excess whitespace. 2014-12-24 22:34:16 +00:00
snipe 27fabfd110 Updated readme 2014-12-23 14:50:34 -05:00
snipe dce1d47228 Updated language files 2014-12-23 14:48:43 -05:00
snipe 9bbec53635 Added --no-dev to composer for CI 2014-12-23 14:19:46 -05:00
snipe 82232a34ee Merge pull request #415 from svpernova09/feature/software-maintenance-additions 
Feature/software maintenance additions Working on #232
 2014-12-23 14:11:20 -05:00
Svpernova09 3d1795e312 Add process handling of new maintained and termination_date fields to the licenses methods for creating and editing licenses. Also add array for getCreate and getEdit to easily display maintained options in drop down 2014-12-10 07:45:53 -06:00
Svpernova09 d858861d0f Add termination_date and maintained fields to the License edit form. Add field labels to language file. 2014-12-10 07:44:47 -06:00
Svpernova09 eec36cb13a Add migration to add maintained and termination_date fields to licenses table 2014-12-10 07:43:57 -06:00
snipe cee966e76e Merge pull request #408 from svpernova09/feature/add-asset-from-model-view 
Feature/add asset from model view for #365
 2014-12-03 15:25:56 -05:00
Svpernova09 dcf2b428da If we are passing along an id of a previously selected model, use that as the default selection. Otherwise we should fall back to Input::old() 2014-12-03 14:06:33 -06:00
Svpernova09 80d8432c35 Check the optional parameter and if there is a value, grab that model and pass along to the view. Refactored the view return to be easier to read and able to interject if our parameter was set. 2014-12-03 14:05:42 -06:00
Svpernova09 8ec5934af5 Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link 2014-12-03 14:04:02 -06:00
snipe 31f77dcb4b Merge pull request #407 from svpernova09/bug/500-error-when-viewing-asset 
Check if ->adminuser->id isset before trying to print the fullName so we...
 2014-12-03 14:08:09 -05:00
Svpernova09 0663ccb99f Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349 2014-12-03 07:46:29 -06:00
snipe 19189f688f Merge pull request #405 from svpernova09/enhancement/make-notes-field-textarea 
Enhancement/make notes field textarea
 2014-12-02 11:21:36 -05:00
Svpernova09 7849320db0 Convert note fields to text areas for licenses views 2014-12-02 06:59:16 -06:00
Svpernova09 cc8ca54b3f Convert note fields to text areas for hardware views 2014-12-02 06:59:01 -06:00
Svpernova09 ecb4d0d948 Add jetbrains IDE's config folders to gitignore 2014-12-02 06:51:50 -06:00
snipe f20566f222 Merge pull request #393 from madd15/patch-1 
Fix #388 - License not showing checked out in view
 2014-11-23 19:36:28 -05:00
madd15 73dd339772 Fix #388 - License not showing checked out in view 2014-11-24 11:05:24 +10:30
snipe 5a6139fb64 Merge pull request #391 from bitdeli-chef/master 
Add a Bitdeli Badge to README
 2014-11-22 22:57:29 -05:00
Bitdeli Chef 0fb2728e3f Add a Bitdeli badge to README 2014-11-23 04:06:26 +00:00
snipe 5e6c4a250a Updated composer lock 2014-11-21 07:34:06 -05:00
snipe bf96aae9d9 Truncate license in report 2014-11-21 07:32:12 -05:00
snipe daefc86e58 Formattig fixes for #386 2014-11-21 06:10:30 -05:00