snipe
|
0a843fa856
|
OMFG really?
|
2015-11-04 00:18:22 -08:00 |
|
snipe
|
5a687f280f
|
One more currency tweak
|
2015-11-04 00:15:35 -08:00 |
|
snipe
|
4b2e7b9b06
|
Fixes #1013 - show location name on asset view page
|
2015-11-04 00:13:48 -08:00 |
|
snipe
|
6e117efebd
|
Fixed dumb indenting
|
2015-11-03 23:58:12 -08:00 |
|
snipe
|
2a43491792
|
Fixes #1291 on the asset view as well
|
2015-11-03 22:19:58 -08:00 |
|
snipe
|
0b0b55619b
|
Fixes #1291 - Use current currency, or sane fallback
|
2015-11-02 20:06:06 -08: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
|
bd418d1422
|
Eager load some models
|
2015-10-21 23:17:22 -07:00 |
|
snipe
|
0c830fa564
|
Added hidden ID column
|
2015-10-21 19:08:30 -07:00 |
|
snipe
|
58911cd10e
|
Use moar_scripts to limit unnecessary loading
|
2015-10-20 18:51:21 -07:00 |
|
snipe
|
9264e7bdc4
|
Fixed missing limit
|
2015-10-20 18:08:53 -07:00 |
|
snipe
|
b492ac4950
|
Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
# Conflicts:
# .gitignore
# app/controllers/admin/AccessoriesController.php
# app/controllers/admin/AssetsController.php
# app/controllers/admin/LicensesController.php
# app/models/Accessory.php
# app/models/Asset.php
# app/routes.php
# app/views/backend/accessories/index.blade.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/hardware/index.blade.php
# app/views/backend/licenses/index.blade.php
|
2015-10-20 17:52:02 -07:00 |
|
snipe
|
e7f14f66dc
|
Fixes #1260 - removed domain from cli list
The web upload form is still in beta, and shouldn't be used in production. Still need to add email/username formatting options to the form.
|
2015-10-19 11:23:02 -07:00 |
|
snipe
|
76dc518846
|
Better output filename
|
2015-10-06 14:39:58 -07:00 |
|
snipe
|
d149fb1a0f
|
Change output file to text
|
2015-10-06 14:36:00 -07:00 |
|
snipe
|
9ba2779e5f
|
Simpler results output for now
|
2015-09-23 20:37:30 -07:00 |
|
snipe
|
ff6fe331f3
|
Add the newly uploaded row to the table
|
2015-09-23 19:18:28 -07:00 |
|
snipe
|
ba9f00365a
|
Error checking on filetype
|
2015-09-23 16:57:27 -07:00 |
|
snipe
|
4abe93ae2e
|
Call the artisan command to do import, show output
|
2015-09-23 02:36:16 -07:00 |
|
snipe
|
586c04354e
|
Starter asset import routes
|
2015-09-22 20:23:00 -07:00 |
|
snipe
|
fe765b3c9c
|
Fixed not found error message string
|
2015-09-17 13:59:43 -07:00 |
|
snipe
|
fcec12f3b2
|
Allow asset-level EOL to override model level if given
|
2015-09-14 15:48:42 -07:00 |
|
snipe
|
2c54c93859
|
Fixes #1170 - barcode alternative
|
2015-09-11 16:13:44 -07:00 |
|
snipe
|
8c2ee9e96c
|
Fixes #1167 - don't allow double checkin
|
2015-09-10 11:49:43 -07:00 |
|
snipe
|
7dd2b3d580
|
Fixes #1104
|
2015-08-21 16:00:03 -07:00 |
|
snipe
|
e63d62d2c8
|
Fixes #1083
|
2015-08-19 12:33:16 -07:00 |
|
snipe
|
45c4624d5f
|
Fixes #1081
|
2015-08-19 11:14:03 -07:00 |
|
snipe
|
70a7a11324
|
Switched to user list
|
2015-08-19 10:54:50 -07:00 |
|
snipe
|
e8f11919f7
|
Fixes #1077 - ordering of dropdown menus
|
2015-08-19 10:43:52 -07:00 |
|
snipe
|
4fcf70872f
|
Fixes #1054
|
2015-08-13 13:24:38 -07:00 |
|
snipe
|
c5e5930c1b
|
Make sure lock passwords isn't true before emailing
|
2015-08-13 00:54:57 -07:00 |
|
snipe
|
a832346bfb
|
Added statuslabel type helper
|
2015-08-12 22:33:31 -07:00 |
|
snipe
|
315f02905a
|
Pull all lists into helper functions for consistency
|
2015-08-12 20:58:18 -07:00 |
|
snipe
|
f7874ec106
|
Refactored assets controller and model for cleaner code
|
2015-08-12 18:19:53 -07:00 |
|
Brady Wetherington
|
7ae226635f
|
First rough pass at asset acceptance report
|
2015-08-07 18:50:55 -04:00 |
|
madd15
|
fd9cf29459
|
Additional changes for search and order functions
|
2015-08-07 09:44:23 +09:30 |
|
snipe
|
84d81184fa
|
Fixes #1009 - Add MAC address to search
|
2015-08-06 05:13:27 -07:00 |
|
snipe
|
3c730c691b
|
Fixes #1010 - better errors on large file uploads
|
2015-08-04 12:45:17 -07:00 |
|
snipe
|
305c22f72d
|
Added request to dashboard
|
2015-07-30 14:59:24 -07:00 |
|
snipe
|
78835a8b1f
|
Add requestable as bulk-edit option
|
2015-07-30 14:32:25 -07:00 |
|