Commit Graph

15 Commits

Author SHA1 Message Date
snipe 41838f1e89 Trying worker-linux-docker- because why the hell not 2015-08-11 20:26:44 -07:00
snipe 8840e57ae7 Trying 'testing-worker-linux*' as hostname since nothing else is working 2015-08-11 20:23:00 -07:00
snipe de238f1551 Set testing hostname 2015-08-11 19:00:08 -07:00
snipe 0c8e3809f2 Starter acceptance tests 2015-08-11 15:29:44 -07:00
Vincent Sposato 215c21891b Updated start file to include my staging site 2015-07-20 21:16:25 -04:00
Vincent Sposato 6dae07be7d Updated start.php to reflect my local configuration 2015-07-20 21:00:45 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
2015-07-20 16:12:35 -07:00
Vincent Sposato 59e72cd1c2 Updated start file to include my staging site 2015-06-28 07:40:42 -04:00
Vincent Sposato 6cff270d3d Updated start.php to reflect my local configuration
Also updated composer packages to latest versions
2015-06-26 17:13:03 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 71c0c01430 Updated environmental config for hostname-only 2014-05-05 22:02:32 -04:00
snipe 3473ef5fa6 Updated to Laravel 4.1 2014-05-05 21:28:58 -04: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