abfb5bcd2e
Change user list from email to username
2015-07-20 10:19:03 +09:30
5ff84d80b4
Change user list from email to username
2015-07-20 10:16:58 +09:30
e29ab6b0d6
Change user list from email to username
2015-07-20 10:16:26 +09:30
89df6fc6da
Change user list from email to username
2015-07-20 10:15:28 +09:30
0c842fc772
Fixes #863 - clickable order number in asset view
2015-07-16 21:21:09 -07:00
919df7ed56
Part of #863 - adds order number to asset listing
2015-07-16 19:54:56 -07:00
de62db5e18
Fixes #901 - added notes field to list view
2015-07-16 19:45:10 -07:00
24b0d83387
Fixes #912 - added clon button to list view
2015-07-16 19:33:39 -07:00
1fcd36e4ac
Change user list to include email address
2015-07-16 10:25:13 +09:30
31362f3e07
Change user list to include email address
2015-07-16 10:23:54 +09:30
0fbccef759
Change user list to include email address
2015-07-16 10:23:28 +09:30
2659521dc9
Change user list to include email address
2015-07-16 10:22:57 +09:30
0f489b34b5
Change user list to include email address
2015-07-16 10:22:19 +09:30
aed7036595
Merge pull request #907 from madd15/user-fileuploads
...
Feature #746 - Add File Uploads to Users
2015-07-13 09:22:39 -07:00
9fbb9746bc
Merge pull request #895 from madd15/patch-1
...
Add Checkout of first available license to license list view
2015-07-13 09:22:18 -07:00
0154f240f3
Fixes JavaScript for edited assets
2015-07-10 22:48:21 -07:00
1e730078c1
Add file uploads to Users
2015-07-10 09:23:34 +09:30
1c2a409e6a
Check that there is an assetstatus
2015-07-09 07:08:33 -07:00
15e1774a13
Centered checkboxes for select all
2015-07-09 03:57:20 -07:00
6524ac3678
Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors.
...
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
jb (jquery.dataTables.min.js, line 24)
ga (jquery.dataTables.min.js, line 45)
(anonymous function) (jquery.dataTables.min.js, line 92)
each (jquery-latest.js, line 383)
each (jquery-latest.js, line 136)
o (jquery.dataTables.min.js, line 82)
(anonymous function) (users, line 371)
fire (jquery-latest.js, line 3119)
fireWith (jquery-latest.js, line 3231)
ready (jquery-latest.js, line 3443)
completed (jquery-latest.js, line 3474)
2015-07-09 03:09:18 -07:00
7255a8bb0c
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-09 01:24:34 -07:00
f5d4eb5842
Merge pull request #897 from madd15/patch-2
...
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-09 01:19:57 -07:00
2d10931d6c
Use league/csv for export
2015-07-08 23:42:17 -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
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -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
a22687abc5
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-07 14:38:28 +09:30
8335f10f8c
Add Checkout Button
2015-07-07 12:38:53 +09:30
f363e742e6
Add getFreeLicense
...
Picks free seat for license and redirects to checkout specific seat
2015-07-07 12:30:55 +09:30
1edce0a4fa
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-06 19:29:22 -07:00
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
c7f2dc83db
Remove $new and replace with Input::all()
2015-07-07 09:50:00 +09:30
3664e75c47
Change validation to work correctly
2015-07-07 08:51:38 +09:30
61836f20c5
Clear Mac Address on Clone
2015-07-07 08:23:51 +09:30
62d382d704
Remove serial and assigned_to when cloning asset
2015-07-07 08:19:58 +09:30
3746bc333b
Better checking for model name and category name
2015-07-06 14:12:49 -07:00
ccde517c88
Use showAssetName to get asset name
2015-07-06 14:10:24 -07:00
7d5810b656
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/config/version.php
# app/controllers/admin/AssetsController.php
2015-07-02 17:23:06 -07:00
1601bdd4eb
Added rtd_location_id back into selected columns
2015-07-02 16:52:08 -07:00
d4af197b0e
Merge pull request #886 from madd15/Fix---Edit-user
...
Fix - Edit User
2015-07-01 19:51:33 -07:00
7a0b3a7350
Allow saving of Username and Email changes
...
I noted that i was unable to change the username or email fields, but also that the username validation would not allow the form to save as it was checking against itself for being unique.
2015-07-02 12:16:01 +09:30
55f544829d
Update Category Types Array to include Consumable
2015-07-01 17:28:58 +09:30
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
1d4cfcfd58
Only save uploaded logo if not in demo mode
2015-06-30 22:38:40 -07:00
f2abbd0e8f
Deny editing users on demo
2015-06-30 22:10:23 -07:00
62f8d002e3
Temp commented out some stuff
2015-06-30 22:05:21 -07:00
0766ae2d17
Disallow group edit for demo
2015-06-30 22:04:48 -07:00
588ff742fe
Add manufacturer to models listing for clarity
2015-06-30 19:15:43 -07:00
a8cb5c1e7d
Beginning QR mobile interface
2015-06-30 19:07:44 -07:00
edfa064fd4
Disable emailing imported users if demo mode
2015-06-23 18:38:21 -07:00
madd15