Commit Graph

  • 4f07818a2d Only activate "email users" checkbox if there is an email address given for the user snipe 2015-07-26 21:22:09 -07:00
  • 979212b2ed Sans serif in emails snipe 2015-07-26 21:21:52 -07:00
  • b32e3a3475 Shwo username instead of email snipe 2015-07-26 21:21:42 -07:00
  • 67e18cb110 Updates for switch to username snipe 2015-07-26 19:56:03 -07:00
  • 28304556a9 First pass at this, the ugly way. Just to see wha it looks like. Brady Wetherington 2015-07-26 18:15:06 -07:00
  • 6a5777816c Pulled extra route resources that weren't being used snipe 2015-07-26 17:51:18 -07:00
  • 2b2e6a8829 Additional localization strings snipe 2015-07-25 00:20:17 -07:00
  • 5701b4d38e Return accessories as well snipe 2015-07-25 00:05:59 -07:00
  • 23866bce26 Use redirect to route instead of back because POST snipe 2015-07-24 23:08:33 -07:00
  • ac5dd0dbf9 Remove unique constraint on email snipe 2015-07-24 23:05:11 -07:00
  • 0f0dab556d Fixes #807 - bad link for subfolders snipe 2015-07-24 22:48:29 -07:00
  • 6dea227c3e Fixes #851 - bulk user delete snipe 2015-07-24 22:37:15 -07:00
  • cf3619d766 Fixes #937 - bug in which type of asset snipe 2015-07-24 18:09:11 -07:00
  • 59b739c1c4 Fixes #902 - redirect to group listing page after group create snipe 2015-07-24 17:43:33 -07:00
  • 59963b88f5 Fixes #941 - looser restrictions on alpha_space custom validator snipe 2015-07-24 17:29:47 -07:00
  • 7d67b6a9ae Fixed forgotten password snipe 2015-07-24 17:16:50 -07:00
  • e944b2d1c3 Fixed blade path snipe 2015-07-24 16:56:55 -07:00
  • 442db4b5c8 Removed duplicate routes from previous merge snipe 2015-07-24 16:56:44 -07:00
  • 991a364a3d Updated form to use username snipe 2015-07-24 16:56:31 -07:00
  • eaf077f807 Fixes #946 - navbar custom color not working in FF snipe 2015-07-24 16:29:54 -07:00
  • fbb55c14d6 Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-24 15:56:10 -07:00
  • e4bee3d372 Merge pull request #951 from madd15/fixes-1 snipe 2015-07-24 15:12:04 -07:00
  • 42694f2e9f Merge pull request #950 from madd15/Feature-Checkin-Emails snipe 2015-07-24 15:11:22 -07:00
  • 2835905398 Fix dup file uploads and layout madd15 2015-07-24 12:24:10 +09:30
  • f9c7022bcc Add checkin_email() madd15 2015-07-24 12:01:21 +09:30
  • 60d05e1ae1 Add checkin_email() madd15 2015-07-24 11:58:09 +09:30
  • b918ea88cc Add checkin email template madd15 2015-07-24 10:29:44 +09:30
  • e8c8509ed3 Add checkin_email Lang madd15 2015-07-24 10:25:52 +09:30
  • 42e101291e Add Email on Checkin Field madd15 2015-07-24 10:25:11 +09:30
  • 00bcae7feb Add email to postCheckin madd15 2015-07-24 10:24:14 +09:30
  • 6d96d6cba4 Add email to postCheckin madd15 2015-07-24 10:22:54 +09:30
  • e3f0815012 Add Checkin_email to Create and Edit madd15 2015-07-24 10:21:51 +09:30
  • f154692dad Add Checkin_email to Catergories Table madd15 2015-07-24 10:20:50 +09:30
  • b4e79592c4 Merge branch '2.0' of https://github.com/snipe/snipe-it into 2.0 Vincent Sposato 2015-07-23 20:17:01 -04:00
  • e779bf52d1 Merge pull request #949 from madd15/patch-1 snipe 2015-07-23 17:03:43 -07:00
  • d62d6ebf05 Add extra fields for email madd15 2015-07-24 09:28:17 +09:30
  • e4277b47e8 Add extra fields for email madd15 2015-07-24 09:27:44 +09:30
  • fd9e8b712b Add flexibility if values not present madd15 2015-07-24 09:26:34 +09:30
  • 0de1d45492 Merge pull request #944 from madd15/Feature/Additional-Email-Info snipe 2015-07-23 16:16:19 -07:00
  • fdee3ee93e Merge pull request #933 from madd15/patch-4 snipe 2015-07-23 16:16:02 -07:00
  • ef045c61ca Merge pull request #931 from madd15/patch-3 snipe 2015-07-23 16:15:53 -07:00
  • 212800b074 Merge pull request #947 from madd15/patch-6 snipe 2015-07-23 16:15:36 -07:00
  • 6d1197a144 Fix edit model cat list showing deleted categories madd15 2015-07-24 08:44:53 +09:30
  • a5b2dbfaf0 Merge remote-tracking branch 'origin/develop' v1.2.9 snipe 2015-07-23 12:33:26 -07:00
  • e455b2af6e Only update email if password locking isn't set to true snipe 2015-07-23 12:30:44 -07:00
  • d26c40b26e Fixed issue where email not saved on edit snipe 2015-07-23 12:28:26 -07:00
  • 8ba55b4bf2 Fix missing checkedout_at madd15 2015-07-23 12:40:22 +09:30
  • 4f1f21287c Add Expected Checkin Date madd15 2015-07-23 12:37:45 +09:30
  • 878a163d11 Create Expected Checkin Date Column madd15 2015-07-23 11:55:35 +09:30
  • dea23bef45 Add Expected Checkin Date madd15 2015-07-23 11:53:07 +09:30
  • d12d1f161f Add Expected Checkin Date madd15 2015-07-23 11:52:04 +09:30
  • 7afcd09651 Add Expected Checkin Date madd15 2015-07-23 10:07:04 +09:30
  • 4375d66d09 Add Expected Checkin Date madd15 2015-07-23 10:05:16 +09:30
  • e2bb6cf6c6 Merge branch '2.0' of https://github.com/snipe/snipe-it into 2.0 Vincent Sposato 2015-07-21 19:57:29 -04:00
  • 2e11a68c0d Merge branch 'feature/857_AssetRepairUpgradeTrackingFrom2.0' into 2.0 Vincent Sposato 2015-07-21 19:57:16 -04:00
  • 27fe904970 Merge pull request #936 from vsposato/feature/857_AssetRepairUpgradeTrackingFrom2.0 snipe 2015-07-20 22:45:59 -07:00
  • 130a041be0 Added Carbon to the uses statement for reports controller Vincent Sposato 2015-07-20 21:42:07 -04:00
  • a7a2f5f974 Minor change to reports controller to include the View facade Vincent Sposato 2015-07-20 21:41:29 -04:00
  • e47146faee Moved link for asset maintenances to the asset menu with the other items related to assets / hardware Vincent Sposato 2015-07-10 10:25:32 -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 Vincent Sposato 2015-07-06 10:36:54 -04:00
  • 3df0550b19 Built the report and the export for the Improvements report Added the links on the navigation Vincent Sposato 2015-06-28 15:00:55 -04:00
  • 6eb296303f Working through attempts to get footer callback working Vincent Sposato 2015-06-28 14:02:53 -04:00
  • 5a2ca33d0f Minor changes to the index attempting to get footer callback to work Vincent Sposato 2015-06-28 14:02:09 -04:00
  • 215c21891b Updated start file to include my staging site Vincent Sposato 2015-06-28 07:40:42 -04:00
  • 4c37dcf5bb Finished off the edit and view pages Vincent Sposato 2015-06-27 19:47:05 -04:00
  • 2457003deb Fixed issue found with date being handled incorrectly Updated multiple views to reflect this issue Vincent Sposato 2015-06-27 17:42:15 -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 Vincent Sposato 2015-06-27 17:15:23 -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 Vincent Sposato 2015-06-27 15:55:56 -04:00
  • f0d9ba89df Created and built out the index and create functionality - still need to do the view and update Vincent Sposato 2015-06-27 14:39:59 -04:00
  • 05219e69c4 Created and updated the add / edit form for the Improvement Vincent Sposato 2015-06-27 14:38:45 -04:00
  • c3439b41b8 Updated the view for a hardware asset so that we could see the improvements on an asset Vincent Sposato 2015-06-27 14:38:12 -04:00
  • e479575825 Added all of the functionality for the Improvement to be linked to the Asset Vincent Sposato 2015-06-27 14:37:40 -04:00
  • 0282169703 Added all of the routing for the added improvement section Vincent Sposato 2015-06-27 14:37:11 -04:00
  • 0da0998e44 Made sure that all language files were there, even though they were blank Vincent Sposato 2015-06-27 14:36:07 -04:00
  • 60d3af7bb7 Added all of the language items needed Vincent Sposato 2015-06-27 14:35:37 -04:00
  • 8ddf035a9b Updated the left sidebar of the layout to include the new Improvements area Vincent Sposato 2015-06-27 13:51:39 -04:00
  • 0f5b8b5a90 Needed to fix nullable issues Vincent Sposato 2015-06-27 13:42:42 -04:00
  • 69a5c99396 Fixed the datetime fields to be date fields only Vincent Sposato 2015-06-27 13:16:25 -04:00
  • 3aa3d67675 Fixed the need to only be a date instead of a date time Vincent Sposato 2015-06-27 13:15:08 -04:00
  • cf46e322b9 Created the index page using datatables Vincent Sposato 2015-06-27 12:47:43 -04:00
  • 3a3c021a6a One last fix to the migration to add the supplier relationship Vincent Sposato 2015-06-27 12:41:40 -04:00
  • 4b3267649a Updated the Improvement and Supplier relationship Vincent Sposato 2015-06-27 12:41:16 -04:00
  • 1c4190bf22 Added the relation to the improvement to the model, so that we can reference these items Vincent Sposato 2015-06-27 12:27:15 -04:00
  • 3e2bd02ce5 Fixed issue with migration that left off the deleted_at field Vincent Sposato 2015-06-27 12:26:40 -04:00
  • 2f83f2aa52 Updated migration to reflect relation to the asset Vincent Sposato 2015-06-27 11:02:41 -04:00
  • 914b1cb628 Added the improvements table migration to create the improvements table Vincent Sposato 2015-06-27 10:51:22 -04:00
  • 6dae07be7d Updated start.php to reflect my local configuration Vincent Sposato 2015-06-26 17:13:03 -04:00
  • c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" Brady Wetherington 2015-07-20 17:12:28 -07:00
  • 775a38880e Revert "Starter controller for bulk edit/delete" snipe 2015-07-20 16:35:16 -07:00
  • 9d949a5b89 Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 snipe 2015-07-20 16:34:55 -07:00
  • 01c2968388 Revert "Fixes #863 - clickable order number in asset view" snipe 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 snipe 2015-07-20 16:12:35 -07:00
  • 0d0589800a Add additional data for email fields madd15 2015-07-20 14:35:07 +09:30
  • 2f0f2c5002 Add additional Fields madd15 2015-07-20 14:33:50 +09:30
  • abfb5bcd2e Change user list from email to username madd15 2015-07-20 10:19:03 +09:30
  • 5ff84d80b4 Change user list from email to username madd15 2015-07-20 10:16:58 +09:30
  • e29ab6b0d6 Change user list from email to username madd15 2015-07-20 10:16:26 +09:30
  • 89df6fc6da Change user list from email to username madd15 2015-07-20 10:15:28 +09:30
  • 78a45d72d7 Add reassignable to create madd15 2015-07-18 10:53:51 +09:30
  • abb970fe39 Merge remote-tracking branch 'origin/develop' snipe 2015-07-17 16:25:55 -07:00