c1ae844308
Fix #972 - Change back button to work
2015-07-29 10:13:18 +09:30
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
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
a901a648af
Fixes #875 - allow user to decline asset and check asset back in if declined
2015-07-26 22:53:48 -07:00
464c83599b
Nicer validation display on login screen
2015-07-26 22:01:45 -07:00
c78355e39a
Cleaned up login screen layout
2015-07-26 21:58:03 -07:00
4f07818a2d
Only activate "email users" checkbox if there is an email address given for the user
2015-07-26 21:22:09 -07:00
979212b2ed
Sans serif in emails
2015-07-26 21:21:52 -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
2b2e6a8829
Additional localization strings
2015-07-25 00:20:17 -07:00
6dea227c3e
Fixes #851 - bulk user delete
2015-07-24 22:37:15 -07:00
cf3619d766
Fixes #937 - bug in which type of asset
2015-07-24 18:09:11 -07:00
991a364a3d
Updated form to use username
2015-07-24 16:56:31 -07:00
eaf077f807
Fixes #946 - navbar custom color not working in FF
2015-07-24 16:29:54 -07:00
e4bee3d372
Merge pull request #951 from madd15/fixes-1
...
Fix asset view duplicate file uploads and layout
2015-07-24 15:12:04 -07:00
2835905398
Fix dup file uploads and layout
2015-07-24 12:24:10 +09:30
b918ea88cc
Add checkin email template
2015-07-24 10:29:44 +09:30
42e101291e
Add Email on Checkin Field
2015-07-24 10:25:11 +09:30
fd9e8b712b
Add flexibility if values not present
2015-07-24 09:26:34 +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
4f1f21287c
Add Expected Checkin Date
2015-07-23 12:37:45 +09:30
dea23bef45
Add Expected Checkin Date
2015-07-23 11:53:07 +09:30
7afcd09651
Add Expected Checkin Date
2015-07-23 10:07:04 +09:30
e47146faee
Moved link for asset maintenances to the asset menu with the other items related to assets / hardware
2015-07-20 21:35:37 -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
5a2ca33d0f
Minor changes to the index attempting to get footer callback to work
2015-07-20 21:16:54 -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
05219e69c4
Created and updated the add / edit form for the Improvement
2015-07-20 21:15:08 -04:00
c3439b41b8
Updated the view for a hardware asset so that we could see the improvements on an asset
2015-07-20 21:14:51 -04:00
8ddf035a9b
Updated the left sidebar of the layout to include the new Improvements area
2015-07-20 21:03:36 -04:00
cf46e322b9
Created the index page using datatables
2015-07-20 21:02:50 -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
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
2f0f2c5002
Add additional Fields
2015-07-20 14:33:50 +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
ba94a57e08
Adjust Manager and Location width
2015-07-16 10:26:53 +09:30
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
madd15