f463cd6c8d
Fixes for #759 - location heirarchy
2015-05-04 02:50:42 -07:00
5e7a4e8193
Fixes #599 - show groups in user list
2015-05-04 01:44:49 -07:00
c8870ddcab
Fixes #736 - more fields in bulk edit
2015-05-04 01:30:20 -07:00
bbdbd5397c
Check for valid asset before attempting to get name
2015-05-04 00:46:26 -07:00
527650d03b
Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5
...
# Conflicts:
# app/views/backend/models/view.blade.php
2015-05-02 12:28:34 -07:00
126121065c
Merge branch 'patch-3' of https://github.com/DanielNemanic/snipe-it into develop
...
# Conflicts:
# public/assets/css/compiled/user-profile.css
2015-05-02 12:27:40 -07:00
48ccf844fa
Merge pull request #748 from DanielNemanic/patch-4
...
Update user-profile.css
2015-05-02 12:24:11 -07:00
7556f989df
Accessories Slack integration
2015-04-30 20:53:44 -07:00
8207597a58
Slack integration for Licenses
2015-04-30 20:37:23 -07:00
1137768f84
Escape notes
2015-04-30 19:23:41 -07:00
5f6925858b
Richer slack integrations
2015-04-30 18:54:34 -07:00
77d1d93ebc
Fixes #729 - CSS wordwrap for long licenses
2015-04-30 18:17:44 -07:00
c95af84452
Fixes #750 because @uberbrady can't code
2015-04-30 17:14:31 -07:00
62b5ec5b02
Slack field validation and placeholder text
2015-04-30 16:58:33 -07:00
9f9a9a51b3
Fixes #774 - layout issue on profiles
2015-04-29 23:21:04 -07:00
a2dd2509fd
Updated language strings for slack
2015-04-29 18:01:43 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
767e2c69f3
Fixes #751 - ignore whether depreciation was selected or not to display purchase cost
2015-04-29 16:31:38 -07:00
3b491d4a6b
Fixes #757 - use showAssetName method
2015-04-29 16:22:25 -07:00
179ef7f060
Removed unsupport languages
2015-04-29 16:17:13 -07:00
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
6f9daa28eb
Update view.blade.php
...
Added {{ Config::get('app.url') }} in Line 116 to avoid no Image in SubFolder. ( http://domain.com/snipe-it/ ... )
2015-04-15 08:53:50 +02:00
d408bb9086
Update user-profile.css
...
Added with:120px to avoid very big Avatars from Users.
2015-04-14 15:01:38 +02:00
5f3bc8e74b
Update user-profile.css
...
Added width:120px to avoid very big picture rom the Avatar.
2015-04-14 15:00:31 +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
snipe