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

1774 Commits

Author SHA1 Message Date
snipe ad802cfead Squashed commit of the following: 
commit 7ec9bec089408d5ec5e195b851b94568bee44627
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:43:11 2015 -0700

    Additional notes

commit 6c9d4c1b782c65f496828b289296304cdd75e01a
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:36:28 2015 -0700

    Deleted unused unit test

commit 9b1f0a8096c156927adf6cc8dad1df253b79707b
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:36:21 2015 -0700

    Switching back to require from require_once

commit 15db5e126d219e23180481d4559a7fd5e5d7e0d2
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:32:26 2015 -0700

    Commenting out the unit test for user because it's throwing hasher errors. Need to come back to this.

    This test is used when you call straight phpunit.

commit bc224f48e326babb4cd12296217e7665286102e9
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:29:31 2015 -0700

    Fuckit. phpunit it is.

commit e42801e436e3108e4db6ce38bec91be1ad8643f5
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:26:24 2015 -0700

    This will probably just trigger that damned curl error again :(

commit 8ad56fe92d6d86d78d8690a7a43ca17ea1ea6134
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 14:18:27 2015 -0700

    Removed phpbrowser

commit b72fc14cf4675523e7db9827602a9e6fbb1f1cfb
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 13:40:10 2015 -0700

    I don't know why route filters aren't working in the laravel module

commit 3226c687ac6538fd838710b601ba20a97bb23cb4
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 13:31:35 2015 -0700

    Require once in start?

commit 1cea92c4414689be7b411826ed4ce4e2b1768e61
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 13:16:32 2015 -0700

    Trying require_once

commit c8b9a2853cbb8bd65685c51b93fabccb15069b1a
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 13:13:35 2015 -0700

    Poking and hoping

commit e906d4daba8eb12be8b615dfadcedc3ea19eb58f
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 13:10:50 2015 -0700

    I cannot imagine that this will help, but whatever

commit 279be63f5a0c90278f961fde7228edddd65db612
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:53:11 2015 -0700

    Removing the laravel module returns the curl host error

commit ce3a2fc074fd597ebd274ad42925bcaebcd25ea4
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:51:25 2015 -0700

    Pulling laravel just to see

commit bd27268539b377d03031485e4e2c133ab02b4a1f
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:50:02 2015 -0700

    Turn off email notifications

commit 73d6f5cc6a2a5721acf686ad6a434a06cddcea38
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:49:14 2015 -0700

    Reverting the revert

commit 51a2f8f40e1b0240af2778076b21beb518b8909d
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:47:07 2015 -0700

    Reverting

commit aa36aff57fe734b0accd71eefe9b2f6b50b1f169
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:45:16 2015 -0700

    sigh.

commit a7241c0cf6b050768379e9b36c53584c29e1268a
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:38:14 2015 -0700

    Trying gitter again

commit 22b3190e0a
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:31:16 2015 -0700

    Missing a fucking semicolon

commit 637e4f03f3
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:26:23 2015 -0700

    Trying to fix parsefloat error

commit 70e086fb3d
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:22:51 2015 -0700

    Removed gitter

commit 65e6b1ad43
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:12:38 2015 -0700

    Removed extra comments, added route filter back in

commit c18e8747df
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:07:58 2015 -0700

    Removing sudo from codecept

commit 2c9c2fb2d6
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:06:18 2015 -0700

    Comment out ping debugging

commit 6eb57e43dc
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:04:23 2015 -0700

    Don't require sudo

commit 0c13c9e7bc
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 11:58:16 2015 -0700

    Use the Laravel 4 options instead of bootstrap

commit 8a3c672a82
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 11:51:30 2015 -0700

    Remove -vvv and -d for codeception

commit bd1e3cbc2a
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 11:50:12 2015 -0700

    Add gitter integration

commit 4eae1eb447
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 11:46:34 2015 -0700

    Try setting the hostname again and see if that fails

commit 01a6fbe19d
Merge: 8cdd44e f357e71
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 23:08:40 2015 -0700

    Merge branch 'travic-ci-misery' of github.com:snipe/snipe-it into travic-ci-misery

commit 8cdd44e650
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 23:08:34 2015 -0700

    Output dir

commit f357e71e20
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:54:32 2015 -0700

    blech

commit db2552ac2f
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:32:59 2015 -0700

    blech

commit 9a3d2c5130
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:29:52 2015 -0700

    wat

commit dd7864ac54
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:24:08 2015 -0700

    blech

commit 754aa2d0d8
Merge: 0ec8c87 d6d685c
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 22:19:14 2015 -0700

    Merge branch 'travic-ci-misery' of github.com:snipe/snipe-it into travic-ci-misery

commit 0ec8c87e8a
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 22:18:36 2015 -0700

    Slightly improved scenario description

commit d6d685c15e
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:15:32 2015 -0700

    blech

commit 58ac3b3fa4
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:10:00 2015 -0700

    blech

commit 89844a4017
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:05:13 2015 -0700

    blech

commit 4ccf1a513f
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 22:02:07 2015 -0700

    blech

commit 6ca0f6bdc4
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 21:59:45 2015 -0700

    blech

commit 1caa7fe28d
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 21:56:45 2015 -0700

    yuck

commit 24f7f3a892
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 21:52:53 2015 -0700

    try something else

commit f0c83ee253
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 21:47:51 2015 -0700

    trying to get phpinfo

commit 32336e7370
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 21:10:05 2015 -0700

    Verbose on coceception

commit ba29a13249
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 21:07:52 2015 -0700

    Remove codecoverage stuff just in case it's messing things up

commit 519ed11fc3
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 21:03:17 2015 -0700

    More poking and hoping

commit 9949d68341
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 20:55:24 2015 -0700

    Try forcing test env in codeception.yml

commit 4726639f85
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 20:49:23 2015 -0700

    Try switching back to the old instances

commit ce6e417a02
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 20:45:59 2015 -0700

    ...

commit c3767e25e4
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 20:42:32 2015 -0700

    Changed hostname for travis

commit d059511840
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 11 20:40:05 2015 -0700

    Try to echo out the hostname so I can have some idea of WTF is happening
 2015-08-12 14:45:43 -07:00
snipe 8840e57ae7 Trying 'testing-worker-linux*' as hostname since nothing else is working 2015-08-11 20:23:00 -07:00
snipe aa304375a6 Set default key 2015-08-11 19:54:03 -07:00
snipe b22789aa59 Unbreaking the dashboard :( 2015-08-11 19:44:02 -07:00
snipe 4247904f19 Resolving hostname problems 2015-08-11 18:52:42 -07:00
snipe 75852bdb8b Derp 2015-08-11 18:40:16 -07:00
snipe d5a709a836 Improved testing stuff 2015-08-11 18:27:28 -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 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 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 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
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
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
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
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 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
snipe b20fecc2de Make thread_id default null 2015-08-03 12:35:54 -07:00
Vincent Sposato 4082957c85 Added phpdocs to the model 2015-08-01 14:41:09 -04:00
Vincent Sposato 24edf81b27 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport 2015-08-01 12:29:29 -04:00
Vincent Sposato 03818adc14 Added the new report to the sidebar of reports 2015-08-01 12:23:41 -04:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive 
Need to finish writing the code to track threads
 2015-08-01 12:20:49 -04:00
Vincent Sposato 82a80b9ac8 Added ThreadAssetLogs to the available artisan commands 2015-08-01 12:20:48 -04:00
Vincent Sposato 7c7edcd191 Created a threading command that will allow all of the asset logs to be threaded into groups 2015-08-01 12:20:48 -04:00
Vincent Sposato 794dc5998a Working on the Actionlog and ReportsController - still having issues getting data back the way I want 2015-08-01 12:20:48 -04:00
Vincent Sposato a2aa05fcf9 Fixed the migration for adding thread_id to correct the table name and make thread_id nullable 2015-08-01 12:20:47 -04:00
Vincent Sposato 8f68bdb318 Working through getting the dataset correctly from the asset logs so that we can generate a report 2015-08-01 12:17:13 -04:00
Vincent Sposato 239f438a98 Added a scope to the Category model to pull back only categories that required acceptance 2015-08-01 12:14:21 -04:00
Vincent Sposato 41127bf5dd Added scope to the Asset model to pull all assets that belonged to a list of models 2015-08-01 12:14:21 -04:00
Vincent Sposato 64bff852bd Added a scope to the Model model to allow for selecting only models that belong to a list of categories 2015-08-01 12:14:20 -04:00