Commit Graph

  • d93639d480 Updated README for 4.1 snipe 2014-05-05 21:38:18 -04:00
  • 70fb2d98a0 Merge remote-tracking branch 'origin/develop' snipe 2014-05-05 21:36:16 -04:00
  • 34960e26cc Merge pull request #138 from refinery29/qr-codes-ftw snipe 2014-05-05 21:31:45 -04:00
  • 3473ef5fa6 Updated to Laravel 4.1 snipe 2014-05-05 21:28:58 -04:00
  • 2fc197623a Update to Laravel 4.1 snipe 2014-05-05 21:21:56 -04:00
  • 7bc681dfef Bumped to laravel 4.1 snipe 2014-05-05 20:38:02 -04:00
  • af603f0380 make text below asset tags configurable Jake McGraw 2014-05-03 19:58:39 +00:00
  • 1d10425d19 Merge pull request #135 from Zyg0te/develop snipe 2014-04-29 17:21:03 -04:00
  • 5690e9ce1f Fixed code indentation for Apache virtualhost example Zyg0te 2014-04-24 11:25:55 +02:00
  • 792e45bd12 Adjusted zip and state field length requirements Zyg0te 2014-04-24 11:20:20 +02:00
  • 5a798110ad Merge branch 'refs/heads/develop' snipe 2014-04-22 02:26:54 -04:00
  • ad8b95f07c Merge pull request #130 from FleischKarussel/patch-1 snipe 2014-04-04 14:07:50 -04:00
  • 729f94331f vhost.conf for linux mod_rewrite enabled FleischKarussel 2014-04-04 13:17:31 +02:00
  • faa9b95a6f Merge pull request #128 from FleischKarussel/patch-1 snipe 2014-04-03 15:11:03 -04:00
  • 0e633efca2 https for getcomposer and github downloads FleischKarussel 2014-04-03 17:10:41 +02:00
  • b2015e7e08 Merge pull request #127 from domtancredi/develop snipe 2014-03-18 17:07:12 -04:00
  • efad5db082 Fix for broken datatables in upgrading to v2.2 Dom Tancredi 2014-03-16 15:00:30 -04:00
  • 9423c9e9d3 Merge pull request #124 from DGAzr/develop snipe 2014-02-11 14:31:49 -05:00
  • 366e7d01a3 Adding escape to the dash so that it is a literal rather than a range Dustan Ashley 2014-02-11 07:24:27 -05:00
  • 869cd3ea14 Merge branch 'refs/heads/develop' snipe 2014-01-28 23:24:07 -05:00
  • a2f068eb8f Missed one v0.3.0-alpha snipe 2014-01-28 20:28:31 -05:00
  • 580590b4c0 Fixed === to == (PHP is loosely typed) snipe 2014-01-28 20:24:37 -05:00
  • 5ec87e81b1 Handle logs/views dir better snipe 2014-01-28 18:05:15 -05:00
  • 60d94eea04 Changes serial to text area, allow new lines. Fixes #118 snipe 2014-01-28 17:42:20 -05:00
  • 78e3171fa6 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2014-01-28 17:41:35 -05:00
  • d03d692868 Merge pull request #121 from buzzedword/feature/default-directories-in-storage snipe 2014-01-28 14:37:46 -08:00
  • 4b4eefb4cc Added default folder structure for laravel. Daniel Garcia 2014-01-28 17:35:57 -05:00
  • 940cf7b227 Merge pull request #120 from buzzedword/feature/patch-1 snipe 2014-01-28 14:02:35 -08:00
  • 3e47e47add Add logs and views folder to repo, omit additional files. Daniel Garcia 2014-01-28 16:59:10 -05:00
  • 8b3f409703 Added logs and views dir snipe 2014-01-28 16:56:33 -05:00
  • d497a84245 Merge pull request #119 from refinery29/qr-codes-ftw snipe 2014-01-28 11:52:22 -08:00
  • 01612652b5 use same dimensions in render and display Jake McGraw 2014-01-28 05:33:03 +00:00
  • 5cb0a1465e added QR code route for asset controller added QR code inclusion on asset controller getView action/template Jake McGraw 2014-01-28 05:16:57 +00:00
  • 55b54e0a42 added sql migration for qr_code in settings table added baconqr to composer package list added admin settings page for qr code Jake McGraw 2014-01-28 04:25:58 +00:00
  • a3eb61b307 Cleaned up gitignore snipe 2014-01-14 18:41:07 -05:00
  • 9e5e9ee96b Minor formatting change snipe 2014-01-14 18:34:36 -05:00
  • 92347c6707 Full path to avoid any confusion snipe 2014-01-14 18:26:52 -05:00
  • dc5ea81d34 Backticks are hard. snipe 2014-01-14 18:23:56 -05:00
  • 9c369d72e1 Fixed typo snipe 2014-01-14 18:20:41 -05:00
  • ea0560e1ce Updated readme for #116 snipe 2014-01-14 18:19:22 -05:00
  • cd62be0de0 Minor div fix snipe 2014-01-04 18:35:06 -05:00
  • e186bb115d Merge branch 'refs/heads/develop' snipe 2014-01-04 18:28:05 -05:00
  • 7a3f6fb714 Merge branch 'refs/heads/feeva-localization' into develop snipe 2014-01-04 18:25:57 -05:00
  • 1ed761c97f Merge branch 'localization' of github.com:feeva/snipe-it into feeva-localization snipe 2014-01-04 18:25:25 -05:00
  • a193e3118d Merge pull request #113 from feeva/issue58-modal-failure snipe 2014-01-04 15:09:44 -08:00
  • e9a675a9a4 Merge branch 'issue58-modal-failure' of https://github.com/feeva/snipe-it into issue58-modal-failure feeva 2014-01-04 18:24:42 +00:00
  • 439a139d7c Issue #58 - Modal stops passing title/message/href through if modal is canceled feeva 2014-01-04 18:23:52 +00:00
  • 40d6ad09ae Hard-coded English text strings should be moved to their language files feeva 2014-01-04 17:55:19 +00:00
  • 3acd88d451 Issue #58 - Modal stops passing title/message/href through if modal is canceled mars 2013-12-26 02:51:01 +09:00
  • 8806208e83 More gracefully handle TokenMismatchException errors snipe 2013-12-13 14:34:09 -05:00
  • 5ba487d74e Removed CSRF filters - they already run elsewhere snipe 2013-12-13 14:33:42 -05:00
  • 7c12d5fed0 Merge branch 'refs/heads/develop' snipe 2013-12-12 01:52:59 -05:00
  • f6717d9f49 Added manager drop down for users, manager name in index snipe 2013-12-12 01:49:38 -05:00
  • 3ec6df492d Added manager_id to DB, install script snipe 2013-12-12 01:12:42 -05:00
  • cdddbcf695 Using URL::previous to determine back button address snipe 2013-12-12 00:50:56 -05:00
  • 483f9b1289 Slight layout tweak for smaller buttons snipe 2013-12-10 17:13:33 -05:00
  • b2912195ac Added EOL to report view snipe 2013-12-10 14:56:16 -05:00
  • 19b524e113 Merge branch 'refs/heads/develop' snipe 2013-12-10 13:01:05 -05:00
  • 1cec46f997 Updated comment, made save on edit return to listing page snipe 2013-12-10 05:17:15 -05:00
  • 4468cbd096 Fixes #112 snipe 2013-12-10 04:48:40 -05:00
  • 4c3e2a9a68 DB seeding for #112 snipe 2013-12-10 03:52:23 -05:00
  • da9f28fbe7 DB migration for #112 snipe 2013-12-10 03:48:20 -05:00
  • 8ac394bd3f Escaping parens snipe 2013-12-06 12:36:43 -05:00
  • ff22ee8292 Merge branch 'refs/heads/develop' snipe 2013-12-06 06:40:43 -05:00
  • d36409d037 Layout improvements snipe 2013-12-06 05:18:04 -05:00
  • 7e9be9b935 Truncate serial on index view at 40, UX improvements snipe 2013-12-06 05:07:26 -05:00
  • dd701d253c Set values to null if they are 0 snipe 2013-12-06 04:59:24 -05:00
  • 78b3a0e1f9 Make license fields nullable migration snipe 2013-12-06 04:58:53 -05:00
  • 1e9a81f59d Cleanup for licenses view page snipe 2013-12-06 04:58:37 -05:00
  • 432f44118f Fixed FK in licenses model snipe 2013-12-06 04:58:21 -05:00
  • b697c77cd8 Fixing error when no depreciation snipe 2013-12-06 02:50:14 -05:00
  • 23ce0a9e67 Missing closing divs snipe 2013-12-06 02:46:38 -05:00
  • 0cd6c60fd9 Cleaner license UI snipe 2013-12-06 02:41:53 -05:00
  • 82de635a75 Fixed invalid seed data snipe 2013-12-06 02:10:08 -05:00
  • 299393aa26 Set the log to track the license_id instead of seat id snipe 2013-12-06 02:09:46 -05:00
  • 7bc9a53b13 Fixed error when user is invalid snipe 2013-12-06 02:09:23 -05:00
  • c1bf27fcba Better comments snipe 2013-12-05 22:14:24 -05:00
  • d72daf14ff Added filename to log seeder for mysql strict mode snipe 2013-12-04 12:14:02 -05:00
  • c5678414ae Groundwork for #11 snipe 2013-12-04 12:13:23 -05:00
  • 329980c6c6 Unsquished blade for group display snipe 2013-12-04 12:05:37 -05:00
  • 5fb649b59e Fixed error message layout snipe 2013-12-03 19:26:01 -05:00
  • 900a441908 Merge branch 'refs/heads/develop' snipe 2013-12-03 13:32:20 -05:00
  • 19de8a15cf Allow numbers signs, parens snipe 2013-12-03 13:31:42 -05:00
  • ab99e6a64f Changed alpha_dash to alpha_space for Axure licenses snipe 2013-12-03 06:50:58 -05:00
  • 5dc9c30bca Duplicate field snipe 2013-12-03 06:34:05 -05:00
  • 9308059230 Can't enforce unique here, or it will see itself and fail snipe 2013-12-03 06:26:27 -05:00
  • ac9dfe2edc DESC? WTF? Hurr. snipe 2013-12-03 06:14:02 -05:00
  • ae26b683fb Merge branch 'refs/heads/develop' snipe 2013-12-03 06:08:44 -05:00
  • cf9cd1a7a0 Allow slashes snipe 2013-12-03 06:08:05 -05:00
  • 194150bbf0 Hacky shit to fix pagination weirdness - will come back to this snipe 2013-12-03 06:02:29 -05:00
  • b97f5fc043 Serial should be unique for hardware snipe 2013-12-03 05:46:19 -05:00
  • aaebaa8d36 Bugfix to put custom title in the page title snipe 2013-12-03 05:41:03 -05:00
  • ef4743ed49 Specifying feature branches snipe 2013-12-03 05:40:44 -05:00
  • 6737a9a91a Added quick create menu to topnav snipe 2013-12-03 05:14:56 -05:00
  • 965d329ae5 Order by name in user drop down list snipe 2013-12-03 04:53:07 -05:00
  • e4fd2373fb Changed table to show asset tag snipe 2013-12-03 04:52:51 -05:00
  • e784854e05 Changed column from asset name to model snipe 2013-12-03 04:24:34 -05:00
  • c4c4db201f Changed th sizes snipe 2013-12-03 04:07:54 -05:00
  • 33df88d434 Only print name if there is one snipe 2013-12-03 04:07:34 -05:00
  • f02f4341ca Tweaked table layout snipe 2013-12-03 03:40:28 -05:00