Commit Graph

7 Commits

Author SHA1 Message Date
snipe ca24ef1cd8 Merge branch 'refs/heads/feature/add-asset-to-software' into develop
Conflicts:
	app/controllers/admin/LicensesController.php
2014-07-18 20:24:51 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe cd0f42c508 Alphabetized language files, more for #151, refactoring language string hierarchy. 2014-06-09 17:45:52 -04:00
snipe 1b01074b9e Changed license structure to use join table to handle multiple seats 2013-11-25 01:04:39 -05:00
snipe 17cb895633 Checkin/Checkout for licenses 2013-11-18 00:54:56 -05:00
snipe 34cb25296f Added purchase date, etc to language files 2013-11-15 15:47:02 -05:00
snipe 9bbc25fc76 License language files 2013-11-15 15:00:50 -05:00