9ea8316d74
Merge remote-tracking branch 'origin/develop' into 1.3.0
...
# Conflicts:
# app/config/version.php
2015-06-01 17:52:39 -07:00
a8a0a59982
Fixes #825 - title bar spacing issue
2015-06-01 17:51:20 -07:00
123caf42c2
Merge remote-tracking branch 'origin/develop' into 1.3.0
...
# Conflicts:
# app/views/backend/hardware/labels.blade.php
# app/views/backend/layouts/default.blade.php
2015-05-27 11:17:14 -07:00
9cf03e2e60
Better escaping on activity report page
2015-05-27 10:16:06 -07:00
7a4299c724
Reassignable should default to true on create form
2015-05-24 13:35:28 +01:00
b161a38e9b
Add licenses.reassignable migration
...
Implement licenses.reassignable
View edit for licenses.reassignable
Add licenses.reassignable to LicensesController
Disable Check In when !license->reassignable
Validate license check-in post
2015-05-22 14:11:36 +01:00
212f09dd31
Fixes #806
2015-05-19 19:39:05 -07:00
8334e7b863
Removed extra open sans call
2015-05-19 19:37:34 -07:00
a80d67c1ff
Escaping on labels
2015-05-19 19:37:22 -07:00
7c95f4231e
Fixes #799 - missing text in file delete confirmation
2015-05-14 20:52:19 -07:00
6e8ad5b085
Generating Asset Name to Label Print
...
Added the Asset Name to the Label printing page.
2015-05-13 10:51:06 +02:00
7415a5898f
Twiddling column widths
2015-05-08 11:39:51 -07:00
f1486bfee3
Nicer locations listing layout
2015-05-07 19:20:05 -07:00
8cdea8a384
Fix for location totals
2015-05-07 18:21:10 -07:00
4457c7aec0
Removed extra commented stuff
2015-05-07 18:20:58 -07:00
95279f885b
Fixes #759 - populate form with parent location info
2015-05-07 01:51:46 -07:00
20d8ad29e5
Updating Dashboard Link URL
...
Updating link to real application URL.
2015-05-07 09:38:16 +02:00
75644eb894
Dashboard points to app url
2015-05-07 00:30:20 -07:00
2d7a348ab7
Fixed multi-level array nesting for locations
2015-05-07 00:15:44 -07:00
2f52369d07
Fixed location string
2015-05-04 15:13:04 -07:00
68d8b10b22
Changed text to icons for more compacted view
2015-05-04 13:31:38 -07:00
3881e2e83e
Fixes #784 - add "create accessory" to topnav
2015-05-04 11:24:25 -07:00
51eeee09d7
Fixes bug in #736 for new fields
2015-05-04 11:14:38 -07:00
c487beeaca
Asset counter for #759 (needs more work)
2015-05-04 03:05:22 -07:00
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
77d1d93ebc
Fixes #729 - CSS wordwrap for long licenses
2015-04-30 18:17:44 -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
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
3b491d4a6b
Fixes #757 - use showAssetName method
2015-04-29 16:22:25 -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
c6419e1c07
Update link to Documentation in footer
2015-04-17 16:01:44 +09:30
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
4b32c28f7e
Merge pull request #741 from madd15/patch-5
...
Add dashboard to side navigation
2015-04-13 17:37:39 -07:00
2e0fa9126a
Add dashboard to side navigation
2015-04-14 10:02:37 +09:30
1a4f148318
Fix #737 -Only display comma & address2 if not Null
2015-04-10 09:14:59 +09:30
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
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
9be50152b3
per_page Select drop-down
2015-04-02 11:21:32 +10:30
0e26480674
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-01 15:32:03 -07:00
snipe