4538bca29f
Allow 0 qty consumable
2015-08-11 14:34:54 -07:00
eeda4366a3
Removed cruft from debugging
2015-08-11 14:32:14 -07:00
fc31a828bc
Exclude Snipe-IT from search engines
2015-08-11 14:19:51 -07:00
88e10516a9
Updated footer links
2015-08-11 14:19:13 -07:00
481b905331
Fixes #1045 - allow 0 value for accessories
2015-08-11 14:01:13 -07:00
959df613ae
Updated language strings
2015-08-11 13:39:09 -07:00
c476eda868
Removed link on location until location view is fixed
2015-08-11 13:20:58 -07:00
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
242e6ff030
Updated composer lock
2015-08-11 12:40:13 -07:00
f026f886ae
Removed unique constraint on model no
2015-08-11 12:37:57 -07:00
936d7dab1b
Fixes #1043
2015-08-11 12:36:03 -07:00
38d774eb6a
Merge pull request #1033 from vsposato/feature/865_fixIssuesFromSnipe
...
Feature/865 fix issues from snipe
2015-08-11 11:57:56 -07:00
d363a0deec
Merge branch 'feature/865_fixIssuesFromSnipe' of github.com:vsposato/snipe-it into feature/865_fixIssuesFromSnipe
2015-08-07 18:52:58 -04:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
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
7f91f6e349
Completed the changes from uberbrady to make the report work correctly
2015-08-07 18:00:23 -04:00
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
9540db424a
Fixes #948 - validate on model name+modelno+manufacturer combination
2015-08-06 05:58:50 -07:00
84d81184fa
Fixes #1009 - Add MAC address to search
2015-08-06 05:13:27 -07:00
3c0cc94652
Fixed route
...
TODO:
- add modal button
2015-08-06 04:53:23 -07:00
5dcc795aa2
Fixes #1024 - delete option added to user dropdown
2015-08-06 04:33:34 -07:00
106ed6a9a0
Added location to user listing
2015-08-06 03:59:23 -07:00
daff0dbccb
First rough pass at asset acceptance report
2015-08-06 01:55:17 -07:00
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
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
336858e4ed
Fix #1022 - Missing Lang on viewing deleted user
2015-08-06 09:33:53 +09:30
e3c1a9f80c
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-08-05 13:57:29 -07:00
66991ea663
Fixes #1018 - allow name re-use if deleted
2015-08-05 13:57:04 -07:00
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
7e76d8858e
Modifying validator to support & and ß
2015-08-05 18:13:47 +02:00
dc265ba2a8
Fixed back button on user create
2015-08-04 20:48:54 -07:00
eb00acddfd
Trying to fix the broken migration
2015-08-04 14:55:10 -07:00
449ad4f86b
Fixes #1014 - error if no assets are unaccepted
2015-08-04 13:22:13 -07:00
77bff707fa
English is hard :(
2015-08-04 12:54:45 -07:00
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
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
3c730c691b
Fixes #1010 - better errors on large file uploads
2015-08-04 12:45:17 -07:00
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
b20fecc2de
Make thread_id default null
2015-08-03 12:35:54 -07:00
03e294b6d0
Merge pull request #1006 from mtucker6784/patch-1
...
Create install.sh
2015-08-03 12:23:13 -07:00
85ba7c3a15
Create install.sh
...
This script will
1. Ask for Snipe it version 1.2.8 or 2.0
2. Detect distro version (between CentOS and Debian/Ubuntu)
3. Install all software and dependencies, create vhosts.
This isn't the smartest script, and it needs a little love, and I'm on the fence about SMTP settings. Would love feedback about the SMTP part, and the whole script in general. I'll be glad to fine tune it some more, I just need a point in the right direction. Hopefully if this is merged in 2.0, it won't cause a huge influx of tickets. This is the first time I've contributed to a project like this, so I don't know the social norms; if having my name at the top isn't appropriate (or fit in with the scope of Snipe It), we can remove it. No big deal, just wanted to have my name somewhere, but it's not a make-it-or-break-it thing for me :o)
2015-08-02 20:59:04 -07:00
889fa6b74d
Merge pull request #1001 from vsposato/feature/865_AssetsNotAcceptedReport
...
Feature/865 assets not accepted report
2015-08-02 11:06:42 -07:00
e63a07800f
Merge pull request #994 from madd15/patch-4
...
Fix logo url
2015-08-02 11:05:07 -07:00
4082957c85
Added phpdocs to the model
2015-08-01 14:41:09 -04:00
24edf81b27
Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport
2015-08-01 12:29:29 -04:00
03818adc14
Added the new report to the sidebar of reports
2015-08-01 12:23:41 -04:00
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
82a80b9ac8
Added ThreadAssetLogs to the available artisan commands
2015-08-01 12:20:48 -04:00
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
snipe