 madd15
|
fdb92a2012
|
Change to use eager loaded userloc not assetloc
|
2015-03-18 10:50:52 +10:30 |
|
|
Madd15
|
c14761b9a1
|
Re-fix button not showing
|
2015-03-18 10:27:04 +10:30 |
|
|
madd15
|
9edcc39de2
|
Fix restore button now showing
|
2015-03-18 10:15:57 +10:30 |
|
|
snipe
|
94afe20c20
|
Removed throttle eager load, added userlocation
|
2015-03-17 16:36:20 -07:00 |
|
|
snipe
|
c00086c740
|
Fix eager loading for user throttle
|
2015-03-17 15:36:11 -07:00 |
|
|
snipe
|
c2c0196a3d
|
Eager loading managers, licenses
|
2015-03-17 14:58:15 -07:00 |
|
|
snipe
|
46c1f2a28b
|
Server side datatables for user view - needs fix for deleted users
|
2015-03-16 17:33:41 -07:00 |
|
|
snipe
|
77fd73bc1b
|
Merge remote-tracking branch 'origin/features/chumper-datatables' into develop
|
2015-03-16 14:49:51 -07:00 |
|
|
snipe
|
6f38f76e4a
|
Haha - TOTALLY cheated. But it works. Fixed ordering for linked names
|
2015-03-14 02:45:49 -07:00 |
|
|
snipe
|
ab0a8b3b61
|
Added bulk edit back in (it looks like ass right now)
|
2015-03-14 02:09:21 -07:00 |
|
|
snipe
|
4243710378
|
Added location to new assets view
|
2015-03-14 01:30:12 -07:00 |
|
|
madd15
|
1f0625cfa1
|
Better way for locations that works
|
2015-03-14 15:38:19 +10:30 |
|
|
madd15
|
5e4175723c
|
Make Location work
|
2015-03-14 15:22:42 +10:30 |
|
|
madd15
|
5db853dbdd
|
Move Model And Add Location
|
2015-03-14 15:19:57 +10:30 |
|
|
snipe
|
2244c60499
|
Added category to output
|
2015-03-13 20:32:47 -07:00 |
|
|
snipe
|
96e40721b2
|
Added type to query
|
2015-03-13 16:50:12 -07:00 |
|
|
snipe
|
5e5b32e060
|
Enabled state saving (not working yet, not sure why)
|
2015-03-12 22:18:43 -07:00 |
|
|
snipe
|
662c3f04dd
|
Added proper sort
|
2015-03-12 22:09:18 -07:00 |
|
|
snipe
|
2cdfeacc1b
|
Get ssets page to render with ajax datatables
|
2015-03-12 21:42:24 -07:00 |
|
|
snipe
|
b2af86230a
|
Added fields
|
2015-03-12 19:52:03 -07:00 |
|
|
madd15
|
f33844d4af
|
move status around to match view
|
2015-03-13 13:01:30 +10:30 |
|
|
snipe
|
cb171bcac5
|
Fixes #645 - adds zip and rar to filetype
|
2015-03-12 13:25:28 -07:00 |
|
|
snipe
|
b92e46180c
|
Merge branch 'develop' of github.com:snipe/snipe-it into features/chumper-datatables
|
2015-03-12 13:24:22 -07:00 |
|
|
snipe
|
62d5ed48f0
|
Fixes #645 - added zip/rar to filetypes
|
2015-03-12 13:24:07 -07:00 |
|
|
madd15
|
33dd59fb81
|
Fix #637 - Remove Deleted Models from drop down
|
2015-03-12 09:09:35 +10:30 |
|
|
snipe
|
6a89728380
|
First shot at datatables for assets
|
2015-03-10 15:06:24 -07:00 |
|
|
snipe
|
7d339624b8
|
Handle non-date strings
|
2015-03-04 20:27:21 -08:00 |
|
|
snipe
|
f27fb90457
|
Allow override of checkin/checkout date
TODO: fix error if someone enters non-date text
|
2015-03-04 18:59:45 -08:00 |
|
|
snipe
|
4076b29b63
|
Support for DATAMATRIX and PDF417 barcodes
|
2015-03-04 17:43:53 -08:00 |
|
|
snipe
|
7d5ee9750f
|
Added #596 fix for accessories
|
2015-03-04 15:21:31 -08:00 |
|
|
snipe
|
1c333e4a24
|
Fixes #596 - better routes for checking in multiple items from user
|
2015-03-04 15:15:38 -08:00 |
|
|
snipe
|
61b04d6e40
|
Fixes #579 - user cannot accept more than once
|
2015-03-01 16:35:32 -08:00 |
|
|
snipe
|
c484afb12b
|
Fixed typo for accessories accept
|
2015-02-26 18:58:08 -08:00 |
|
|
snipe
|
30db9a2943
|
Unified asset/accessory acceptance
|
2015-02-26 18:42:39 -08:00 |
|
|
snipe
|
1273c4ca87
|
EULA/req improvements
|
2015-02-26 18:20:52 -08:00 |
|
|
snipe
|
04735f1aff
|
Fixed assetlog display
|
2015-02-26 17:04:21 -08:00 |
|
|
snipe
|
d33dcbbcb1
|
Fixed bad method call in accessories on delete
|
2015-02-26 16:17:25 -08:00 |
|
|
snipe
|
74a7b304c2
|
Limit categories to accessory categories
|
2015-02-26 16:09:40 -08:00 |
|
|
snipe
|
afe2eb736c
|
Added category type
|
2015-02-26 15:48:44 -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 |
|
|
madd15
|
8e9f7965c7
|
Reduces Queries on Model Index View
|
2015-02-27 08:44:41 +10:30 |
|
|
snipe
|
a20e1f6943
|
Fixed attach to relation
|
2015-02-26 14:08:31 -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 |
|
|
madd15
|
15a7e205be
|
Force Model Restore before Asset Restore
|
2015-02-27 07:33:48 +10:30 |
|
|
snipe
|
1ac401f0c0
|
Fixed EULA mail
|
2015-02-26 11:54:56 -08:00 |
|
|
snipe
|
acedab5587
|
Checkout for accessories
|
2015-02-26 11:42:02 -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 |
|
|
madd15
|
eb5d4983de
|
more model functionality and icons
|
2015-02-27 00:53:16 +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 |
|