 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 |
|
|
madd15
|
032d79593a
|
quick fix $inout/$action issue
|
2015-07-30 13:47:43 +09:30 |
|
|
madd15
|
f152841e81
|
quick fix $inout/$action issue
|
2015-07-30 13:46:59 +09:30 |
|
|
madd15
|
c513007b36
|
Add sort to table, missing most columns still
|
2015-07-30 13:44:32 +09:30 |
|
|
snipe
|
948c443829
|
Fix for edit/clone
|
2015-07-29 20:50:23 -07:00 |
|
|
Michael Daniels
|
20f94ce418
|
Closing brackets are helpful
|
2015-07-29 14:27:03 -04:00 |
|
|
Michael Daniels
|
cced7a93a5
|
Update AssetsController.php
|
2015-07-29 14:25:49 -04:00 |
|
|
Michael Daniels
|
6430f7a4a7
|
Update AssetsController.php
|
2015-07-29 14:24:30 -04:00 |
|
|
snipe
|
43af451709
|
Merge pull request #971 from madd15/patch-3
Small EOL fix if no value returned
|
2015-07-28 20:59:42 -07:00 |
|
|
madd15
|
35f97cceb7
|
Fix missing lists causing modal errors
|
2015-07-29 10:34:21 +09:30 |
|
|
madd15
|
2507c1aa70
|
Correct Asset Count
|
2015-07-29 09:26:44 +09:30 |
|
|
madd15
|
679b9f6def
|
Small EOL fix
|
2015-07-28 17:03:39 +09:30 |
|
|
snipe
|
87cd77b4df
|
Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment
# Conflicts:
# app/controllers/admin/AssetsController.php
|
2015-07-27 23:41:22 -07:00 |
|
|
Brady Wetherington
|
de8180ec70
|
Abililty to inline-add things when you are creating a new asset
|
2015-07-27 23:27:45 -07:00 |
|
|
snipe
|
4a51ff9ba5
|
Duh
|
2015-07-27 22:46:13 -07:00 |
|
|
snipe
|
22be076504
|
More experiments
|
2015-07-27 22:39:47 -07:00 |
|
|
madd15
|
ae91f829e1
|
Change to bootstrap table compatable method
|
2015-07-28 13:50:10 +09:30 |
|
|
snipe
|
0f0dab556d
|
Fixes #807 - bad link for subfolders
|
2015-07-24 22:48:29 -07:00 |
|
|
madd15
|
00bcae7feb
|
Add email to postCheckin
|
2015-07-24 10:24:14 +09:30 |
|
|
snipe
|
0de1d45492
|
Merge pull request #944 from madd15/Feature/Additional-Email-Info
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
|
2015-07-23 16:16:19 -07:00 |
|
|
snipe
|
fdee3ee93e
|
Merge pull request #933 from madd15/patch-4
#916 - Change Userlist identifier from email to username
|
2015-07-23 16:16:02 -07:00 |
|