Commit Graph

  • 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode snipe 2015-06-15 11:20:09 -07:00
  • d0189fb076 Added consumables to user matrix for #782 snipe 2015-06-09 20:05:24 -07:00
  • e4517a8782 Removed checkin for #782, since that doesn't exist in consumables snipe 2015-06-09 19:58:22 -07:00
  • 19604480bb Consumables section snipe 2015-06-09 19:50:34 -07:00
  • 704d66b6f3 Raw DB migration for nullable user notes snipe 2015-06-09 17:45:11 -07:00
  • 6315c343a7 Add consumables table snipe 2015-06-09 17:44:59 -07:00
  • 766b4b901f Fixes #822 - make user notes field nullable default null snipe 2015-06-09 17:34:52 -07:00
  • f671c89b14 Composer update for bin path snipe 2015-06-09 17:31:28 -07:00
  • 03bd1498e8 Added codeception snipe 2015-06-09 16:52:08 -07:00
  • f743bacd0f Updated language strings snipe 2015-06-09 16:14:37 -07:00
  • 309158352e Added Korean translation snipe 2015-06-09 16:14:28 -07:00
  • 2540ac09ec Fixes #822 snipe 2015-06-09 16:02:10 -07:00
  • 5a6fe6ccf8 Fixes #806 snipe 2015-06-09 02:20:00 -07:00
  • af2decea9d Merge remote-tracking branch 'origin/master' into 1.3.0 snipe 2015-06-09 02:10:29 -07:00
  • c69038d3ae Fixes #836 snipe 2015-06-09 02:00:55 -07:00
  • 9ea8316d74 Merge remote-tracking branch 'origin/develop' into 1.3.0 snipe 2015-06-01 17:52:39 -07:00
  • 5939e46eee Bumped version for fixed 1.2.7 snipe 2015-06-01 17:52:03 -07:00
  • a8a0a59982 Fixes #825 - title bar spacing issue snipe 2015-06-01 17:51:20 -07:00
  • 73a08c031c Fixes #818, and randomizes password for dummy user v1.2.7-master snipe 2015-05-27 11:45:44 -07:00
  • 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 snipe 2015-05-27 11:17:14 -07:00
  • 5997dd9387 Missing string for action snipe 2015-05-27 11:13:42 -07:00
  • 9cf03e2e60 Better escaping on activity report page snipe 2015-05-27 10:16:06 -07:00
  • c77e7bf725 Merge pull request #816 from tomcastleman/develop snipe 2015-05-24 10:49:41 -07:00
  • 7a4299c724 Reassignable should default to true on create form Tom Castleman 2015-05-24 13:34:53 +01:00
  • b9b0239837 Merge pull request #813 from tomcastleman/develop-1 snipe 2015-05-22 11:51:50 -07:00
  • a43ae71afd Merge pull request #812 from tomcastleman/develop snipe 2015-05-22 11:50:44 -07:00
  • c4339a5d94 Merge branch 'master' into develop Tom Castleman 2015-05-22 14:37:01 +01:00
  • b161a38e9b Add licenses.reassignable migration Tom Castleman 2015-05-22 12:48:50 +01:00
  • 735268034d Merge pull request #809 from tomcastleman/patch-1 snipe 2015-05-21 18:56:49 -07:00
  • aad473486f Merge pull request #798 from DanielNemanic/patch-8 snipe 2015-05-21 18:56:36 -07:00
  • 08970f2b7b Removed debugbar:publish Tom Castleman 2015-05-21 16:59:20 +01:00
  • 212f09dd31 Fixes #806 snipe 2015-05-19 19:39:05 -07:00
  • 8334e7b863 Removed extra open sans call snipe 2015-05-19 19:37:34 -07:00
  • a80d67c1ff Escaping on labels snipe 2015-05-19 19:37:22 -07:00
  • 7c95f4231e Fixes #799 - missing text in file delete confirmation snipe 2015-05-14 20:52:19 -07:00
  • 6e8ad5b085 Generating Asset Name to Label Print Daniel Nemanic 2015-05-13 10:51:06 +02:00
  • 145d386ce2 Updated lock file snipe 2015-05-12 15:13:18 -07:00
  • 496a768013 Fixes #795 - add model name if no asset name snipe 2015-05-11 19:23:11 -07:00
  • 7415a5898f Twiddling column widths snipe 2015-05-08 11:39:51 -07:00
  • f1486bfee3 Nicer locations listing layout snipe 2015-05-07 19:20:05 -07:00
  • bc8521043b Bumped version snipe 2015-05-07 18:21:48 -07:00
  • 3597d71230 Eager load assigned asset locations snipe 2015-05-07 18:21:39 -07:00
  • d92e2eaebc Method for assigned asset locations snipe 2015-05-07 18:21:27 -07:00
  • 8cdea8a384 Fix for location totals snipe 2015-05-07 18:21:10 -07:00
  • 4457c7aec0 Removed extra commented stuff snipe 2015-05-07 18:20:58 -07:00
  • 95279f885b Fixes #759 - populate form with parent location info snipe 2015-05-07 01:51:46 -07:00
  • 94bfab762b Merge pull request #791 from DanielNemanic/patch-7 snipe 2015-05-07 00:39:53 -07:00
  • 20d8ad29e5 Updating Dashboard Link URL Daniel Nemanic 2015-05-07 09:38:16 +02:00
  • 75644eb894 Dashboard points to app url snipe 2015-05-07 00:30:20 -07:00
  • 2d7a348ab7 Fixed multi-level array nesting for locations snipe 2015-05-07 00:15:44 -07:00
  • 139dd13392 Super janky miulti-level menu on create - TODO: Fix this ish. snipe 2015-05-04 18:13:26 -07:00
  • 2f52369d07 Fixed location string snipe 2015-05-04 15:13:04 -07:00
  • aab52d0850 Fix for strict mode with location parent snipe 2015-05-04 15:10:57 -07:00
  • 71febc1c81 Added accessories and location snipe 2015-05-04 13:31:47 -07:00
  • 68d8b10b22 Changed text to icons for more compacted view snipe 2015-05-04 13:31:38 -07:00
  • 0d2333203a Display default location snipe 2015-05-04 13:08:38 -07:00
  • 3881e2e83e Fixes #784 - add "create accessory" to topnav snipe 2015-05-04 11:24:25 -07:00
  • 51eeee09d7 Fixes bug in #736 for new fields snipe 2015-05-04 11:14:38 -07:00
  • c487beeaca Asset counter for #759 (needs more work) snipe 2015-05-04 03:05:22 -07:00
  • f463cd6c8d Fixes for #759 - location heirarchy snipe 2015-05-04 02:50:42 -07:00
  • 5e7a4e8193 Fixes #599 - show groups in user list snipe 2015-05-04 01:44:49 -07:00
  • c8870ddcab Fixes #736 - more fields in bulk edit snipe 2015-05-04 01:30:20 -07:00
  • bbdbd5397c Check for valid asset before attempting to get name snipe 2015-05-04 00:46:26 -07:00
  • 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5 v1.2.7 snipe 2015-05-02 12:28:34 -07:00
  • 126121065c Merge branch 'patch-3' of https://github.com/DanielNemanic/snipe-it into develop snipe 2015-05-02 12:27:40 -07:00
  • 48ccf844fa Merge pull request #748 from DanielNemanic/patch-4 snipe 2015-05-02 12:24:11 -07:00
  • 7556f989df Accessories Slack integration snipe 2015-04-30 20:53:44 -07:00
  • 8207597a58 Slack integration for Licenses snipe 2015-04-30 20:37:23 -07:00
  • 1137768f84 Escape notes snipe 2015-04-30 19:23:41 -07:00
  • 5f6925858b Richer slack integrations snipe 2015-04-30 18:54:34 -07:00
  • 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses snipe 2015-04-30 18:17:44 -07:00
  • c95af84452 Fixes #750 because @uberbrady can't code snipe 2015-04-30 17:14:31 -07:00
  • 62b5ec5b02 Slack field validation and placeholder text snipe 2015-04-30 16:58:33 -07:00
  • 9f9a9a51b3 Fixes #774 - layout issue on profiles snipe 2015-04-29 23:21:04 -07:00
  • a2dd2509fd Updated language strings for slack v1.2.7-beta snipe 2015-04-29 18:01:43 -07:00
  • 3c00f38a0f Slack integration for asset checkin/checkout snipe 2015-04-29 17:38:22 -07:00
  • 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost snipe 2015-04-29 16:31:38 -07:00
  • 3b491d4a6b Fixes #757 - use showAssetName method snipe 2015-04-29 16:22:25 -07:00
  • 179ef7f060 Removed unsupport languages snipe 2015-04-29 16:17:13 -07:00
  • a0fce2e0fb Fixes #766 snipe 2015-04-29 16:14:08 -07:00
  • bce06543b2 Merge remote-tracking branch 'origin/master' into develop snipe 2015-04-29 15:28:38 -07:00
  • 9841dbbbc4 Fixed HTML so settings are saved correctly snipe 2015-04-29 15:28:11 -07:00
  • d61506fcf7 Fixes for #766 - add activity report snipe 2015-04-29 14:50:12 -07:00
  • 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category snipe 2015-04-29 13:54:54 -07:00
  • b4b273fc43 Fixed typo snipe 2015-04-28 16:42:08 -07:00
  • 495201ebf7 Merge branch 'develop' snipe 2015-04-28 14:48:19 -07:00
  • e6d0d83070 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-04-28 13:41:17 -07:00
  • 564d5fcb31 Merge pull request #770 from southwolf/fix-concat-space snipe 2015-04-28 13:20:48 -07:00
  • c0a58897c0 Re-re-trying --prefer-source --no-interaction snipe 2015-04-28 13:19:13 -07:00
  • 1c2e5ecc0f Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error Fei Song 2015-04-28 15:19:00 +08:00
  • 6109368799 Merge pull request #761 from ivarne/patch-1 snipe 2015-04-21 00:42:59 -07:00
  • f8ea40d3d1 Delete .bash_history Ivar Nesje 2015-04-21 09:11:43 +02:00
  • 2fb65c5682 Merge pull request #758 from madd15/patch-1 snipe 2015-04-16 23:33:47 -07:00
  • c6419e1c07 Update link to Documentation in footer madd15 2015-04-17 16:01:44 +09:30
  • ba58e718b4 Resolved some deps from vendor changes snipe 2015-04-16 22:18:35 -07:00
  • 30c8fffa0a Loading string snipe 2015-04-15 09:51:48 -07:00
  • a560d4db31 Merge pull request #754 from DanielNemanic/patch-6 snipe 2015-04-15 09:43:40 -07:00
  • fe72139410 Update view.blade.php Daniel Nemanic 2015-04-15 09:05:02 +02:00
  • 6f9daa28eb Update view.blade.php Daniel Nemanic 2015-04-15 08:53:50 +02:00
  • d408bb9086 Update user-profile.css Daniel Nemanic 2015-04-14 15:01:38 +02:00