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

150 Commits

Author SHA1 Message Date
snipe e4b45231ec Fix for bad seed data if Jon Doe doesn't get created 2015-04-01 17:22:48 -07:00
madd15 53ab21b016 Migration to add notes field to users 2015-03-18 16:47:52 +10:30
snipe 4243710378 Added location to new assets view 2015-03-14 01:30:12 -07:00
snipe f27fb90457 Allow override of checkin/checkout date 
TODO: fix error if someone enters non-date text
 2015-03-04 18:59:45 -08:00
snipe 2115c82587 Fixed DB format for nullable EULA 2015-03-04 18:59:09 -08:00
snipe 4076b29b63 Support for DATAMATRIX and PDF417 barcodes 2015-03-04 17:43:53 -08:00
snipe 2d196b1595 Fixes #602 for strict_mode 2015-03-04 14:01:18 -08:00
snipe 61b04d6e40 Fixes #579 - user cannot accept more than once 2015-03-01 16:35:32 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 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
madd15 9f3edd701b Fixes #565 - Soft Delete Models and Allow Restore 
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
 2015-02-26 22:35:57 +10:30
snipe 54bad2e4f6 More accessory relationships 2015-02-26 03:19:45 -08:00
snipe 92d6ed0761 Migration for accessory checkout 2015-02-26 03:07:37 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00
snipe e12bbbc171 Clearly, it's time for me to take a break 2015-02-24 22:21:39 -08:00
snipe 31e2299385 Herp derp broke the build 2015-02-24 22:19:14 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula 
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
 2015-02-24 22:15:36 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
snipe f8e12cabd4 Fixes #476 - added logo upload and header color 2015-02-19 15:14:50 -08:00
snipe 38961298ed Fixes #439 - loads javascript and CSS locally 2015-02-17 15:29:57 -08:00
snipe b32d74de57 Fixed seeder with duplicate ID 2015-02-16 19:56:11 -08:00
Splaer 00f7717142 Fix #475 and styling 
Cleaned up styling to break lines with larger notes on hardware view
and asset view. Changed column type to text.
 2015-02-11 23:38:59 -05:00
snipe fbf03b225d Fixes #509 - added MAC address as model option 2015-02-11 16:37:24 -08:00
snipe f690cd6305 Requests table 2015-02-11 03:49:13 -08:00
snipe 89729bfa51 Removed invalid comments 2015-02-10 20:47:24 -08:00
snipe f72b385790 Fix licenses so null instead of 0 2015-02-10 20:46:58 -08:00
snipe f36029a34a Fixed migration for to set assigned_to to null per #506 2015-02-10 18:41:45 -08:00
snipe a2178392e6 Fixed seeder 2015-02-10 18:09:36 -08:00
snipe 3645f85731 Typo :( 2015-02-10 17:23:25 -08:00
snipe 283d2855d7 Added user_id to status label migration for strict mode 2015-02-10 16:22:02 -08:00
snipe 1db1819a56 Added Archived as view for filter 2015-02-10 16:06:33 -08:00
snipe d2438f9fdb Fixes #502 - normalized statuses 2015-02-10 15:57:19 -08:00
snipe 53d000e2d0 Migration to correct previous assigned_to=0 issue 2015-02-09 20:29:48 -08:00
snipe b0d52a4158 Updated field name 2015-02-06 18:41:16 -08:00
snipe 7b4845c255 Added soft delete to asset log 2015-02-06 18:40:58 -08:00
snipe 1db806f8b2 Fixes #488 - longer user jobtitle 2015-02-04 07:59:45 -08:00
snipe b3af102d22 Fixed safe mode issue with license seeder 2015-02-04 07:49:28 -08:00
Svpernova09 eec36cb13a Add migration to add maintained and termination_date fields to licenses table 2014-12-10 07:43:57 -06:00
snipe daefc86e58 Formattig fixes for #386 2014-11-21 06:10:30 -05:00
snipe 64c16a0bac Fixes #386 and #273 - altered column type to text 2014-11-21 05:47:49 -05:00
snipe d6a0249c60 Fixed #373 - added ability to auto-increment asset tags 2014-11-20 18:28:45 -05:00
snipe b826673d0d Added username field for #377 2014-11-20 16:17:48 -05:00
madd15 3c3617d641 Add image to supplier 2014-11-07 13:46:14 +10:30
madd15 7833d10006 Add Fields to Licenses and Update Supplier for Licenses 2014-11-06 09:32:50 +10:30
snipe 6b2d3efe3e Fixes #237 - reporting-only group 2014-11-04 18:21:10 -05:00
snipe 9e85dcb9fc Fixes #315 - add EOL as display option in settings (run migrations) 2014-11-01 18:38:24 -04:00
madd15 03f3294873 Add images to models 
Appropriate changes to views and controllers
includes migration and folder
 2014-10-29 15:54:55 +10:30
madd15 0b4c1b8d83 Feature Avatars 
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
 2014-10-29 14:18:54 +10:30
snipe 139a0a2e2a Merge branch 'develop' of github.com:snipe/snipe-it into develop 2014-10-23 22:39:55 -04:00
madd15 7f44d6dd47 Add display_checkout_date to settings table 2014-10-24 12:48:04 +10:30