79c5d3f7d6
Fixes #1537 and #1524
2015-12-29 19:21:54 -08:00
3417d833ba
Save on create for custom fields
2015-12-02 17:12:17 -08:00
aff7b99d91
Nicer add/edit formatting putting required fields at the top
2015-12-02 16:31:57 -08:00
6ec4f605f4
Handle selecting 'no model' without JS errors.
2015-12-01 17:22:09 -08:00
e88f5629df
Add new form partial and AJAX endpoint for custom fields.
2015-12-01 17:17:32 -08:00
a44c56c937
Merge branch 'hotfixes/fix_1413' into develop
...
# Conflicts:
# app/config/version.php
# app/models/Company.php
2015-11-29 16:49:34 -08:00
7d2ae0d10d
CSRF for ajax
2015-11-26 14:11:38 -08:00
6bedaa903a
CSRF token for ajax
2015-11-26 13:53:51 -08:00
1efb1f7038
Remove MAC address fields since they are now custom fields
2015-11-26 13:42:13 -08:00
d653126a2a
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
app/views/backend/hardware/view.blade.php
2015-11-25 14:22:22 -08:00
e60c0e3b4d
Warning message about EOL
2015-11-23 21:04:41 -08:00
b202e01205
Add full multiple companies support
...
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
2015-11-16 06:03:27 +03:00
23d10a8f7f
Make company field optional
...
Company field is now optional for the user,
although still required in the controllers.
2015-11-13 09:19:18 +03:00
d8df61bd32
Merge remote-tracking branch 'upstream/develop' into multiple-companies
...
Conflicts:
app/controllers/admin/UsersController.php
app/views/backend/hardware/index.blade.php
2015-11-12 09:30:11 +03:00
d1a306cfd8
Yay, asset image progress!
2015-11-09 08:25:29 -07:00
6bf2a2875f
Add initial support for multiple companies
...
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0
https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03:00
a955d57c20
When edit blade is used for New Asset, need to account for no model
...
being selected.
2015-10-22 11:21:15 -07:00
5890d26545
Terribly rough Custom Fields creation
2015-10-22 00:38:07 -07:00
cbcc43828e
Removed required indicator for serial
2015-09-09 11:19:43 -07:00
c839f0cbc8
Added ability to select status type
2015-08-12 22:33:56 -07:00
3d77666ad1
Nicer required field display
2015-08-12 21:55:23 -07:00
6f6b74b82c
Add modelno to modal
2015-08-12 20:58:30 -07:00
b3249dcf48
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/UsersController.php
# app/models/Model.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/users/index.blade.php
# composer.lock
2015-08-11 13:20:25 -07:00
936d7dab1b
Fixes #1043
2015-08-11 12:36:03 -07:00
20eb2df9be
Fix to nicen up the layout for the inline-adding and Bootstrapify it.
2015-07-28 14:25:47 -07:00
1e38ced885
Nicer display of "add new" inline functionality.
...
TODO:
Handle validation failures in a less fugly way
2015-07-28 11:58:45 -07:00
fe2fb63007
Localization strings for inline modals
2015-07-28 11:31:08 -07:00
de8180ec70
Abililty to inline-add things when you are creating a new asset
2015-07-27 23:27:45 -07:00
28304556a9
First pass at this, the ugly way. Just to see wha it looks like.
2015-07-26 18:15:06 -07:00
0154f240f3
Fixes JavaScript for edited assets
2015-07-10 22:48:21 -07:00
0132360e49
Added spinner to show activity during ajax
...
TO DO:
- Account for the default state when the page is loaded on edit (currently using onchange)
- If no status or model is selected, return false or something else so that it doesn't try to make the ajax call with no ID
2015-07-09 08:45:06 -07:00
4a5066054b
Display bugfixes for #819
2015-07-08 22:38:35 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
33e7ce6761
Fixes for #722 localization
2015-04-02 14:28:11 -07:00
7881e70afb
Update Model Check in Hardware Edit and move to API
2015-03-25 12:03:45 +10:30
e56ccb0c82
Add jQuery for mac address field
2015-03-19 09:46:31 +10:30
472b7056c9
update icons
2015-03-10 13:28:50 +10:30
984ef44a43
update icons
2015-03-10 13:28:27 +10:30
ef6eae63d8
Fixed error icon
2015-02-26 15:50:33 -08:00
59ea144b28
Minor UX tweaks
2015-02-26 03:07:19 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -08:00
4a5007264e
Fixed mac address not showing
2015-02-12 21:34:20 -08:00
58ff929d71
Fixes error when no model present because new asset
2015-02-11 22:57:22 -08:00
fbf03b225d
Fixes #509 - added MAC address as model option
2015-02-11 16:37:24 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
51a7752771
Moved cancel text to buttons language file
2015-02-06 18:52:09 -08:00
dcf2b428da
If we are passing along an id of a previously selected model, use that as the default selection. Otherwise we should fall back to Input::old()
2014-12-03 14:06:33 -06:00
cc8ca54b3f
Convert note fields to text areas for hardware views
2014-12-02 06:59:01 -06:00
89a2b87e42
Fixes #367 - added model number to dropdown
2014-11-21 05:20:08 -05:00
snipe