ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4419dc7434ba75d6c0ab0ac8d9d65fcbe62c9999
snipe-it/app/Http/Controllers
History
snipe 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format 
# Conflicts:
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/LicensesController.php
#	resources/views/hardware/view.blade.php
2016-08-16 18:53:45 -07:00
..
Auth
Allow admin to turn LDAP password sync off.
2016-08-04 14:29:28 -07:00
AccessoriesController.php
Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format
2016-08-16 18:53:45 -07:00
AssetMaintenancesController.php
Eager load asset query on maintenances to prevent n+1 queries
2016-08-11 15:56:21 -07:00
AssetModelsController.php
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
AssetsController.php
Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.
2016-08-16 20:47:53 -05:00
CategoriesController.php
Fix 2347 (#2394)
2016-08-16 13:02:42 -07:00
CompaniesController.php
Use updated redirect() reference
2016-04-28 21:06:41 -07:00
ComponentsController.php
Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.
2016-08-16 20:47:53 -05:00
ConsumablesController.php
Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format
2016-08-16 18:53:45 -07:00
Controller.php
Updated docblocks
2016-04-07 13:21:09 -07:00
CustomFieldsController.php
Ability to remove field from fieldset
2016-07-28 08:10:15 -07:00
DashboardController.php
More dashboard fixes
2016-05-18 19:48:19 -07:00
DepreciationsController.php
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
GroupsController.php
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
LicensesController.php
Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format
2016-08-16 18:53:45 -07:00
LocationsController.php
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
ManufacturersController.php
Add manufacturer to licenses (#2436)
2016-08-16 18:49:54 -07:00
ProfileController.php
Use updated redirect() reference
2016-04-28 21:06:41 -07:00
ReportsController.php
Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.
2016-08-16 20:47:53 -05:00
SettingsController.php
Allow admin to turn LDAP password sync off.
2016-08-04 14:29:28 -07:00
StatuslabelsController.php
Added custom color to status labels, only show status labels if there are results
2016-08-02 13:25:50 -07:00
SuppliersController.php
Fix for missing input variable in suppliers ajax method
2016-07-13 22:35:21 -07:00
UsersController.php
Better handling for deleted users
2016-08-02 04:23:13 -07:00
ViewAssetsController.php
Removed unused use statement
2016-07-10 21:01:11 -07:00