8624931a88
Comment out initial test for now
2015-08-11 20:23:16 -07:00
8840e57ae7
Trying 'testing-worker-linux*' as hostname since nothing else is working
2015-08-11 20:23:00 -07:00
16cb4f6d05
Removed AlisonMPB hostname
2015-08-11 19:54:14 -07:00
aa304375a6
Set default key
2015-08-11 19:54:03 -07:00
b22789aa59
Unbreaking the dashboard :(
2015-08-11 19:44:02 -07:00
f93e140ce1
Updated changelog
2015-08-11 19:43:51 -07:00
de238f1551
Set testing hostname
2015-08-11 19:00:08 -07:00
4247904f19
Resolving hostname problems
2015-08-11 18:52:42 -07:00
75852bdb8b
Derp
2015-08-11 18:40:16 -07:00
5cc1e7d3fe
Trying to set hostname back so tests won't fail
2015-08-11 18:37:37 -07:00
a98f4883be
Merge branch 'develop' of github.com:snipe/snipe-it into JoeFaux-AccessoryReport
2015-08-11 18:27:35 -07:00
d5a709a836
Improved testing stuff
2015-08-11 18:27:28 -07:00
4243270e7d
Merge pull request #1049 from JoeFaux/AccessoryReport
...
Accessory report
2015-08-11 17:31:37 -07:00
b576fce1f7
Modified files for accessory report.
2015-08-11 16:35:18 -07:00
d7313543ef
Changes to support an accessory report.
2015-08-11 16:32:48 -07:00
2636474120
Improved Welcome test
2015-08-11 15:57:58 -07:00
0c3b55a8b5
Upgrade to newer travis infrasructure
2015-08-11 15:49:25 -07:00
d7dd35a2f2
Removed generated test files accidentally commited
2015-08-11 15:30:43 -07:00
0c8e3809f2
Starter acceptance tests
2015-08-11 15:29:44 -07:00
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
snipe