2535 Commits

Author SHA1 Message Date
snipe 6a08ee1597 Merge remote-tracking branch 'origin/develop' v2.0.1 2015-09-03 19:24:22 -07:00
snipe 7bd5ddc516 Fixes incorrect title for unaccepted assets report 2015-09-01 16:41:47 -07:00
snipe ed05a32f0b Merge pull request #1061 from vsposato/feature/setupCodeception
DO NOT MERGE - testing codeception
2015-08-31 13:57:37 -07:00
snipe 780226a612 Merge pull request #1127 from madd15/patch-1
Fix #1109 - Asset names are missing when viewing user history
2015-08-31 13:57:12 -07:00
snipe ca37c63649 Merge pull request #1128 from madd15/patch-2
Fix #1123 - fix new lines in serial not being recognised
2015-08-31 13:57:04 -07:00
Vincent Sposato c3e4b579d3 Merge branch 'feature/setupCodeception' of github.com:vsposato/snipe-it into feature/setupCodeception 2015-08-28 20:11:29 -04:00
Vincent Sposato 217caf3002 Cleaning up the tweaks to finalize the testing! 2015-08-28 20:11:02 -04:00
Vincent Sposato c870933125 More tweaks to get environment working 2015-08-28 20:11:02 -04:00
Vincent Sposato 3698b107d6 More tweaks 2015-08-28 20:11:01 -04:00
Vincent Sposato 703fd9ba8f More tweaks 2015-08-28 20:11:01 -04:00
Vincent Sposato 9107784746 More tweaks 2015-08-28 20:11:01 -04:00
Vincent Sposato b1776a2816 Another tweak to the config 2015-08-28 20:11:00 -04:00
Vincent Sposato 9f993fa16c Even more tweaks... 2015-08-28 20:11:00 -04:00
Vincent Sposato 7555b97f80 More tweaks, more prayers... 2015-08-28 20:11:00 -04:00
Vincent Sposato 784238f2de Made changes to travis.yml to see if I can get codeception tests passing 2015-08-28 20:10:59 -04:00
Vincent Sposato 0d76ea5050 Putting app.php back to production state 2015-08-28 20:10:59 -04:00
Vincent Sposato 3199dfd1d8 Checking testing issue to see if wrong environment is loading 2015-08-28 20:10:58 -04:00
Vincent Sposato ceac5a59ff More tweaks to the travis 2015-08-28 20:10:58 -04:00
Vincent Sposato 309ce7d0bd Another tweak - getting close 2015-08-28 20:10:58 -04:00
Vincent Sposato 129e45c817 Updated travis yaml to add a permissions change for the storage directory 2015-08-28 20:10:57 -04:00
Vincent Sposato e8f3b27141 Added a sleep statement to make things work possibly 2015-08-28 20:10:57 -04:00
Vincent Sposato 2eb64b3105 Last change for detecting correct environment 2015-08-28 20:10:57 -04:00
Vincent Sposato c48ae56e2f Last tweak before I head to begin drinking heavily... 2015-08-28 20:10:56 -04:00
Vincent Sposato 8d5033c4e5 A tweak to make this work with an app environment variable 2015-08-28 20:10:56 -04:00
Vincent Sposato fd78fd8d24 This is getting old... 2015-08-28 20:10:56 -04:00
Vincent Sposato 1f6874f0af One last tweak - this may be it 2015-08-28 20:10:55 -04:00
Vincent Sposato fdde048f11 More tweaks / changes 2015-08-28 20:10:55 -04:00
Vincent Sposato 8fd50e9524 Adding more debug tweaks 2015-08-28 20:10:55 -04:00
Vincent Sposato f836f88e38 Another tweak getting closer 2015-08-28 20:10:55 -04:00
Vincent Sposato 775239e2ed Almost there... 2015-08-28 20:10:54 -04:00
Vincent Sposato 16d1875157 A change to my previous tweak for background serving 2015-08-28 20:10:54 -04:00
Vincent Sposato af6d9b462b A couple more tweaks to make everything work 2015-08-28 20:10:53 -04:00
Vincent Sposato bfeb4560ca Got some more tweaks, and changes to make things work 2015-08-28 20:10:53 -04:00
Vincent Sposato 194e43d206 More tweaks for debugging 2015-08-28 20:10:53 -04:00
Vincent Sposato 13830b5c09 More tweaking of the travis yaml file trying to get more out of the results 2015-08-28 20:10:52 -04:00
Vincent Sposato 855a155178 Tweaking the configuration to work with travis - attempting hostname tweaks 2015-08-28 20:10:52 -04:00
Vincent Sposato 3975555503 One more stupid mistake in travis yaml file - 2015-08-28 20:10:52 -04:00
Vincent Sposato b1d6d4da37 Fixed stupid mistake in the travis yaml file 2015-08-28 20:10:51 -04:00
Vincent Sposato be402a9d7d Fixed issue in travis yaml file 2015-08-28 20:10:51 -04:00
Vincent Sposato 00aba507f7 Fixed acceptance suite yaml to make it work for travis-ci as well as local testing 2015-08-28 20:10:50 -04:00
Vincent Sposato 0cadab8fc6 Initial changes to allow travis-ci to run codeception tests 2015-08-28 20:10:50 -04:00
Vincent Sposato cc14eee161 Adding setup for Codeception 2015-08-28 20:10:50 -04:00
Vincent Sposato 9d4f7193ae Cleaning up the tweaks to finalize the testing! 2015-08-28 20:04:42 -04:00
Vincent Sposato 2f62925d85 More tweaks to get environment working 2015-08-28 20:01:29 -04:00
Vincent Sposato f40d4dfbf4 More tweaks 2015-08-28 19:53:47 -04:00
Vincent Sposato fd9f6f615f More tweaks 2015-08-28 19:48:40 -04:00
Vincent Sposato c7618bd31e More tweaks 2015-08-28 19:46:37 -04:00
Vincent Sposato 4e831a6396 Another tweak to the config 2015-08-28 19:44:36 -04:00
Vincent Sposato 0492fad3ab Even more tweaks... 2015-08-28 19:42:45 -04:00
Vincent Sposato 1db2a84dcb More tweaks, more prayers... 2015-08-28 19:41:05 -04:00