snipe
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
snipe
c1a3592059
Fixes #2130
2016-06-10 08:29:43 -07:00
snipe
57c9d506b8
Fix namespacing for actionlog
2016-06-10 07:57:54 -07:00
snipe
5904de8718
Remove asset tag requirement from form request
...
It donks the edit screen as it thinks the asset tag has already been taken
2016-06-10 05:54:20 -07:00
snipe
ac15fb9be9
Merge pull request #2147 from dmeltzer/Fix-Asset-Creation-with-old-data
...
Fix editing assets.
2016-06-10 05:51:33 -07:00
Daniel Meltzer
2159d77fc2
No longer necessary.
2016-06-10 07:46:38 -05:00
Daniel Meltzer
e9605891f3
Merge upstream and fix changes.
2016-06-10 07:44:45 -05:00
Daniel Meltzer
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
Daniel Meltzer
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
snipe
9e8b76d348
Use updated $request->input methods for 5.2
2016-06-10 05:16:27 -07:00
snipe
6fa4d1252d
Fixes purchase date if no purchase date given
2016-06-10 05:00:49 -07:00
snipe
7a9cfb1a8f
Fixed label weirdness when no serial
2016-06-10 04:43:17 -07:00
snipe
a0901247a3
Let superadmins through companyable trait
2016-06-10 04:07:27 -07:00
snipe
02a9394cd9
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 03:41:03 -07:00
snipe
ec4bc6c2af
Allow superadmins to print labels
2016-06-10 03:40:49 -07:00
snipe
4e1472f66d
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 00:48:33 -07:00
snipe
c6ca1748cb
Merge pull request #2146 from dmeltzer/Fix-Asset-Creation-with-old-data
...
Fix hardware creation error making old input disappear.
2016-06-10 00:47:30 -07:00
Daniel Meltzer
044695cb02
Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point.
2016-06-09 20:28:49 -05:00
snipe
f44d98924d
Removed erroneous call to nonexistent model
2016-06-09 14:42:13 -07:00
snipe
66adffe6d9
Moved include
2016-06-09 14:41:58 -07:00
snipe
c91c1f92cd
Fixes #2132
2016-06-09 13:27:50 -07:00
snipe
bbb116f29c
Fixes #2142
2016-06-09 12:25:51 -07:00
snipe
a04d6293d1
Proper hypenation of Snipe-IT in footer
2016-06-09 03:08:42 -07:00
snipe
845b182fdf
Fixes format for users in category view
2016-06-09 02:26:43 -07:00
snipe
2b5fb04ba9
Allow admin to add user on checkout screen
2016-06-09 00:36:52 -07:00
snipe
bb758d618b
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-08 23:28:53 -07:00
snipe
9b2c7d749b
Fixed barcode descriptions
2016-06-08 23:28:44 -07:00
snipe
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
snipe
3a101aa0c8
Merge pull request #2131 from dmeltzer/fix-license-checkout
...
Fix license Checkout.
2016-06-08 18:01:16 -07:00
Daniel Meltzer
9648c6f1d3
Fix license Checkout.
...
A mistake in the sqlite porting led to "Please select an asset"
disappearing. This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.
Also use the proper name on the components checkout page.
AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
2016-06-07 07:58:08 -05:00
snipe
75eb2bbe09
Janky-ass form request stuff
2016-06-06 21:02:06 -07:00
snipe
d4e231d5d4
Save permissions on new user
2016-06-06 18:56:43 -07:00
snipe
75dfb87671
Use form request for user add/edit to handle password and password confirmation
2016-06-06 14:15:50 -07:00
snipe
23936e465d
Merge pull request #2123 from dmeltzer/fix-setup-on-windows
...
Fix missing posix_getpwuid on windows.
2016-06-06 12:31:30 -07:00
snipe
13d11bfdcc
Merge pull request #2121 from dmeltzer/add-soft-pave
...
Add a 'soft' delete option to the pave tool.
2016-06-06 12:30:06 -07:00
snipe
21506f4101
Merge pull request #2120 from dmeltzer/add-clone-to-models-index
...
Add clone action to Assetmodels index page.
2016-06-06 12:29:54 -07:00
snipe
51ab8ce41c
Merge pull request #2119 from dmeltzer/fix-category-lists
...
Modify Helper::categoryList() to take a category type parameter.
2016-06-06 12:29:31 -07:00
Daniel Meltzer
ea3e11e011
Fix missing posix_getpwuid on windows.
...
This isn't a perfect solution. It basically just nullifies the check on
windows. I'm not sure if IIS can run as a nonelevated user though, so
perhaps thats the best choice. Regardless, this fixes the setup.
2016-06-06 07:43:05 -05:00
Daniel Meltzer
6ba37a3a8d
Add a 'soft' delete option to the pave tool. This leaves db structure and migrations in place but removes everything inside the db except the first user.
2016-06-05 10:24:42 -05:00
Daniel Meltzer
a89511674b
Add clone icon to Assetmodels index page.
2016-06-05 10:00:31 -05:00
Daniel Meltzer
cd9cca9c6b
Modify Helper::categoryList() to take a category type parameter.
...
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118 ). Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
2016-06-05 09:47:44 -05:00
snipe
9f6eb02afc
Don't purge users where show_in_list = 1
...
This is necessary so hosted customers can't hard-delete my account :-/
2016-06-03 12:13:59 -07:00
snipe
f8ac9a3f77
Fixes #2110
2016-06-03 11:48:20 -07:00
snipe
b28d966645
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-02 21:16:48 -07:00
snipe
030b525535
Small readme changes
2016-06-02 21:16:43 -07:00
Brady Wetherington
093bcdfe4f
Fix to Dockerfile build; backup path must've changed.
2016-06-02 21:10:50 -07:00
Brady Wetherington
5e0cc241a0
Forgot to add the new docker.env file
2016-06-02 20:35:05 -07:00
snipe
7d5c7991f4
Create backups directory
2016-06-02 19:45:59 -07:00
snipe
9ced24b127
Bumped version for RC-3 release
2016-06-02 19:06:54 -07:00
snipe
fd32f6d4d5
New language strings
2016-06-02 19:01:09 -07:00
