Commit Graph

  • aa72b9c107 Added a button to the LDAP functionality Aladin Alaily 2015-08-13 13:27:05 -04:00
  • 176469294b Added routes to LDAP Aladin Alaily 2015-08-13 13:20:30 -04:00
  • afd94ff52a Added functions for LDAP Aladin Alaily 2015-08-13 13:20:13 -04:00
  • b2c2c1ee15 LDAP Sync Aladin Alaily 2015-08-13 13:14:11 -04:00
  • b004a7448b Merge remote-tracking branch 'upstream/develop' into develop Aladin Alaily 2015-08-13 12:26:10 -04:00
  • c5e5930c1b Make sure lock passwords isn't true before emailing snipe 2015-08-13 00:54:57 -07:00
  • ed2d7310f8 Fixed unsuspend icon snipe 2015-08-13 00:39:52 -07:00
  • 547de2b9e3 Placeholder phpunit test snipe 2015-08-13 00:26:26 -07:00
  • 58abd15d93 Require_once (again) to try to handle local phpunit testing snipe 2015-08-12 23:55:53 -07:00
  • dd60976d51 Set errors to true snipe 2015-08-12 23:52:44 -07:00
  • 07b045007b Revert "Reverting to phpunit again" snipe 2015-08-12 23:39:16 -07:00
  • 1f7e0a2893 Revert "More donking with testing" snipe 2015-08-12 23:37:37 -07:00
  • 1159cdeab2 Reverting to phpunit again snipe 2015-08-12 23:32:38 -07:00
  • 7f3ceea77b More donking with testing snipe 2015-08-12 23:30:27 -07:00
  • 1d89b78315 Nicer validation display snipe 2015-08-12 22:34:44 -07:00
  • 463469e7c7 Added validation for notes snipe 2015-08-12 22:34:35 -07:00
  • c839f0cbc8 Added ability to select status type snipe 2015-08-12 22:33:56 -07:00
  • a832346bfb Added statuslabel type helper snipe 2015-08-12 22:33:31 -07:00
  • 3d77666ad1 Nicer required field display snipe 2015-08-12 21:55:23 -07:00
  • 6ad7a9bb70 Replaced missing route from previous cleanup snipe 2015-08-12 21:50:35 -07:00
  • 7fa9e49880 Activate user created on modal create snipe 2015-08-12 21:50:04 -07:00
  • e2e070d5e1 Smaller min-height for tighter layout snipe 2015-08-12 21:25:48 -07:00
  • 9f4fca4238 Fixes #522 snipe 2015-08-12 21:25:36 -07:00
  • b366dec983 Fix display for NULL entries created by previous model modal snipe 2015-08-12 21:09:32 -07:00
  • e91c1942f8 Save modelno in API snipe 2015-08-12 20:58:44 -07:00
  • 6f6b74b82c Add modelno to modal snipe 2015-08-12 20:58:30 -07:00
  • 315f02905a Pull all lists into helper functions for consistency snipe 2015-08-12 20:58:18 -07:00
  • 738e253375 Fixed Slack notifier snipe 2015-08-12 18:37:48 -07:00
  • 358cd1eaf9 More consistent formatting for maintenances snipe 2015-08-12 18:24:38 -07:00
  • e4284d20f3 Fixed error reporting snipe 2015-08-12 18:19:59 -07:00
  • f7874ec106 Refactored assets controller and model for cleaner code snipe 2015-08-12 18:19:53 -07:00
  • ad802cfead Squashed commit of the following: snipe 2015-08-12 14:45:43 -07:00
  • 41838f1e89 Trying worker-linux-docker- because why the hell not snipe 2015-08-11 20:26:44 -07:00
  • 8624931a88 Comment out initial test for now snipe 2015-08-11 20:23:16 -07:00
  • 8840e57ae7 Trying 'testing-worker-linux*' as hostname since nothing else is working snipe 2015-08-11 20:23:00 -07:00
  • 16cb4f6d05 Removed AlisonMPB hostname snipe 2015-08-11 19:54:14 -07:00
  • aa304375a6 Set default key snipe 2015-08-11 19:54:03 -07:00
  • b22789aa59 Unbreaking the dashboard :( snipe 2015-08-11 19:44:02 -07:00
  • f93e140ce1 Updated changelog snipe 2015-08-11 19:43:51 -07:00
  • de238f1551 Set testing hostname snipe 2015-08-11 19:00:08 -07:00
  • 4247904f19 Resolving hostname problems snipe 2015-08-11 18:52:42 -07:00
  • 75852bdb8b Derp snipe 2015-08-11 18:40:16 -07:00
  • 5cc1e7d3fe Trying to set hostname back so tests won't fail snipe 2015-08-11 18:37:37 -07:00
  • a98f4883be Merge branch 'develop' of github.com:snipe/snipe-it into JoeFaux-AccessoryReport snipe 2015-08-11 18:27:35 -07:00
  • d5a709a836 Improved testing stuff snipe 2015-08-11 18:27:28 -07:00
  • 4243270e7d Merge pull request #1049 from JoeFaux/AccessoryReport snipe 2015-08-11 17:31:37 -07:00
  • b576fce1f7 Modified files for accessory report. root 2015-08-11 16:35:18 -07:00
  • d7313543ef Changes to support an accessory report. root 2015-08-11 16:32:48 -07:00
  • 2636474120 Improved Welcome test snipe 2015-08-11 15:57:58 -07:00
  • 0c3b55a8b5 Upgrade to newer travis infrasructure snipe 2015-08-11 15:49:25 -07:00
  • d7dd35a2f2 Removed generated test files accidentally commited snipe 2015-08-11 15:30:43 -07:00
  • 0c8e3809f2 Starter acceptance tests snipe 2015-08-11 15:29:44 -07:00
  • 4538bca29f Allow 0 qty consumable snipe 2015-08-11 14:34:54 -07:00
  • eeda4366a3 Removed cruft from debugging snipe 2015-08-11 14:32:14 -07:00
  • fc31a828bc Exclude Snipe-IT from search engines snipe 2015-08-11 14:19:51 -07:00
  • 88e10516a9 Updated footer links snipe 2015-08-11 14:19:13 -07:00
  • 481b905331 Fixes #1045 - allow 0 value for accessories snipe 2015-08-11 14:01:13 -07:00
  • 959df613ae Updated language strings snipe 2015-08-11 13:39:09 -07:00
  • c476eda868 Removed link on location until location view is fixed snipe 2015-08-11 13:20:58 -07:00
  • b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-08-11 13:20:25 -07:00
  • 242e6ff030 Updated composer lock snipe 2015-08-11 12:40:13 -07:00
  • f026f886ae Removed unique constraint on model no snipe 2015-08-11 12:37:57 -07:00
  • 936d7dab1b Fixes #1043 snipe 2015-08-11 12:36:03 -07:00
  • 38d774eb6a Merge pull request #1033 from vsposato/feature/865_fixIssuesFromSnipe snipe 2015-08-11 11:57:56 -07:00
  • d363a0deec Merge branch 'feature/865_fixIssuesFromSnipe' of github.com:vsposato/snipe-it into feature/865_fixIssuesFromSnipe Vincent Sposato 2015-08-07 18:52:58 -04:00
  • 3ebbd030e7 Fixed issue with Asset model Vincent Sposato 2015-08-07 18:52:19 -04:00
  • 7ae226635f First rough pass at asset acceptance report Brady Wetherington 2015-08-06 01:55:17 -07:00
  • afbe23c214 Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur Removed the artisan command Vincent Sposato 2015-08-05 20:50:35 -04:00
  • 7f91f6e349 Completed the changes from uberbrady to make the report work correctly Vincent Sposato 2015-08-07 18:00:23 -04:00
  • 6db7001dd5 Merge pull request #1 from uberbrady/feature_865_plus_denorm Vincent Sposato 2015-08-07 17:39:47 -04:00
  • 9a763db2d9 Revert "added a simple change" Aladin Alaily 2015-08-06 23:49:02 -04:00
  • 99a591c970 added a simple change Aladin Alaily 2015-08-06 23:47:36 -04:00
  • 9540db424a Fixes #948 - validate on model name+modelno+manufacturer combination snipe 2015-08-06 05:58:50 -07:00
  • 84d81184fa Fixes #1009 - Add MAC address to search snipe 2015-08-06 05:13:27 -07:00
  • 3c0cc94652 Fixed route snipe 2015-08-06 04:53:23 -07:00
  • 5dcc795aa2 Fixes #1024 - delete option added to user dropdown snipe 2015-08-06 04:33:34 -07:00
  • 106ed6a9a0 Added location to user listing snipe 2015-08-06 03:59:23 -07:00
  • daff0dbccb First rough pass at asset acceptance report Brady Wetherington 2015-08-06 01:55:17 -07:00
  • 56f490cef9 Merge pull request #1029 from madd15/patch-4 snipe 2015-08-05 18:06:17 -07:00
  • 145cf1093c Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur Removed the artisan command Vincent Sposato 2015-08-05 20:50:35 -04:00
  • 336858e4ed Fix #1022 - Missing Lang on viewing deleted user madd15 2015-08-06 09:33:53 +09:30
  • e3c1a9f80c Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 snipe 2015-08-05 13:57:29 -07:00
  • 66991ea663 Fixes #1018 - allow name re-use if deleted snipe 2015-08-05 13:57:04 -07:00
  • e253d611b4 Merge pull request #1027 from balticer/fix-validation-ampersand-and-sharp-s snipe 2015-08-05 13:27:24 -07:00
  • 7e76d8858e Modifying validator to support & and ß Kai Korla 2015-08-05 18:13:47 +02:00
  • dc265ba2a8 Fixed back button on user create snipe 2015-08-04 20:48:54 -07:00
  • eb00acddfd Trying to fix the broken migration snipe 2015-08-04 14:55:10 -07:00
  • 449ad4f86b Fixes #1014 - error if no assets are unaccepted snipe 2015-08-04 13:22:13 -07:00
  • 77bff707fa English is hard :( snipe 2015-08-04 12:54:45 -07:00
  • 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-08-04 12:51:35 -07:00
  • fda6d60225 Merge pull request #1011 from goetzk/route-not-to snipe 2015-08-04 12:46:31 -07:00
  • 3c730c691b Fixes #1010 - better errors on large file uploads snipe 2015-08-04 12:45:17 -07:00
  • cf4f178485 Change to using route in error message Karl Goetz 2015-08-04 10:40:40 +10:00
  • b20fecc2de Make thread_id default null snipe 2015-08-03 12:35:54 -07:00
  • 03e294b6d0 Merge pull request #1006 from mtucker6784/patch-1 snipe 2015-08-03 12:23:13 -07:00
  • 85ba7c3a15 Create install.sh Michael T 2015-08-02 20:59:04 -07:00
  • 889fa6b74d Merge pull request #1001 from vsposato/feature/865_AssetsNotAcceptedReport snipe 2015-08-02 11:06:42 -07:00
  • e63a07800f Merge pull request #994 from madd15/patch-4 snipe 2015-08-02 11:05:07 -07:00
  • 4082957c85 Added phpdocs to the model Vincent Sposato 2015-08-01 14:41:09 -04:00
  • 24edf81b27 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport Vincent Sposato 2015-08-01 12:29:29 -04:00