 snipe
|
0745ec1502
|
Fixed scope for users
|
2015-11-02 19:26:10 -08:00 |
|
|
snipe
|
9731727095
|
Sorting for #1266
|
2015-11-02 19:17:20 -08:00 |
|
|
snipe
|
67a113cbf4
|
Additional fields for location assets display
|
2015-11-02 17:41:58 -08:00 |
|
|
snipe
|
e07dcf2598
|
Added location detail view
|
2015-11-02 16:45:19 -08:00 |
|
|
snipe
|
5c820d49a6
|
Fixes #1305
|
2015-11-02 16:44:17 -08:00 |
|
|
snipe
|
76968f7d48
|
Fixes asset model table sorting
|
2015-10-28 03:23:55 -07:00 |
|
|
snipe
|
09bcb137c4
|
Ugly fix for preventing errors if there is an invalid model (therefore no category)
|
2015-10-23 21:22:42 -07:00 |
|
|
snipe
|
8ec6b7e03a
|
Basic location ordering for #1266
|
2015-10-23 21:19:22 -07:00 |
|
|
snipe
|
efddda8665
|
Fixed expected_checkin error on asset view
|
2015-10-23 18:28:06 -07:00 |
|
|
snipe
|
eb1335405b
|
Order by last_checkout and expected_checkin for #1266
|
2015-10-23 17:59:21 -07:00 |
|
|
snipe
|
2953b395f2
|
Added order number to allowed sort columns
|
2015-10-23 15:12:06 -07:00 |
|
|
snipe
|
60f403f555
|
Expected checkin is a date, not a datetime
|
2015-10-23 14:29:00 -07:00 |
|
|
snipe
|
cf49920564
|
Fixes #1235 - 24 hour format for log
|
2015-10-23 12:39:22 -07:00 |
|
|
snipe
|
a3f5dc331d
|
Fixes #1007 and #1053
|
2015-10-22 02:11:39 -07:00 |
|
|
snipe
|
1bdd5886e6
|
Select * because reasons
|
2015-10-21 23:58:07 -07:00 |
|
|
madd15
|
79a69d7633
|
return getEdit to correct method
|
2015-10-22 17:10:02 +10:30 |
|
|
snipe
|
4cb19d1aae
|
More eager loading, pass $statuslabel_types to view
|
2015-10-21 23:31:28 -07:00 |
|
|
snipe
|
c91113ac95
|
Eager load accessories
|
2015-10-21 23:25:33 -07:00 |
|
|
snipe
|
eb5649d0b3
|
Eager load assets
|
2015-10-21 23:25:23 -07:00 |
|
|
snipe
|
f06af97364
|
Account for no limit or offset passed
|
2015-10-21 23:23:22 -07:00 |
|
|
snipe
|
bd418d1422
|
Eager load some models
|
2015-10-21 23:17:22 -07:00 |
|
|
snipe
|
440bc1a4b4
|
Fixes bug in people display
|
2015-10-21 23:15:35 -07:00 |
|
|
snipe
|
dba7983189
|
Added new fields to index view
|
2015-10-21 23:07:23 -07:00 |
|
|
snipe
|
5ff75e7f42
|
Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop
# Conflicts:
# app/controllers/admin/CategoriesController.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/categories/index.blade.php
# app/views/backend/settings/edit.blade.php
|
2015-10-21 23:06:43 -07:00 |
|
|
snipe
|
69c95f1f73
|
Merge pull request #1225 from ddreier/1088-acc-prices
Accessory and Consumable Price info #1088
|
2015-10-21 22:44:14 -07:00 |
|
|
snipe
|
30bbc9ad46
|
Merge pull request #1238 from Miliamber/develop
Added fixed icon width in navbar and new branding options
|
2015-10-21 22:43:30 -07:00 |
|
|
snipe
|
9d6608c8f1
|
Asset maintenances for #1266
|
2015-10-21 22:19:02 -07:00 |
|
|
snipe
|
bf32e89e0c
|
Corrected delete modal string for #1266
|
2015-10-21 19:46:50 -07:00 |
|
|
snipe
|
7a306cd0f0
|
Depreciations bootstrap tables for #1266
|
2015-10-21 19:43:09 -07:00 |
|
|
snipe
|
ea4dfdd50c
|
Status labels for #1266
|
2015-10-21 19:24:01 -07:00 |
|
|
snipe
|
68e7941c21
|
Added hidden ID field for #1266
|
2015-10-21 19:09:35 -07:00 |
|
|
snipe
|
f761b2e953
|
Suppliers for #1266
|
2015-10-21 19:09:20 -07:00 |
|
|
snipe
|
e03f07bb44
|
Manufacturers for #1266
|
2015-10-21 19:09:02 -07:00 |
|
|
snipe
|
0c830fa564
|
Added hidden ID column
|
2015-10-21 19:08:30 -07:00 |
|
|
Daniel Dreier
|
8ad220701e
|
Fixes Purchase Cost not showing up on custom reports
|
2015-10-21 20:24:07 -05:00 |
|
|
snipe
|
348a566f89
|
More responsive fixes
|
2015-10-21 18:05:03 -07:00 |
|
|
snipe
|
218c76592c
|
Added currency to display table for #1266
|
2015-10-21 16:01:44 -07:00 |
|
|
snipe
|
b5b8865b36
|
Locations in bootstrap tables for #1266
|
2015-10-21 15:43:12 -07:00 |
|
|
snipe
|
cab5dba7c2
|
Only show manager name if a manager is listed
|
2015-10-21 14:49:39 -07:00 |
|
|
snipe
|
b25b3321f9
|
Fixes skip/offset for #1266
|
2015-10-21 14:49:24 -07:00 |
|
|
snipe
|
def6b4ff50
|
Categories for accessories in #1266
|
2015-10-21 13:48:52 -07:00 |
|
|
snipe
|
03e36736c2
|
Nicer responsive display
|
2015-10-20 22:11:06 -07:00 |
|
|
snipe
|
644cfee086
|
Merge branch 'develop-bootstrap-tables-integration' of github.com:snipe/snipe-it into develop-bootstrap-tables-integration
|
2015-10-20 21:51:23 -07:00 |
|
|
snipe
|
c346dbaff6
|
Location search, deleted users for #1266
|
2015-10-20 21:50:58 -07:00 |
|
|
madd15
|
46a02b25da
|
Update getDatatable and getDataView
|
2015-10-21 14:24:25 +10:30 |
|
|
snipe
|
3095af4a8e
|
Merge pull request #1268 from madd15/patch-3
Categories Index table view
|
2015-10-20 20:46:41 -07:00 |
|
|
snipe
|
84c12e5f01
|
Revert "Change Categories Datatables - #1266"
This reverts commit 4beb3b024d.
|
2015-10-20 20:45:52 -07:00 |
|
|
madd15
|
4beb3b024d
|
Change Categories Datatables - #1266
Convert categories index to new table.
EULA is still not working correctly
|
2015-10-21 13:49:30 +10:30 |
|
|
snipe
|
b39e617e96
|
Added inelegant nobr for actions column for #1266
|
2015-10-20 20:02:18 -07:00 |
|
|
snipe
|
93bd9120cc
|
Updated orderby for #1266
|
2015-10-20 19:57:31 -07:00 |
|