aed7036595
Merge pull request #907 from madd15/user-fileuploads
...
Feature #746 - Add File Uploads to Users
2015-07-13 09:22:39 -07:00
9fbb9746bc
Merge pull request #895 from madd15/patch-1
...
Add Checkout of first available license to license list view
2015-07-13 09:22:18 -07:00
0154f240f3
Fixes JavaScript for edited assets
2015-07-10 22:48:21 -07:00
1e730078c1
Add file uploads to Users
2015-07-10 09:23:34 +09:30
6524ac3678
Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors.
...
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
jb (jquery.dataTables.min.js, line 24)
ga (jquery.dataTables.min.js, line 45)
(anonymous function) (jquery.dataTables.min.js, line 92)
each (jquery-latest.js, line 383)
each (jquery-latest.js, line 136)
o (jquery.dataTables.min.js, line 82)
(anonymous function) (users, line 371)
fire (jquery-latest.js, line 3119)
fireWith (jquery-latest.js, line 3231)
ready (jquery-latest.js, line 3443)
completed (jquery-latest.js, line 3474)
2015-07-09 03:09:18 -07:00
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
fd59ca0802
Fixed spacing
2015-07-08 17:33:51 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
518680f23c
Add freecheckout for getting first available seat
2015-07-07 12:33:53 +09:30
f2e1ec0928
Fixed QR simple view route
2015-06-23 12:59:33 -07:00
61e3381b24
Backup routes
2015-06-19 17:37:49 -07:00
e4517a8782
Removed checkin for #782 , since that doesn't exist in consumables
2015-06-09 19:58:22 -07:00
19604480bb
Consumables section
...
TODO:
- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
95279f885b
Fixes #759 - populate form with parent location info
2015-05-07 01:51:46 -07:00
d61506fcf7
Fixes for #766 - add activity report
2015-04-29 14:50:12 -07:00
80090a41ec
Add Group User View
2015-04-07 13:25:20 +09:30
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
a9f15fbcae
Convert Categories View to use Datatables, and fix Model View missing comma
2015-03-25 12:03:49 +10:30
7d266fdc4e
Convert Models View to use Datatables
2015-03-25 12:03:48 +10:30
7f03c7538f
Convert Accessories View to use Datatable
2015-03-25 12:03:47 +10:30
7881e70afb
Update Model Check in Hardware Edit and move to API
2015-03-25 12:03:45 +10:30
3e98f05564
Convert Models and Categories Index to use Datatables
2015-03-25 12:02:32 +10:30
14aa12eb09
Add Licenses API
2015-03-19 16:53:43 +10:30
603fccb26c
Update Routes for API
2015-03-19 16:07:38 +10:30
c9628722cb
Add check/model route
2015-03-19 11:31:01 +10:30
46c1f2a28b
Server side datatables for user view - needs fix for deleted users
2015-03-16 17:33:41 -07:00
96e40721b2
Added type to query
2015-03-13 16:50:12 -07:00
6a89728380
First shot at datatables for assets
2015-03-10 15:06:24 -07:00
1c333e4a24
Fixes #596 - better routes for checking in multiple items from user
2015-03-04 15:15:38 -08:00
30db9a2943
Unified asset/accessory acceptance
2015-02-26 18:42:39 -08:00
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
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
663d5213eb
Accessory checkout/checkin routes
2015-02-26 03:08:01 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
87936a58fa
CSV user import
2015-02-18 02:48:16 -08:00
e02bea4275
Fixes #457 - added bulk options to hardware
2015-02-16 18:21:29 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
80e10c4c98
Fixes #387 - sortable asset view by manufacturer
2015-02-11 04:57:59 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
c89be34503
Fixes #329 and #454 - added category asset view
2015-02-11 03:51:01 -08:00
ab1c921443
Requestable assets views and controllers
2015-02-10 23:55:06 -08:00
3a9cb9ba7a
Display uploaded files
2015-02-06 21:31:16 -08:00
6d0828bfe5
Delete file interface and routes
2015-02-06 20:42:40 -08:00
533be7f942
fixed #435 . using namespace with route groups to increase the readability
2015-01-05 01:24:16 +05:30
8ec5934af5
Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link
2014-12-03 14:04:02 -06:00
6d2a073d04
Custom Asset Report
2014-11-12 16:05:59 +10:30
02605bdf69
Add Asset Report with Reduced Load Time
2014-11-12 12:03:33 +10:30
432e348e56
Add Report Controller and License Report
2014-11-12 12:02:55 +10:30
6b2d3efe3e
Fixes #237 - reporting-only group
2014-11-04 18:21:10 -05:00
snipe