Commit Graph

39 Commits

Author SHA1 Message Date
snipe 4a086cecfd Updated composer lock 2015-08-17 11:49:19 -07:00
snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock
2015-08-11 13:20:25 -07:00
snipe 242e6ff030 Updated composer lock 2015-08-11 12:40:13 -07:00
snipe c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers 2015-07-09 03:20:57 -07:00
snipe 818d1769b8 Automated backup to dump SQL and zip uploaded files
Usage:

`php artisan snipeit:backup`

This can be set on a cron or scheduled task
2015-06-22 15:52:26 -07:00
snipe ee08586279 Trying to regain compatibility with PHP 5.4 2015-06-19 17:59:10 -07:00
snipe c0fab2f425 Updated deps to still allow for 5.4 (I hope?) 2015-06-19 17:37:32 -07:00
snipe 2aa357f315 Added fideveloper proxy and DB backup 2015-06-19 14:28:40 -07:00
snipe f671c89b14 Composer update for bin path 2015-06-09 17:31:28 -07:00
snipe 03bd1498e8 Added codeception 2015-06-09 16:52:08 -07:00
snipe 145d386ce2 Updated lock file 2015-05-12 15:13:18 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 495201ebf7 Merge branch 'develop'
# Conflicts:
#	composer.lock
2015-04-28 14:48:19 -07:00
snipe 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -07:00
snipe fa794d7a15 Basic QR code printing 2015-03-19 18:06:50 -07:00
snipe 1a615f8941 Update to Senry 2.1.5 for security vulnerability 2015-03-16 18:52:56 -07:00
snipe 41dd7a2b2a Update to Senry 2.1.5 for security vulnerability 2015-03-16 18:39:13 -07:00
snipe 2cdfeacc1b Get ssets page to render with ajax datatables 2015-03-12 21:42:24 -07:00
snipe ad25c048c4 Updated Sentry version to fix #625 2015-03-09 16:15:13 -07:00
snipe fc4f1fd7fc Updated lock file 2015-02-25 12:35:41 -08:00
snipe ad39ec1dc3 Added markdown to EULA 2015-02-25 11:25:10 -08:00
snipe 7360e52f61 Updated composer lock 2015-02-18 13:16:09 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe 3df8243d80 Updated composer to include mockery 2015-02-12 12:49:57 -08:00
snipe 2678611c79 Included doctrine for field renaming 2015-02-06 18:42:36 -08:00
snipe 0128505213 Overwriting Smfony YAML deps 2015-02-05 15:50:32 -08:00
snipe 1aeb4de0fa Possible fix for #491 - solving for giticide on package dep 2015-02-05 14:43:01 -08:00
snipe e2ee954592 Updated composer and composer.lock for 4.2 2015-02-04 15:50:54 -08:00
snipe 5e6c4a250a Updated composer lock 2014-11-21 07:34:06 -05:00
snipe 1680d45163 Updated composer lock 2014-10-29 05:38:03 -04:00
snipe e0da7ffe9b Updated composer lock 2014-08-17 04:38:01 -04: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
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 3473ef5fa6 Updated to Laravel 4.1 2014-05-05 21:28:58 -04:00
Jake McGraw 55b54e0a42 added sql migration for qr_code in settings table
added baconqr to composer package list
added admin settings page for qr code
2014-01-28 04:25:58 +00: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 8f235881c5 Added phpunit in require-dev, removed ardent, as we're not actually using it at this point 2013-11-30 22:04:00 -05:00
snipe eddbb7d973 User/assets tie-in 2013-11-16 22:04:52 -05:00
snipe feda21a6e3 Initial laravel import 2013-11-13 01:59:39 -05:00