 snipe
|
df986c7cfe
|
Minor indenting edits
|
2015-10-22 03:10:25 -07:00 |
|
|
snipe
|
a3f5dc331d
|
Fixes #1007 and #1053
|
2015-10-22 02:11:39 -07:00 |
|
|
snipe
|
af6a3dcccd
|
Updated sample data
|
2015-10-22 01:14:21 -07:00 |
|
|
snipe
|
7901b49503
|
Updated sample file
|
2015-10-22 00:18:44 -07:00 |
|
|
snipe
|
8ea40d4e6d
|
Fixes default value for strict mode
|
2015-10-22 00:17:45 -07:00 |
|
|
snipe
|
1bdd5886e6
|
Select * because reasons
|
2015-10-21 23:58:07 -07:00 |
|
|
snipe
|
9c71d34761
|
Merge pull request #1276 from madd15/patch-5
return getEdit to correct method
|
2015-10-21 23:40:53 -07:00 |
|
|
madd15
|
79a69d7633
|
return getEdit to correct method
|
2015-10-22 17:10:02 +10:30 |
|
|
snipe
|
27799dc78a
|
Nicer activity report display
(This needs the API/Bootstrap tables treatment soon)
|
2015-10-21 23:39:45 -07:00 |
|
|
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
|
b1d5812ae2
|
Fixed categorys page
|
2015-10-21 23:19:27 -07:00 |
|
|
snipe
|
2e044bf0a3
|
Fixed category bug
|
2015-10-21 23:18:40 -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
|
059993b064
|
Make groups table responsive
|
2015-10-21 22:41:50 -07:00 |
|
|
snipe
|
ed612287ee
|
Merge pull request #1273 from ddreier/ldap-auth-harden
Change LDAP auth to better handle no user found
|
2015-10-21 22:38:02 -07:00 |
|
|
snipe
|
ba7b56f5d7
|
Merge pull request #1274 from patgmac/patch-2
Typo in package name
|
2015-10-21 22:37:07 -07:00 |
|
|
snipe
|
5b5d262d3c
|
Merge pull request #1275 from ddreier/custom-report-purchase-cost
Fixes Purchase Cost not showing up on custom reports
|
2015-10-21 22:36:38 -07:00 |
|
|
snipe
|
9d6608c8f1
|
Asset maintenances for #1266
|
2015-10-21 22:19:02 -07:00 |
|
|
snipe
|
28fcd2b8ab
|
Fixed indenting
|
2015-10-21 21:31:38 -07:00 |
|
|
snipe
|
7087e86ca5
|
Nicer (tho non-ajaxy) table
|
2015-10-21 21:23:58 -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
|
95b033bdb8
|
Load table export helpers locally
|
2015-10-21 19:33:22 -07:00 |
|
|
snipe
|
ea4dfdd50c
|
Status labels for #1266
|
2015-10-21 19:24:01 -07:00 |
|
|
snipe
|
0b87357f3b
|
Search text method for #1266
|
2015-10-21 19:10:00 -07:00 |
|
|
snipe
|
9c914e7ef5
|
New API routes for #1266
|
2015-10-21 19:09:47 -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 |
|
|
Patrick Gallagher
|
7087a191c6
|
Typo in package name
php-gd should be php5-gd.
|
2015-10-21 21:18:06 -04:00 |
|
|
snipe
|
d1192095d0
|
Fix for showing deleted items
|
2015-10-21 18:05:27 -07:00 |
|
|
snipe
|
348a566f89
|
More responsive fixes
|
2015-10-21 18:05:03 -07:00 |
|
|
Daniel Dreier
|
9724d118e6
|
Changing the comparison to not care about type allows for auth to fail when no user is found in the LDAP directory.
|
2015-10-21 19:17:55 -05:00 |
|
|
snipe
|
b18be5aee8
|
Fixed relationshop again?
|
2015-10-21 16:14:15 -07:00 |
|
|
snipe
|
7dc0039c3b
|
Fixed parent relationship
|
2015-10-21 16:01:54 -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
|
a896bb0eff
|
Updated categories with cookie and export stuff for #1266
|
2015-10-21 15:42:59 -07:00 |
|
|
snipe
|
36a3d655ad
|
Added cookie name to make column cookies work
|
2015-10-21 15:15:04 -07:00 |
|
|
snipe
|
e12e2f2c7c
|
Updated BS tables library
|
2015-10-21 14:49:58 -07:00 |
|