 snipe
|
d7b4e8a8de
|
Removed cruft from checkin form
|
2015-02-26 15:25:21 -08:00 |
|
|
snipe
|
c0c563b1c7
|
Fixes accessory relationshop for pivot
|
2015-02-26 15:25:08 -08:00 |
|
|
snipe
|
430b8233ed
|
Fixed user relationship
|
2015-02-26 15:24:51 -08:00 |
|
|
snipe
|
47f1488acc
|
Get the accessory pivot ID
|
2015-02-26 15:24:41 -08:00 |
|
|
snipe
|
21799cca6d
|
User acceptance for accessories
|
2015-02-26 15:24:23 -08:00 |
|
|
snipe
|
e7ae4bd1c4
|
Merge pull request #574 from madd15/patch-3
Remove unused trashedAssets()
|
2015-02-26 14:21:05 -08:00 |
|
|
snipe
|
7da6ba5f68
|
Merge pull request #575 from madd15/patch-4
Reduces Queries on Model Index View
|
2015-02-26 14:20:22 -08:00 |
|
|
madd15
|
8e9f7965c7
|
Reduces Queries on Model Index View
|
2015-02-27 08:44:41 +10:30 |
|
|
madd15
|
4ef2dd0c7e
|
Remove unused trashedAssets()
|
2015-02-27 08:42:53 +10:30 |
|
|
snipe
|
19ad8970d7
|
Fixed arrow icon
|
2015-02-26 14:08:42 -08:00 |
|
|
snipe
|
a20e1f6943
|
Fixed attach to relation
|
2015-02-26 14:08:31 -08:00 |
|
|
snipe
|
5010720a97
|
Fixed accessory relationship
|
2015-02-26 14:07:52 -08:00 |
|
|
snipe
|
efaf067b94
|
Fixed user relationship
|
2015-02-26 14:07:39 -08:00 |
|
|
snipe
|
6efd268004
|
Disable checkouts if there are none left
|
2015-02-26 13:28:08 -08:00 |
|
|
snipe
|
7f26f01a8f
|
Merge pull request #573 from madd15/models
Force Model Restore before Asset Restore
|
2015-02-26 13:06:15 -08:00 |
|
|
snipe
|
31df29cac8
|
Fixed funky layout from datatables
|
2015-02-26 13:05:10 -08:00 |
|
|
madd15
|
15a7e205be
|
Force Model Restore before Asset Restore
|
2015-02-27 07:33:48 +10:30 |
|
|
snipe
|
3e189d3502
|
Fixes #538 - sortable tables
|
2015-02-26 12:59:40 -08:00 |
|
|
snipe
|
6d16c97902
|
Fixed back arrow
|
2015-02-26 12:40:54 -08:00 |
|
|
snipe
|
1ac401f0c0
|
Fixed EULA mail
|
2015-02-26 11:54:56 -08:00 |
|
|
snipe
|
62cb1daefd
|
Language strings for checkin/checkout
|
2015-02-26 11:42:11 -08:00 |
|
|
snipe
|
acedab5587
|
Checkout for accessories
|
2015-02-26 11:42:02 -08:00 |
|
|
snipe
|
ad30aebcbc
|
Methods to extend the category EULA to the accessory
|
2015-02-26 11:41:47 -08:00 |
|
|
snipe
|
528c06cf7f
|
Reverting icon fix
|
2015-02-26 10:33:31 -08:00 |
|
|
snipe
|
97d97fc4df
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
|
2015-02-26 10:26:04 -08:00 |
|
|
snipe
|
e89cb883ec
|
Merge pull request #570 from madd15/models
Not Complete - Fix #565 - Models soft delete and restore, several icons and and Category lang
|
2015-02-26 10:20:15 -08:00 |
|
|
madd15
|
88ce0abe85
|
more icons
|
2015-02-27 01:32:24 +10:30 |
|
|
madd15
|
4570efc68b
|
Add restore to action button
|
2015-02-27 01:03:31 +10:30 |
|
|
madd15
|
ea28873fb0
|
remove edit, clone when deleted
|
2015-02-27 00:56:47 +10:30 |
|
|
madd15
|
eb5d4983de
|
more model functionality and icons
|
2015-02-27 00:53:16 +10:30 |
|
|
madd15
|
379f6bef6c
|
catergories lang and serveral icons
|
2015-02-26 23:48:17 +10:30 |
|
|
madd15
|
e090762b5a
|
Icon changes on hardware
|
2015-02-26 22:41:44 +10:30 |
|
|
madd15
|
9f3edd701b
|
Fixes #565 - Soft Delete Models and Allow Restore
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
|
2015-02-26 22:35:57 +10:30 |
|
|
snipe
|
54bad2e4f6
|
More accessory relationships
|
2015-02-26 03:19:45 -08:00 |
|
|
snipe
|
e41621def0
|
Fixed relation between accessory and category
|
2015-02-26 03:08:27 -08:00 |
|
|
snipe
|
95fd96f29a
|
Accessory checkout/checkin methods
|
2015-02-26 03:08:17 -08:00 |
|
|
snipe
|
663d5213eb
|
Accessory checkout/checkin routes
|
2015-02-26 03:08:01 -08:00 |
|
|
snipe
|
92d6ed0761
|
Migration for accessory checkout
|
2015-02-26 03:07:37 -08:00 |
|
|
snipe
|
59ea144b28
|
Minor UX tweaks
|
2015-02-26 03:07:19 -08:00 |
|
|
snipe
|
f9f3b5b4f9
|
Smaller buttons
|
2015-02-26 02:42:25 -08:00 |
|
|
snipe
|
3de1a8f96c
|
Pre-release version in footer
|
2015-02-26 01:07:34 -08:00 |
|
|
snipe
|
5d71628927
|
Accessories title
|
2015-02-26 00:22:15 -08:00 |
|
|
snipe
|
323a607130
|
Indenting formatting
|
2015-02-26 00:22:02 -08:00 |
|
|
snipe
|
8eaa70c39b
|
Fixes #567 - bug in depreciation report csv export
|
2015-02-26 00:21:48 -08:00 |
|
|
snipe
|
29863004e2
|
more small mobile fixes
|
2015-02-25 20:01:36 -08:00 |
|
|
snipe
|
c2bbc1281c
|
Mobile fixes
|
2015-02-25 19:30:37 -08:00 |
|
|
snipe
|
a6232cbfd8
|
Fix language string for create accessory
|
2015-02-25 19:19:23 -08:00 |
|
|
snipe
|
734dc49564
|
Fixed icon
|
2015-02-25 18:35:07 -08:00 |
|
|
snipe
|
a5a1c4223b
|
Fixed chevrons
|
2015-02-25 18:33:22 -08:00 |
|
|
snipe
|
ca1351b704
|
Switched to all FA
|
2015-02-25 18:14:51 -08:00 |
|