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

2318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 75852bdb8b Derp 2015-08-11 18:40:16 -07:00
snipe 5cc1e7d3fe Trying to set hostname back so tests won't fail 2015-08-11 18:37:37 -07:00
snipe a98f4883be Merge branch 'develop' of github.com:snipe/snipe-it into JoeFaux-AccessoryReport 2015-08-11 18:27:35 -07:00
snipe d5a709a836 Improved testing stuff 2015-08-11 18:27:28 -07:00
snipe 4243270e7d Merge pull request #1049 from JoeFaux/AccessoryReport 
Accessory report
 2015-08-11 17:31:37 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
root d7313543ef Changes to support an accessory report. 2015-08-11 16:32:48 -07:00
snipe 2636474120 Improved Welcome test 2015-08-11 15:57:58 -07:00
snipe 0c3b55a8b5 Upgrade to newer travis infrasructure 2015-08-11 15:49:25 -07:00
snipe d7dd35a2f2 Removed generated test files accidentally commited 2015-08-11 15:30:43 -07:00
snipe 0c8e3809f2 Starter acceptance tests 2015-08-11 15:29:44 -07:00
snipe 4538bca29f Allow 0 qty consumable 2015-08-11 14:34:54 -07:00
snipe eeda4366a3 Removed cruft from debugging 2015-08-11 14:32:14 -07:00
snipe fc31a828bc Exclude Snipe-IT from search engines 2015-08-11 14:19:51 -07:00
snipe 88e10516a9 Updated footer links 2015-08-11 14:19:13 -07:00
snipe 481b905331 Fixes #1045 - allow 0 value for accessories 2015-08-11 14:01:13 -07:00
snipe 959df613ae Updated language strings 2015-08-11 13:39:09 -07:00
snipe c476eda868 Removed link on location until location view is fixed 2015-08-11 13:20:58 -07:00
snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock
 2015-08-11 13:20:25 -07:00
snipe 242e6ff030 Updated composer lock 2015-08-11 12:40:13 -07:00
snipe f026f886ae Removed unique constraint on model no 2015-08-11 12:37:57 -07:00
snipe 936d7dab1b Fixes #1043 2015-08-11 12:36:03 -07:00
snipe 38d774eb6a Merge pull request #1033 from vsposato/feature/865_fixIssuesFromSnipe 
Feature/865 fix issues from snipe
 2015-08-11 11:57:56 -07:00
Vincent Sposato d363a0deec Merge branch 'feature/865_fixIssuesFromSnipe' of github.com:vsposato/snipe-it into feature/865_fixIssuesFromSnipe 2015-08-07 18:52:58 -04:00
Vincent Sposato 3ebbd030e7 Fixed issue with Asset model 2015-08-07 18:52:19 -04:00
Brady Wetherington 7ae226635f First rough pass at asset acceptance report 2015-08-07 18:50:55 -04:00
Vincent Sposato afbe23c214 Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query 
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
 2015-08-07 18:50:55 -04:00
Vincent Sposato 7f91f6e349 Completed the changes from uberbrady to make the report work correctly 2015-08-07 18:00:23 -04:00
Vincent Sposato 6db7001dd5 Merge pull request #1 from uberbrady/feature_865_plus_denorm 
First rough pass at asset acceptance report
 2015-08-07 17:39:47 -04:00
snipe 9540db424a Fixes #948 - validate on model name+modelno+manufacturer combination 2015-08-06 05:58:50 -07:00
snipe 84d81184fa Fixes #1009 - Add MAC address to search 2015-08-06 05:13:27 -07:00
snipe 3c0cc94652 Fixed route 
TODO:

- add modal button
 2015-08-06 04:53:23 -07:00
snipe 5dcc795aa2 Fixes #1024 - delete option added to user dropdown 2015-08-06 04:33:34 -07:00
snipe 106ed6a9a0 Added location to user listing 2015-08-06 03:59:23 -07:00
Brady Wetherington daff0dbccb First rough pass at asset acceptance report 2015-08-06 01:55:17 -07:00
snipe 56f490cef9 Merge pull request #1029 from madd15/patch-4 
Fix #1022 - Missing Lang on viewing deleted user
 2015-08-05 18:06:17 -07:00
Vincent Sposato 145cf1093c Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query 
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
 2015-08-05 20:50:35 -04:00
madd15 336858e4ed Fix #1022 - Missing Lang on viewing deleted user 2015-08-06 09:33:53 +09:30
snipe e3c1a9f80c Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 2015-08-05 13:57:29 -07:00
snipe 66991ea663 Fixes #1018 - allow name re-use if deleted 2015-08-05 13:57:04 -07:00
snipe e253d611b4 Merge pull request #1027 from balticer/fix-validation-ampersand-and-sharp-s 
Modifying validator to support & and ß
 2015-08-05 13:27:24 -07:00
Kai Korla 7e76d8858e Modifying validator to support & and ß 2015-08-05 18:13:47 +02:00
snipe dc265ba2a8 Fixed back button on user create 2015-08-04 20:48:54 -07:00
snipe eb00acddfd Trying to fix the broken migration 2015-08-04 14:55:10 -07:00
snipe 449ad4f86b Fixes #1014 - error if no assets are unaccepted 2015-08-04 13:22:13 -07:00
snipe 77bff707fa English is hard :( 2015-08-04 12:54:45 -07:00
snipe 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php
 2015-08-04 12:51:35 -07:00
snipe fda6d60225 Merge pull request #1011 from goetzk/route-not-to 
Change to using route in error message
 2015-08-04 12:46:31 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -07:00
Karl Goetz cf4f178485 Change to using route in error message 
When I've broken things and wound up with a 500 error the link back to home
produces a 404 error. I believe its because it uses 'to' instead of 'route' but
I'm not familiar enough with php to be sure of my theory.
 2015-08-04 10:40:40 +10:00