 snipe
|
c346dbaff6
|
Location search, deleted users for #1266
|
2015-10-20 21:50:58 -07:00 |
|
|
snipe
|
3095af4a8e
|
Merge pull request #1268 from madd15/patch-3
Categories Index table view
|
2015-10-20 20:46:41 -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 |
|
|
snipe
|
f4d882606a
|
New getDataTable method for Bootstrap tables
|
2015-10-20 19:51:28 -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
|
66fd0c2315
|
Fixes #1232 - adds category to accessory listing view
|
2015-10-09 13:22:36 -07:00 |
|
|
snipe
|
4f74ad077a
|
Fixes #1136 - allow consumables to be deleted, even if they have been assigned
|
2015-10-06 16:08:32 -07:00 |
|
|
snipe
|
75af50def1
|
Accessories fix for #1204
|
2015-10-06 15:58:03 -07:00 |
|
|
snipe
|
ec80c99a48
|
Fixes #1204
|
2015-10-06 15:50:49 -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
|
4c662b7136
|
Fixes #1196 - added licensed to name and email in list view
|
2015-09-25 16:56:12 -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
|
abd0acbe9d
|
Add username to user's list view
|
2015-09-15 09:58:56 -07:00 |
|
|
snipe
|
911e9092f9
|
Prevent group altering from trolling douchebags
|
2015-09-15 02:46:40 -07:00 |
|
|
snipe
|
06c9076c2f
|
Prevent generating backups, deleting files and file downloads in demo mode
|
2015-09-15 02:32:19 -07:00 |
|
|
snipe
|
b8fa5abadf
|
Disable manual backup on demo
|
2015-09-15 02:25:53 -07:00 |
|
|
snipe
|
c12139e624
|
Added generate and delete backups
|
2015-09-15 02:05:51 -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
|
650f86406d
|
Added custom CSS field in settings
|
2015-09-09 13:17:36 -07:00 |
|
|
madd15
|
a365cdc2cc
|
Switch to new method
|
2015-08-25 16:34:51 +09:30 |
|
|
snipe
|
da6770c9d9
|
Fixes #1102 - default currency stored as htmlentities in the DB
|
2015-08-21 18:11:23 -07:00 |
|
|
snipe
|
7dd2b3d580
|
Fixes #1104
|
2015-08-21 16:00:03 -07:00 |
|
|
Aladin Alaily
|
960be7c5ae
|
Replace hardcoded location with a user selection.
|
2015-08-21 10:40:18 -04:00 |
|
|
snipe
|
e916fdcc89
|
Fixes #1092, setting LDAP_OPT_REFERRALS to 0 for Active Directory
|
2015-08-20 15:54:42 -07:00 |
|
|
snipe
|
d47198086f
|
Added notes search to licenses
|
2015-08-19 17:23:55 -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
|
1d976ff926
|
Fixes #1078
|
2015-08-19 10:23:01 -07:00 |
|
|
madd15
|
899e543173
|
Switch to new method
|
2015-08-18 16:12:23 +09:30 |
|
|
madd15
|
567ad6c3bb
|
Switch to new method
|
2015-08-18 14:11:03 +09:30 |
|
|
snipe
|
7dd50eddfa
|
Nicer error messages on validation fail for LDAP
|
2015-08-14 22:57:32 -07:00 |
|
|
snipe
|
e49cfb4bde
|
Fixed validation on LDAP
|
2015-08-14 22:10:05 -07:00 |
|
|
snipe
|
729795364b
|
Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop
# Conflicts:
# app/controllers/admin/UsersController.php
|
2015-08-14 21:36:09 -07:00 |
|
|
snipe
|
ee46b223c9
|
Added LDAP options
|
2015-08-14 21:33:48 -07:00 |
|
|
Aladin Alaily
|
23bde13665
|
Corrected a typo and remove some testing code
|
2015-08-15 00:29:38 -04:00 |
|