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

1861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 3746bc333b Better checking for model name and category name 2015-07-06 14:12:49 -07:00
snipe ccde517c88 Use showAssetName to get asset name 2015-07-06 14:10:24 -07:00
snipe f855bfd4ef Better error checking for eol data 2015-07-06 14:09:48 -07:00
snipe 1601bdd4eb Added rtd_location_id back into selected columns 2015-07-02 16:52:08 -07:00
snipe 552bdfdc2d Switched defaultLoc to belongsTo relationship 2015-07-02 16:51:52 -07:00
snipe 1d4cfcfd58 Only save uploaded logo if not in demo mode 2015-06-30 22:38:40 -07:00
snipe 6915987239 Added demo language string 2015-06-30 22:38:19 -07:00
snipe 3a44a7e8bb Disable logo upload for demo 2015-06-30 22:38:12 -07:00
snipe f2abbd0e8f Deny editing users on demo 2015-06-30 22:10:23 -07:00
snipe 62f8d002e3 Temp commented out some stuff 2015-06-30 22:05:21 -07:00
snipe 0766ae2d17 Disallow group edit for demo 2015-06-30 22:04:48 -07:00
snipe 95920be8ea Fixed weird commenting 2015-06-30 22:04:05 -07:00
snipe 588ff742fe Add manufacturer to models listing for clarity 2015-06-30 19:15:43 -07:00
snipe 5084836737 Merge pull request #861 from strand/patch-1 
Update Code of Conduct to Contributor Covenant 1.1.0
v1.2.8 		2015-06-19 09:16:08 -07:00
Strand McCutchen 063e3bbea6 Update Code of Conduct to Contributor Covenant 1.1.0 2015-06-19 10:15:05 -06: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
snipe 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode 2015-06-15 11:20:09 -07:00
snipe 5a6fe6ccf8 Fixes #806 2015-06-09 02:20:00 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 5939e46eee Bumped version for fixed 1.2.7 2015-06-01 17:52:03 -07:00
snipe a8a0a59982 Fixes #825 - title bar spacing issue 2015-06-01 17:51:20 -07:00
snipe 73a08c031c Fixes #818, and randomizes password for dummy user v1.2.7-master 2015-05-27 11:45:44 -07:00
snipe c77e7bf725 Merge pull request #816 from tomcastleman/develop 
Reassignable should default to true on create form
 2015-05-24 10:49:41 -07:00
Tom Castleman 7a4299c724 Reassignable should default to true on create form 2015-05-24 13:35:28 +01:00
snipe b9b0239837 Merge pull request #813 from tomcastleman/develop-1 
Update develop following PR #809
 2015-05-22 11:51:50 -07:00
snipe a43ae71afd Merge pull request #812 from tomcastleman/develop 
Reassignable License Setting
 2015-05-22 11:50:44 -07:00
Tom Castleman c4339a5d94 Merge branch 'master' into develop 
* master:
  Removed debugbar:publish
 2015-05-22 14:37:01 +01:00
Tom Castleman b161a38e9b Add licenses.reassignable migration 
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
 2015-05-22 14:11:36 +01:00
snipe 735268034d Merge pull request #809 from tomcastleman/patch-1 
Removed debugbar:publish
 2015-05-21 18:56:49 -07:00
snipe aad473486f Merge pull request #798 from DanielNemanic/patch-8 
Generating Asset Name to Label Print
 2015-05-21 18:56:36 -07:00
Tom Castleman 08970f2b7b Removed debugbar:publish 
As per:
```
NOTICE: Since laravel-debugbar 1.7.x, publishing assets is no longer necessary. The assets in public/packages/barryvdh/laravel-debugbar and maximebf/php-debugbar can be safely removed.
```
 2015-05-21 16:59:20 +01:00
Daniel Nemanic 6e8ad5b085 Generating Asset Name to Label Print 
Added the Asset Name to the Label printing page.
 2015-05-13 10:51:06 +02:00
snipe 145d386ce2 Updated lock file 2015-05-12 15:13:18 -07:00
snipe 94bfab762b Merge pull request #791 from DanielNemanic/patch-7 
Updating Dashboard Link URL
 2015-05-07 00:39:53 -07:00
Daniel Nemanic 20d8ad29e5 Updating Dashboard Link URL 
Updating link to real application URL.
 2015-05-07 09:38:16 +02:00
snipe bbdbd5397c Check for valid asset before attempting to get name 2015-05-04 00:46:26 -07:00
snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5 
# Conflicts:
#	app/views/backend/models/view.blade.php
v1.2.7 		2015-05-02 12:28:34 -07:00
snipe 126121065c Merge branch 'patch-3' of https://github.com/DanielNemanic/snipe-it into develop 
# Conflicts:
#	public/assets/css/compiled/user-profile.css
 2015-05-02 12:27:40 -07:00
snipe 48ccf844fa Merge pull request #748 from DanielNemanic/patch-4 
Update user-profile.css
 2015-05-02 12:24:11 -07:00
snipe 7556f989df Accessories Slack integration 2015-04-30 20:53:44 -07:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses 2015-04-30 18:17:44 -07:00
snipe c95af84452 Fixes #750 because @uberbrady can't code 2015-04-30 17:14:31 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe a2dd2509fd Updated language strings for slack v1.2.7-beta 2015-04-29 18:01:43 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost 2015-04-29 16:31:38 -07:00