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
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
78835a8b1f
Add requestable as bulk-edit option
2015-07-30 14:32:25 -07:00
5297d699b3
Fix logo url
2015-07-30 18:32:43 +09:30
39da217a9e
Fixed table nane for asset_logs in migration
2015-07-29 22:47:24 -07:00
948c443829
Fix for edit/clone
2015-07-29 20:50:23 -07:00
1a3bf10753
Merge pull request #989 from vsposato/feature/865_ThreadIdAddition
...
Feature/865 thread id addition
2015-07-29 16:22:19 -07:00
7876ae462c
Added the migration for the thread_id on the asset_logs table
...
Added the relationships for the self-referential links on thread_id
2015-07-29 19:16:57 -04:00
8fbc77a844
Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport
2015-07-29 19:13:12 -04:00
87c493bf12
Added the migration for the thread_id on the asset_logs table
...
Added the relationships for the self-referential links on thread_id
2015-07-29 19:10:59 -04:00
8c30c5d879
Fixed issue in routes file
2015-07-29 19:09:32 -04:00
d8df6a0982
Added a scope to the Category model to pull back only categories that required acceptance
2015-07-29 19:05:56 -04:00
d6382fb4a3
Added scope to the Asset model to pull all assets that belonged to a list of models
2015-07-29 19:05:56 -04:00
9772039c4f
Added a scope to the Model model to allow for selecting only models that belong to a list of categories
2015-07-29 19:05:56 -04:00
ad6cec080c
Merge branch '2.0' of https://github.com/snipe/snipe-it into 2.0
2015-07-29 19:04:51 -04:00
028cde8738
Merge pull request #987 from mdaniels5757/2.0
...
Added Code128 Label Compatibility (to 2.0)
2015-07-29 12:06:14 -07:00
20f94ce418
Closing brackets are helpful
2015-07-29 14:27:03 -04:00
cced7a93a5
Update AssetsController.php
2015-07-29 14:25:49 -04:00
6430f7a4a7
Update AssetsController.php
2015-07-29 14:24:30 -04:00
1fff9f6048
Update macros.php
2015-07-29 14:23:17 -04:00
snipe