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
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
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
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
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
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
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
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
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
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
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
239f438a98
Added a scope to the Category model to pull back only categories that required acceptance
2015-08-01 12:14:21 -04:00
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
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
d0a8dda14f
Added ThreadAssetLogs to the available artisan commands
2015-07-31 20:25:36 -04:00
cc5bec07ea
Created a threading command that will allow all of the asset logs to be threaded into groups
2015-07-31 20:24:34 -04:00
e560cc2ee2
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-07-31 19:29:44 -04:00
37d4a0105e
Fix for strict mode
2015-07-31 11:15:17 -07:00
c74c89a171
Fixed the migration for adding thread_id to correct the table name and make thread_id nullable
2015-07-30 21:02:57 -04:00
3bb296db78
Fixed language string for notes (when the hell did THAT break?)
2015-07-30 15:10:59 -07:00
305c22f72d
Added request to dashboard
2015-07-30 14:59:24 -07:00
9f81792e70
Request button strings
2015-07-30 14:52:55 -07:00
57e21193c9
Added language strings for not requestable
2015-07-30 14:50:06 -07:00
ce9d728c2d
Updated controller to make sure the asset exists and is requestable
2015-07-30 14:48:32 -07:00
6bc2128c3e
Added requestable button
2015-07-30 14:48:19 -07:00
snipe