305c22f72d
Added request to dashboard
2015-07-30 14:59:24 -07:00
78835a8b1f
Add requestable as bulk-edit option
2015-07-30 14:32:25 -07:00
948c443829
Fix for edit/clone
2015-07-29 20:50:23 -07:00
20f94ce418
Closing brackets are helpful
2015-07-29 14:27:03 -04:00
cced7a93a5
Update AssetsController.php
2015-07-29 14:25:49 -04:00
6430f7a4a7
Update AssetsController.php
2015-07-29 14:24:30 -04:00
0c9018289b
Fixes #970
2015-07-28 20:24:58 -07:00
e4ad1011da
Merge pull request #969 from snipe/inline_adding
...
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
de8180ec70
Abililty to inline-add things when you are creating a new asset
2015-07-27 23:27:45 -07:00
9184dd5303
Fix for sad action column with button wrapping
2015-07-27 15:28:41 -07:00
7aba5f3a84
Request #961 - Clone button on license list view
2015-07-28 07:33:51 +09:30
5e7bfe314a
Fix missing ]
2015-07-27 21:20:19 +09:30
a099d16714
Only send email if an email address was given
2015-07-26 22:08:26 -07:00
b32e3a3475
Shwo username instead of email
2015-07-26 21:21:42 -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
5701b4d38e
Return accessories as well
2015-07-25 00:05:59 -07:00
23866bce26
Use redirect to route instead of back because POST
2015-07-24 23:08:33 -07:00
0f0dab556d
Fixes #807 - bad link for subfolders
2015-07-24 22:48:29 -07:00
6dea227c3e
Fixes #851 - bulk user delete
2015-07-24 22:37:15 -07:00
59b739c1c4
Fixes #902 - redirect to group listing page after group create
2015-07-24 17:43:33 -07:00
fbb55c14d6
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-24 15:56:10 -07:00
00bcae7feb
Add email to postCheckin
2015-07-24 10:24:14 +09:30
6d96d6cba4
Add email to postCheckin
2015-07-24 10:22:54 +09:30
e3f0815012
Add Checkin_email to Create and Edit
2015-07-24 10:21:51 +09:30
d62d6ebf05
Add extra fields for email
2015-07-24 09:28:17 +09:30
e4277b47e8
Add extra fields for email
2015-07-24 09:27:44 +09:30
0de1d45492
Merge pull request #944 from madd15/Feature/Additional-Email-Info
...
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
2015-07-23 16:16:19 -07:00
fdee3ee93e
Merge pull request #933 from madd15/patch-4
...
#916 - Change Userlist identifier from email to username
2015-07-23 16:16:02 -07:00
ef045c61ca
Merge pull request #931 from madd15/patch-3
...
Fix #930 - Add reassignable to create
2015-07-23 16:15:53 -07:00
6d1197a144
Fix edit model cat list showing deleted categories
2015-07-24 08:44:53 +09:30
e455b2af6e
Only update email if password locking isn't set to true
2015-07-23 12:30:44 -07:00
d26c40b26e
Fixed issue where email not saved on edit
2015-07-23 12:28:26 -07:00
8ba55b4bf2
Fix missing checkedout_at
2015-07-23 12:40:22 +09:30
4375d66d09
Add Expected Checkin Date
2015-07-23 10:05:16 +09:30
130a041be0
Added Carbon to the uses statement for reports controller
2015-07-20 21:42:07 -04:00
a7a2f5f974
Minor change to reports controller to include the View facade
2015-07-20 21:41:29 -04:00
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
3df0550b19
Built the report and the export for the Improvements report
...
Added the links on the navigation
2015-07-20 21:26:23 -04:00
6eb296303f
Working through attempts to get footer callback working
2015-07-20 21:17:04 -04:00
4c37dcf5bb
Finished off the edit and view pages
2015-07-20 21:16:15 -04:00
2457003deb
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-07-20 21:16:06 -04:00
5ee4eb5871
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-07-20 21:15:46 -04:00
c253000af1
Updated the ImprovementsController to support date formatting for start and completion date on the data table
...
Updated the supplier and hardware view views to include the date formatting for start and completion date
2015-07-20 21:15:33 -04:00
f0d9ba89df
Created and built out the index and create functionality - still need to do the view and update
2015-07-20 21:15:17 -04:00
3e2bd02ce5
Fixed issue with migration that left off the deleted_at field
2015-07-20 21:02:04 -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
snipe