Commit Graph

19 Commits

Author SHA1 Message Date
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
Splaer b2af455523 Merge conflict resolution. Added a use at the same line as remote. Fixed 2015-02-25 14:09:58 -05:00
Splaer 6d4f4c6064 Preparation for barcode goodness. Changed out library to one that supports all barcode types and not just QR. Prep branch for much bigger barcode things 2015-02-25 14:07:23 -05:00
snipe de94311c47 Add ability to prevent passwords from being changed 2015-02-24 11:57:46 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe 7069d9c6b1 Added new cipher to config 2015-02-04 15:50:07 -08:00
madd15 0b4c1b8d83 Feature Avatars
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
2014-10-29 14:18:54 +10:30
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
root cb8369e9de Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 3473ef5fa6 Updated to Laravel 4.1 2014-05-05 21:28:58 -04:00
Dom Tancredi efad5db082 Fix for broken datatables in upgrading to v2.2 2014-03-16 15:00:30 -04:00
Gil Rutkowski 36a714b154 Published debug bar assets on install. Moved jQuery & data tables to the head. Added Chumper Datatables. 2013-12-01 15:15:52 -06:00
snipe 067ddb9aac Config tweaks 2013-11-30 17:53:21 -05:00
snipe baab758377 Fixed language support 2013-11-30 17:30:02 -05:00
snipe 12d3d10dec Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-30 17:02:22 -05:00
snipe 7693e83d7f wtf 2013-11-30 17:02:11 -05:00
Gil Rutkowski f9d8cb1b93 Made things a bit more environmentally sensitive. 2013-11-29 23:22:48 -06:00
snipe feda21a6e3 Initial laravel import 2013-11-13 01:59:39 -05:00