a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
bce06543b2
Merge remote-tracking branch 'origin/master' into develop
2015-04-29 15:28:38 -07:00
9841dbbbc4
Fixed HTML so settings are saved correctly
2015-04-29 15:28:11 -07:00
d61506fcf7
Fixes for #766 - add activity report
2015-04-29 14:50:12 -07:00
6a7fcd5c40
Fixes #769 - set sort order for Accessory Category
2015-04-29 13:54:54 -07:00
b4b273fc43
Fixed typo
2015-04-28 16:42:08 -07:00
495201ebf7
Merge branch 'develop'
...
# Conflicts:
# composer.lock
2015-04-28 14:48:19 -07:00
e6d0d83070
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-28 13:41:17 -07:00
564d5fcb31
Merge pull request #770 from southwolf/fix-concat-space
...
Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error
2015-04-28 13:20:48 -07:00
c0a58897c0
Re-re-trying --prefer-source --no-interaction
2015-04-28 13:19:13 -07:00
1c2e5ecc0f
Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error
2015-04-28 15:19:00 +08:00
6109368799
Merge pull request #761 from ivarne/patch-1
...
Delete .bash_history
2015-04-21 00:42:59 -07:00
f8ea40d3d1
Delete .bash_history
...
This file does not look like a natural part of the project.
2015-04-21 09:11:43 +02:00
2fb65c5682
Merge pull request #758 from madd15/patch-1
...
Update link to Documentation in footer
2015-04-16 23:33:47 -07:00
c6419e1c07
Update link to Documentation in footer
2015-04-17 16:01:44 +09:30
ba58e718b4
Resolved some deps from vendor changes
2015-04-16 22:18:35 -07:00
30c8fffa0a
Loading string
2015-04-15 09:51:48 -07:00
a560d4db31
Merge pull request #754 from DanielNemanic/patch-6
...
Update view.blade.php
2015-04-15 09:43:40 -07:00
fe72139410
Update view.blade.php
...
Added class="img-responsive" to Model Image on Line 116.
2015-04-15 09:05:02 +02:00
bd3409285f
Merge pull request #745 from DanielNemanic/patch-2
...
Update print.css
2015-04-14 02:04:48 -07:00
18a3ff67cb
Merge pull request #744 from DanielNemanic/patch-1
...
Update layout.css
2015-04-14 02:04:42 -07:00
61eda122e4
Update print.css
...
Added @media print for printing and .table-responsive {overflow: hidden;} to avoid table scrollbars.
2015-04-14 11:00:09 +02:00
6cb70e865e
Update layout.css
...
To avoid screen resolution errors on printing, added the @media attribute.
2015-04-14 10:56:58 +02:00
4b32c28f7e
Merge pull request #741 from madd15/patch-5
...
Add dashboard to side navigation
2015-04-13 17:37:39 -07:00
f0a9b2c71d
Merge pull request #738 from madd15/patch-4
...
Fix #737 -Only display comma & address2 if not empty
2015-04-13 17:37:31 -07:00
2e0fa9126a
Add dashboard to side navigation
2015-04-14 10:02:37 +09:30
63b1f3834e
New language strings
2015-04-13 11:26:02 -07:00
1a4f148318
Fix #737 -Only display comma & address2 if not Null
2015-04-10 09:14:59 +09:30
9de083afa7
Merge pull request #734 from snipe/depreciation_fix2
...
Fix to issue with depreciation not returning correct value
2015-04-08 16:41:23 -07:00
551b5c42d8
"Years" turn out to be 12 times longer than months, apparently
2015-04-08 16:36:06 -07:00
30966b14af
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-08 16:25:46 -07:00
9bbf933b05
Added missing search string
2015-04-08 16:25:34 -07:00
f8143b6c7c
Merge pull request #728 from madd15/feature/Group-View
...
Fix #723 - Add view to list users of group
2015-04-06 21:03:59 -07:00
efba1b9038
Fix update button to goto right group
2015-04-07 13:31:56 +09:30
80090a41ec
Add Group User View
2015-04-07 13:25:20 +09:30
0cff78d127
Updated language strings
2015-04-02 15:42:58 -07:00
e88a81141f
Added view link to asset tag, since some assets won't have names
2015-04-02 15:40:41 -07:00
c88ce0d14d
Fixes for #722 datatables
2015-04-02 14:55:36 -07:00
33e7ce6761
Fixes for #722 localization
2015-04-02 14:28:11 -07:00
766afdeeae
Merge pull request #720 from madd15/patch-4
...
Fix #716 - Default page length, settings per page change
2015-04-01 17:59:09 -07:00
1edd6d3542
Get default page length and new Length menu
2015-04-02 11:22:33 +10:30
9be50152b3
per_page Select drop-down
2015-04-02 11:21:32 +10:30
7ad6dda260
Merge remote-tracking branch 'origin/develop'
2015-04-01 17:41:21 -07:00
e4b45231ec
Fix for bad seed data if Jon Doe doesn't get created
2015-04-01 17:22:48 -07:00
6b853750e5
Fix for strict mode app install
2015-04-01 16:34:02 -07:00
dc1380edd1
Merge remote-tracking branch 'origin/develop'
2015-04-01 15:48:19 -07:00
b53847cb61
Updated language strings
2015-04-01 15:48:02 -07:00
06b465540d
Merge remote-tracking branch 'origin/develop'
2015-04-01 15:44:51 -07:00
0a734d8502
Missing semicolons
2015-04-01 15:44:13 -07:00
98eda57188
Merge pull request #719 from madd15/patch-3
...
Fix #715 - Missing $modelCheck api call
2015-04-01 15:41:47 -07:00
snipe