2f83f2aa52
Updated migration to reflect relation to the asset
2015-07-20 21:01:48 -04:00
914b1cb628
Added the improvements table migration to create the improvements table
2015-07-20 21:01:33 -04:00
6dae07be7d
Updated start.php to reflect my local configuration
2015-07-20 21:00:45 -04:00
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a55309bfaef
2015-07-20 17:12:28 -07:00
775a38880e
Revert "Starter controller for bulk edit/delete"
...
This reverts commit 55309bfaef
2015-07-20 16:35:16 -07:00
9d949a5b89
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-20 16:34:55 -07:00
01c2968388
Revert "Fixes #863 - clickable order number in asset view"
...
This reverts commit 0c842fc772
2015-07-20 16:34:14 -07:00
41b711740a
Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
...
# Conflicts:
# app/controllers/admin/ReportsController.php
# app/lang/en/general.php
# app/routes.php
# app/views/backend/hardware/view.blade.php
# app/views/backend/layouts/default.blade.php
# composer.lock
2015-07-20 16:12:35 -07:00
55309bfaef
Starter controller for bulk edit/delete
2015-07-17 14:13:27 -07:00
0c842fc772
Fixes #863 - clickable order number in asset view
2015-07-16 21:21:09 -07:00
5210d7621e
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# .gitignore
# app/config/version.php
2015-07-16 20:34:01 -07:00
b85d972488
Added mod rewrite to force SSL
2015-07-16 20:32:10 -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
dec3f290d0
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-16 19:28:07 -07:00
190b4cd010
Ignore couscous dir
2015-07-16 19:27:48 -07:00
e447159d4a
Added checks for missing fields, added email column, asset notes
2015-07-16 16:23:35 -07:00
b191406a0c
Ignore couscous
2015-07-16 14:58:22 -07:00
d732b60a38
Merge pull request #921 from madd15/Unique-Identifier-User-Lists
...
#916 - Email as unique identifier in user lists
2015-07-15 18:00:52 -07:00
ba94a57e08
Adjust Manager and Location width
2015-07-16 10:26:53 +09:30
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
0642b4b830
Merge pull request #920 from madd15/patch-3
...
Update for change to username on sign in
2015-07-15 17:34:59 -07:00
8b77be9da3
Update for change to username on sign in
2015-07-16 10:04:20 +09:30
56345b5743
Fixes #909 - expired licenses showing in email report
2015-07-13 20:59:02 -07:00
f09ee24975
Merge pull request #908 from madd15/license-delete-modal
...
Add title and content to delete modal for License File Uploads
2015-07-13 09:22:51 -07:00
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
a7abea692d
Moved link for asset maintenances to the asset menu with the other items related to assets / hardware
2015-07-10 10:25:32 -04:00
f04b3f9b09
Change to LicenseSeat
2015-07-10 10:02:46 +09:30
2841eadc91
Add title and content to delete modal
2015-07-10 09:57:03 +09:30
616af831a7
Add title and content to delete modal
2015-07-10 09:54:14 +09:30
1e730078c1
Add file uploads to Users
2015-07-10 09:23:34 +09:30
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
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
16b49c25e1
Bringing back the spinner on processing screen
2015-07-09 03:56:18 -07:00
c61adc7041
Partial fix for #851 datatables. Because clear error reporting is apparently for suckers
2015-07-09 03:20:57 -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
c8842a85ee
Bumped version
2015-07-09 01:24:43 -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
7e5f32c9d8
Merge pull request #898 from madd15/Default-Layout-fix
...
Small UI fixes
2015-07-09 01:17:02 -07:00
e1724cf25f
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# .gitignore
# app/config/production/session.example.php
# app/config/staging/session.example.php
# app/config/version.php
# app/models/User.php
2015-07-09 01:02:49 -07:00
9936cf4a43
Better production default for #903
2015-07-09 00:53:58 -07:00
Vincent Sposato