Vincent Sposato
6eb296303f
Working through attempts to get footer callback working
2015-07-20 21:17:04 -04:00
Vincent Sposato
5a2ca33d0f
Minor changes to the index attempting to get footer callback to work
2015-07-20 21:16:54 -04:00
Vincent Sposato
215c21891b
Updated start file to include my staging site
2015-07-20 21:16:25 -04:00
Vincent Sposato
4c37dcf5bb
Finished off the edit and view pages
2015-07-20 21:16:15 -04:00
Vincent Sposato
2457003deb
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-07-20 21:16:06 -04:00
Vincent Sposato
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
Vincent Sposato
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
Vincent Sposato
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
Vincent Sposato
05219e69c4
Created and updated the add / edit form for the Improvement
2015-07-20 21:15:08 -04:00
Vincent Sposato
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
Vincent Sposato
e479575825
Added all of the functionality for the Improvement to be linked to the Asset
2015-07-20 21:11:17 -04:00
Vincent Sposato
0282169703
Added all of the routing for the added improvement section
2015-07-20 21:10:59 -04:00
Vincent Sposato
0da0998e44
Made sure that all language files were there, even though they were blank
2015-07-20 21:04:46 -04:00
Vincent Sposato
60d3af7bb7
Added all of the language items needed
2015-07-20 21:03:51 -04:00
Vincent Sposato
8ddf035a9b
Updated the left sidebar of the layout to include the new Improvements area
2015-07-20 21:03:36 -04:00
Vincent Sposato
0f5b8b5a90
Needed to fix nullable issues
2015-07-20 21:03:22 -04:00
Vincent Sposato
69a5c99396
Fixed the datetime fields to be date fields only
2015-07-20 21:03:12 -04:00
Vincent Sposato
3aa3d67675
Fixed the need to only be a date instead of a date time
2015-07-20 21:03:00 -04:00
Vincent Sposato
cf46e322b9
Created the index page using datatables
2015-07-20 21:02:50 -04:00
Vincent Sposato
3a3c021a6a
One last fix to the migration to add the supplier relationship
2015-07-20 21:02:41 -04:00
Vincent Sposato
4b3267649a
Updated the Improvement and Supplier relationship
2015-07-20 21:02:31 -04:00
Vincent Sposato
1c4190bf22
Added the relation to the improvement to the model, so that we can reference these items
2015-07-20 21:02:21 -04:00
Vincent Sposato
3e2bd02ce5
Fixed issue with migration that left off the deleted_at field
2015-07-20 21:02:04 -04:00
Vincent Sposato
2f83f2aa52
Updated migration to reflect relation to the asset
2015-07-20 21:01:48 -04:00
Vincent Sposato
914b1cb628
Added the improvements table migration to create the improvements table
2015-07-20 21:01:33 -04:00
Vincent Sposato
6dae07be7d
Updated start.php to reflect my local configuration
2015-07-20 21:00:45 -04:00
Brady Wetherington
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a , reversing
changes made to 55309bfaef .
It also un-reverts reversions that were done inadvertently.
2015-07-20 17:12:28 -07:00
snipe
775a38880e
Revert "Starter controller for bulk edit/delete"
...
This reverts commit 55309bfaef .
2015-07-20 16:35:16 -07:00
snipe
9d949a5b89
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-20 16:34:55 -07:00
snipe
01c2968388
Revert "Fixes #863 - clickable order number in asset view"
...
This reverts commit 0c842fc772 .
2015-07-20 16:34:14 -07:00
snipe
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
55309bfaef
Starter controller for bulk edit/delete
2015-07-17 14:13:27 -07:00
snipe
0c842fc772
Fixes #863 - clickable order number in asset view
2015-07-16 21:21:09 -07:00
snipe
5210d7621e
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# .gitignore
# app/config/version.php
2015-07-16 20:34:01 -07:00
snipe
b85d972488
Added mod rewrite to force SSL
2015-07-16 20:32:10 -07:00
snipe
919df7ed56
Part of #863 - adds order number to asset listing
2015-07-16 19:54:56 -07:00
snipe
de62db5e18
Fixes #901 - added notes field to list view
2015-07-16 19:45:10 -07:00
snipe
24b0d83387
Fixes #912 - added clon button to list view
2015-07-16 19:33:39 -07:00
snipe
dec3f290d0
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-16 19:28:07 -07:00
snipe
190b4cd010
Ignore couscous dir
2015-07-16 19:27:48 -07:00
snipe
e447159d4a
Added checks for missing fields, added email column, asset notes
2015-07-16 16:23:35 -07:00
snipe
b191406a0c
Ignore couscous
2015-07-16 14:58:22 -07:00
snipe
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
madd15
ba94a57e08
Adjust Manager and Location width
2015-07-16 10:26:53 +09:30
madd15
1fcd36e4ac
Change user list to include email address
2015-07-16 10:25:13 +09:30
madd15
31362f3e07
Change user list to include email address
2015-07-16 10:23:54 +09:30
madd15
0fbccef759
Change user list to include email address
2015-07-16 10:23:28 +09:30
madd15
2659521dc9
Change user list to include email address
2015-07-16 10:22:57 +09:30
madd15
0f489b34b5
Change user list to include email address
2015-07-16 10:22:19 +09:30
snipe
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