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

105 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
snipe
14a9500c6f Merge pull request #293 from madd15/patch-5 
Update Country, Change to Form::, Change state to max 32
 2014-10-23 20:12:45 -04:00
madd15
0e9e659dc4 Alter State to varchar(32) in Suppliers Table 2014-10-24 10:40:14 +10:30
madd15
fafd03f00f Added DB Prefix to Migrations 
Added DB::getTablePrefix(); to migrations to fix #284

not sure if there is another way to achieve this
 2014-10-23 11:47:46 +10:30
snipe
7c97477a53 Added default location to physical hardware 2014-10-16 17:41:56 -04:00
snipe
582a9bf78b Make location_id nullable 2014-08-17 04:37:30 -04:00
Cordeos Team
8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team
144c9eb7f8 A0.4.2: asset, license, user, model cloning and move db migration 2014-08-12 15:54:12 +09:00
Cordeos Team
7ac06fa004 DB migration script Rev 0.11 2014-08-11 17:45:11 +09:00
Cordeos Team
0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team
d6404dc734 0.4.1 release candidate 2014-08-11 13:32:24 +09:00
Cordeos Team
d482b1ea69 0.4.0 release candidate 2014-08-11 13:22:42 +09:00
Cordeos Team
6cfb4ab5d8 0.4.0 release candidate 2014-08-11 13:10:00 +09:00
Cordeos Team
64abdddccb Database migration update 2014-08-10 22:59:57 +09:00
Cordeos Team
23a64cfe26 Database migration update 2014-08-10 22:35:14 +09:00
Cordeos Team
448b54d8e2 DBUpdate 2014-08-10 22:08:38 +09:00
Cordeos Team
72671d3e1d initial beta .4 draft 2014-08-10 20:01:38 +09:00
Cordeos Team
efbe7b0fee initial beta .4 draft 2014-08-10 19:58:23 +09:00