Commit Graph

  • 9b353ae0d8 Fixes #1150 - added note about lowercasing snipe 2015-09-09 11:47:18 -07:00
  • cbcc43828e Removed required indicator for serial snipe 2015-09-09 11:19:43 -07:00
  • c59122a125 Adding Purchase Cost to AssetImporterCommand James Otter 2015-09-04 16:03:20 +10:00
  • 6a08ee1597 Merge remote-tracking branch 'origin/develop' v2.0.1 snipe 2015-09-03 19:24:22 -07:00
  • 7bd5ddc516 Fixes incorrect title for unaccepted assets report snipe 2015-09-01 16:41:47 -07:00
  • ed05a32f0b Merge pull request #1061 from vsposato/feature/setupCodeception snipe 2015-08-31 13:57:37 -07:00
  • f3e7f06dc5 Merge pull request #1116 from madd15/bootstrap-table-experiment snipe 2015-08-31 13:57:18 -07:00
  • 780226a612 Merge pull request #1127 from madd15/patch-1 snipe 2015-08-31 13:57:12 -07:00
  • ca37c63649 Merge pull request #1128 from madd15/patch-2 snipe 2015-08-31 13:57:04 -07:00
  • c3e4b579d3 Merge branch 'feature/setupCodeception' of github.com:vsposato/snipe-it into feature/setupCodeception Vincent Sposato 2015-08-28 20:11:29 -04:00
  • 217caf3002 Cleaning up the tweaks to finalize the testing! Vincent Sposato 2015-08-28 20:04:42 -04:00
  • c870933125 More tweaks to get environment working Vincent Sposato 2015-08-28 20:01:29 -04:00
  • 3698b107d6 More tweaks Vincent Sposato 2015-08-28 19:53:47 -04:00
  • 703fd9ba8f More tweaks Vincent Sposato 2015-08-28 19:48:40 -04:00
  • 9107784746 More tweaks Vincent Sposato 2015-08-28 19:46:37 -04:00
  • b1776a2816 Another tweak to the config Vincent Sposato 2015-08-28 19:44:36 -04:00
  • 9f993fa16c Even more tweaks... Vincent Sposato 2015-08-28 19:42:45 -04:00
  • 7555b97f80 More tweaks, more prayers... Vincent Sposato 2015-08-28 19:41:05 -04:00
  • 784238f2de Made changes to travis.yml to see if I can get codeception tests passing Vincent Sposato 2015-08-28 19:31:50 -04:00
  • 0d76ea5050 Putting app.php back to production state Vincent Sposato 2015-08-22 13:23:43 -04:00
  • 3199dfd1d8 Checking testing issue to see if wrong environment is loading Vincent Sposato 2015-08-22 13:13:33 -04:00
  • ceac5a59ff More tweaks to the travis Vincent Sposato 2015-08-20 18:38:36 -04:00
  • 309ce7d0bd Another tweak - getting close Vincent Sposato 2015-08-20 18:36:39 -04:00
  • 129e45c817 Updated travis yaml to add a permissions change for the storage directory Vincent Sposato 2015-08-20 18:21:47 -04:00
  • e8f3b27141 Added a sleep statement to make things work possibly Vincent Sposato 2015-08-20 17:46:59 -04:00
  • 2eb64b3105 Last change for detecting correct environment Vincent Sposato 2015-08-15 20:39:31 -04:00
  • c48ae56e2f Last tweak before I head to begin drinking heavily... Vincent Sposato 2015-08-15 20:36:18 -04:00
  • 8d5033c4e5 A tweak to make this work with an app environment variable Vincent Sposato 2015-08-15 20:33:47 -04:00
  • fd78fd8d24 This is getting old... Vincent Sposato 2015-08-15 20:29:18 -04:00
  • 1f6874f0af One last tweak - this may be it Vincent Sposato 2015-08-15 20:26:42 -04:00
  • fdde048f11 More tweaks / changes Vincent Sposato 2015-08-15 20:21:51 -04:00
  • 8fd50e9524 Adding more debug tweaks Vincent Sposato 2015-08-15 20:20:46 -04:00
  • f836f88e38 Another tweak getting closer Vincent Sposato 2015-08-15 20:15:55 -04:00
  • 775239e2ed Almost there... Vincent Sposato 2015-08-15 20:08:20 -04:00
  • 16d1875157 A change to my previous tweak for background serving Vincent Sposato 2015-08-15 20:05:47 -04:00
  • af6d9b462b A couple more tweaks to make everything work Vincent Sposato 2015-08-15 20:03:41 -04:00
  • bfeb4560ca Got some more tweaks, and changes to make things work Vincent Sposato 2015-08-15 20:00:48 -04:00
  • 194e43d206 More tweaks for debugging Vincent Sposato 2015-08-15 19:40:30 -04:00
  • 13830b5c09 More tweaking of the travis yaml file trying to get more out of the results Vincent Sposato 2015-08-15 19:37:43 -04:00
  • 855a155178 Tweaking the configuration to work with travis - attempting hostname tweaks Vincent Sposato 2015-08-15 19:05:01 -04:00
  • 3975555503 One more stupid mistake in travis yaml file - Vincent Sposato 2015-08-15 19:01:03 -04:00
  • b1d6d4da37 Fixed stupid mistake in the travis yaml file Vincent Sposato 2015-08-15 18:59:22 -04:00
  • be402a9d7d Fixed issue in travis yaml file Vincent Sposato 2015-08-15 18:57:10 -04:00
  • 00aba507f7 Fixed acceptance suite yaml to make it work for travis-ci as well as local testing Vincent Sposato 2015-08-15 18:50:46 -04:00
  • 0cadab8fc6 Initial changes to allow travis-ci to run codeception tests Vincent Sposato 2015-08-15 18:48:20 -04:00
  • cc14eee161 Adding setup for Codeception Vincent Sposato 2015-08-15 15:10:17 -04:00
  • 9d4f7193ae Cleaning up the tweaks to finalize the testing! Vincent Sposato 2015-08-28 20:04:42 -04:00
  • 2f62925d85 More tweaks to get environment working Vincent Sposato 2015-08-28 20:01:29 -04:00
  • f40d4dfbf4 More tweaks Vincent Sposato 2015-08-28 19:53:47 -04:00
  • fd9f6f615f More tweaks Vincent Sposato 2015-08-28 19:48:40 -04:00
  • c7618bd31e More tweaks Vincent Sposato 2015-08-28 19:46:37 -04:00
  • 4e831a6396 Another tweak to the config Vincent Sposato 2015-08-28 19:44:36 -04:00
  • 0492fad3ab Even more tweaks... Vincent Sposato 2015-08-28 19:42:45 -04:00
  • 1db2a84dcb More tweaks, more prayers... Vincent Sposato 2015-08-28 19:41:05 -04:00
  • 913e7f7803 Made changes to travis.yml to see if I can get codeception tests passing Vincent Sposato 2015-08-28 19:31:50 -04:00
  • da10a9a2aa Fixes #1130 - don't try to send email if email is not provided with the user snipe 2015-08-28 12:15:07 -07:00
  • cf7ef5e8b0 Merge pull request #1131 from irasnyd/docker-fixes snipe 2015-08-28 10:02:18 -07:00
  • 3f08258bf0 Add LDAP support to Docker image Ira W. Snyder 2015-08-28 09:10:28 -07:00
  • f7ce7060eb Allow Docker users to set the server URL Ira W. Snyder 2015-08-28 09:03:06 -07:00
  • 6e13da6293 Fix #1123 - fix new lines in serial not being recognised madd15 2015-08-28 16:28:17 +09:30
  • dd2b9e15a6 Fix #1109 - Asset names are missing when viewing user history madd15 2015-08-28 14:44:10 +09:30
  • 49e898fd26 Merge pull request #1122 from irasnyd/docker-fixes Brady Wetherington 2015-08-26 14:43:10 -07:00
  • 1927f131aa Fix broken Docker build Ira W. Snyder 2015-08-26 13:30:56 -07:00
  • d3bcf727fb Merge remote-tracking branch 'origin/develop' snipe 2015-08-25 19:48:16 -07:00
  • a4a29be868 Bumped version v2.0 snipe 2015-08-25 19:40:08 -07:00
  • 0074e1abcc Add name text search madd15 2015-08-25 16:37:10 +09:30
  • 3f5dad7789 Change to Bootstrap Table madd15 2015-08-25 16:36:32 +09:30
  • a365cdc2cc Switch to new method madd15 2015-08-25 16:34:51 +09:30
  • 2e7fd02f42 Updated language strings snipe 2015-08-24 12:59:35 -07:00
  • 1d9bf26194 Putting app.php back to production state Vincent Sposato 2015-08-22 13:23:43 -04:00
  • 7a813b2a45 Checking testing issue to see if wrong environment is loading Vincent Sposato 2015-08-22 13:13:33 -04:00
  • da6770c9d9 Fixes #1102 - default currency stored as htmlentities in the DB snipe 2015-08-21 18:11:23 -07:00
  • 7dd2b3d580 Fixes #1104 snipe 2015-08-21 16:00:03 -07:00
  • e5b80ab423 Merge pull request #1105 from aalaily/develop snipe 2015-08-21 12:19:25 -07:00
  • 27efae93ac Add some explanation about the location field. Aladin Alaily 2015-08-21 10:42:37 -04:00
  • 960be7c5ae Replace hardcoded location with a user selection. Aladin Alaily 2015-08-21 10:40:18 -04:00
  • 0b5f83fc56 add a drop down of locations Aladin Alaily 2015-08-21 10:39:45 -04:00
  • 89564b3d2a Merge pull request #1099 from kobie-chasehansen/fix-for-#1098 snipe 2015-08-20 21:39:00 -07:00
  • 610392777b fix Chase Hansen 2015-08-21 00:30:55 -04:00
  • e916fdcc89 Fixes #1092, setting LDAP_OPT_REFERRALS to 0 for Active Directory snipe 2015-08-20 15:54:42 -07:00
  • 70f7f65394 Fixed path for windows snipe 2015-08-20 15:38:50 -07:00
  • 9904f664be More tweaks to the travis Vincent Sposato 2015-08-20 18:38:36 -04:00
  • 8892feea62 Fixed typo snipe 2015-08-20 15:38:35 -07:00
  • 41c257829e Another tweak - getting close Vincent Sposato 2015-08-20 18:36:39 -04:00
  • cf649fcd12 Updated travis yaml to add a permissions change for the storage directory Vincent Sposato 2015-08-20 18:21:47 -04:00
  • 4ac79f5e12 Added a sleep statement to make things work possibly Vincent Sposato 2015-08-20 17:46:59 -04:00
  • c7b0ecfac8 Slack notification for requested assets v2.0-RC-1 snipe 2015-08-19 17:51:35 -07:00
  • 7b0fd2c8f4 Squashed commit of the following: snipe 2015-08-19 17:29:42 -07:00
  • a2bd4250cf Ignore LDAP config snipe 2015-08-19 17:26:08 -07:00
  • d47198086f Added notes search to licenses snipe 2015-08-19 17:23:55 -07:00
  • 89f7f50901 Merge pull request #1074 from mtucker6784/develop snipe 2015-08-19 17:16:53 -07:00
  • 2aac977d57 Merge pull request #1072 from madd15/bootstrap-table-experiment snipe 2015-08-19 17:16:31 -07:00
  • 8339dd3db2 Fixes #1089 - checkout button on accessory view page snipe 2015-08-19 17:13:14 -07:00
  • e63d62d2c8 Fixes #1083 snipe 2015-08-19 12:33:16 -07:00
  • 45c4624d5f Fixes #1081 snipe 2015-08-19 11:14:03 -07:00
  • a27a98f4b3 Fixes #1081- include asset name on checkout snipe 2015-08-19 11:13:51 -07:00
  • 70a7a11324 Switched to user list snipe 2015-08-19 10:54:50 -07:00
  • e8f11919f7 Fixes #1077 - ordering of dropdown menus snipe 2015-08-19 10:43:52 -07:00
  • 1d976ff926 Fixes #1078 snipe 2015-08-19 10:23:01 -07:00
  • 5aff3d9380 remove search explode madd15 2015-08-18 16:17:46 +09:30