Commit Graph

  • dee4baf7dd Updated language strings snipe 2015-02-24 02:11:10 -08:00
  • e04ac89c5a Added expiring warrantee alerts snipe 2015-02-24 02:07:33 -08:00
  • 3fa1bc5c3f Revert "Update README.md" Tamás Roncsák 2015-02-24 09:57:13 +01:00
  • 254f4b5f3e Revert "Revert "Revert "Enhance further install without dummy data""" Tamás Roncsák 2015-02-24 09:56:23 +01:00
  • 132578bfe3 Revert "set filemode" Tamás Roncsák 2015-02-24 09:32:31 +01:00
  • c2a1e39b54 set filemode Tamás Roncsák 2015-02-24 09:29:58 +01:00
  • c41f4e9203 Update README.md Tamás Roncsák 2015-02-24 08:45:38 +01:00
  • c54615a85f Update CONTRIBUTING.md Tamás Roncsák 2015-02-24 08:44:40 +01:00
  • a7d953f923 Merge remote-tracking branch 'upstream/develop' into develop Tamás Roncsák 2015-02-24 08:24:04 +01:00
  • 35cf5b3d60 Fixes #423 snipe 2015-02-23 18:46:04 -08:00
  • ae381576aa Revert "Revert "Enhance further install without dummy data"" Tamás Roncsák 2015-02-23 11:52:09 +01:00
  • b28bcce5f1 Revert "Enhance further install without dummy data" Tamás Roncsák 2015-02-23 11:50:49 +01:00
  • 7d7059504e Enhance further install without dummy data Tamás Roncsák 2015-02-23 09:39:42 +01:00
  • e04fb70aa3 Merge remote-tracking branch 'upstream/master' into develop Tamás Roncsák 2015-02-23 08:25:41 +01:00
  • 7f1489a701 Updated language strings for logo/header color snipe 2015-02-19 18:15:55 -08:00
  • 720c36e433 Merge remote-tracking branch 'origin/develop' snipe 2015-02-19 16:00:35 -08:00
  • 0cceacd17d Merge pull request #547 from madd15/patch-3 snipe 2015-02-19 16:00:17 -08:00
  • f9ad8d8aa5 Merge remote-tracking branch 'origin/develop' snipe 2015-02-19 15:59:25 -08:00
  • 253c402f3d Ignore logos snipe 2015-02-19 15:59:18 -08:00
  • 083cb1b5ec Fix activate for strict db madd15 2015-02-20 10:26:46 +10:30
  • 8b3e22b58e Fixes #546 - only insert data if values exist snipe 2015-02-19 15:50:53 -08:00
  • ad9e7f1d9e Cleaned up settings form for nicer display snipe 2015-02-19 15:34:55 -08:00
  • 5887cce2c5 Merge pull request #545 from madd15/patch-2 snipe 2015-02-19 15:25:39 -08:00
  • f85061f988 Fix #541 - Headers not being skipped if checked madd15 2015-02-20 09:54:55 +10:30
  • f8e12cabd4 Fixes #476 - added logo upload and header color snipe 2015-02-19 15:14:50 -08:00
  • 348e996e31 Merge pull request #543 from splaer/bug-1 snipe 2015-02-19 12:43:31 -08:00
  • 70ae59ed62 Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date. Splaer 2015-02-19 12:52:27 -05:00
  • 6c4d661a85 Merge pull request #540 from madd15/patch-2 snipe 2015-02-18 13:51:48 -08:00
  • ae104293da #539 - Allow checked out asset in requestable madd15 2015-02-19 08:20:27 +10:30
  • c07907833c Updated laguage strings snipe 2015-02-18 13:33:05 -08:00
  • 7360e52f61 Updated composer lock snipe 2015-02-18 13:16:09 -08:00
  • 7d87b3384c Standardized colors for checkin/checkout in sidebar snipe 2015-02-18 12:22:37 -08:00
  • 30df21c7aa Fixed missing checkedout-to info on asset view snipe 2015-02-18 10:27:41 -08:00
  • 6bc1524783 Merge pull request #537 from roncsak/develop snipe 2015-02-18 09:52:01 -08:00
  • 366fb60628 Enhance installation Tamás Roncsák 2015-02-18 16:00:33 +01:00
  • 01f11f2da4 Updated text snipe 2015-02-18 02:56:01 -08:00
  • f6ae35df63 Only show the "email credentials" checkbox if new user snipe 2015-02-18 02:51:41 -08:00
  • 87936a58fa CSV user import snipe 2015-02-18 02:48:16 -08:00
  • 305db59472 Merge pull request #533 from uberbrady/docker2 snipe 2015-02-17 21:17:17 -08:00
  • c0ce1939cb Make Docker respect email configuration passed via environment. Brady Wetherington 2015-02-17 21:13:40 -08:00
  • 879b6b8f3f Merge remote-tracking branch 'origin/develop' snipe 2015-02-17 20:44:19 -08:00
  • 8777a1a9f1 Updated language strings snipe 2015-02-17 20:44:01 -08:00
  • 43cdace9de Merge remote-tracking branch 'origin/develop' v1.2.5 snipe 2015-02-17 19:18:10 -08:00
  • a04af4aead Bumped version number snipe 2015-02-17 19:17:53 -08:00
  • e7eec42ab8 Merge pull request #532 from uberbrady/depreciation_refactor snipe 2015-02-17 18:55:52 -08:00
  • 063e5c407c Fixed the depreciation report, fixes to calculate current depreciated value (which were only used there). Additional fixes and refactoring around Depreciable, in terms of how assets get depreciation via models, and licenses get depreciation directly. Brady Wetherington 2015-02-17 18:51:13 -08:00
  • 3ba02b65fb Oops - Assets get their Depreciation from their *model* - wheras Licenses have a Depreciation directly associated with them. So I pulled the Depreciation relationship out of Depreciable so that both Assets and Licenses could pull their depreciations in their associated ways. I could've done this with an inheritance call, but that seems a bit much (and unnecessarily confusing). Brady Wetherington 2015-02-17 17:56:59 -08:00
  • 88dc0700f0 Make date functions work; create negative intervals for depreciation, Brady Wetherington 2015-02-17 17:25:30 -08:00
  • 899e2bc9b6 Not convinved this filename is right or anything, but the shared depreciation code is here Brady Wetherington 2015-02-16 20:35:24 -08:00
  • 1e4071b51d First stab at cleaning up Depreciation Brady Wetherington 2015-02-12 20:37:43 -08:00
  • f5b5f66b82 Update README.md Brady Wetherington 2015-02-17 16:36:54 -08:00
  • 24e72d1b56 Update README.md Brady Wetherington 2015-02-17 16:35:31 -08:00
  • f2922b0a44 Update README.md Brady Wetherington 2015-02-17 16:33:23 -08:00
  • 92a99993ea Update README.md Brady Wetherington 2015-02-17 16:30:52 -08:00
  • 9be159ea15 Cleaned up the docker images to shrink it; expanded docker documentation Brady Wetherington 2015-02-17 16:22:03 -08:00
  • 38961298ed Fixes #439 - loads javascript and CSS locally snipe 2015-02-17 15:29:57 -08:00
  • ea6a6d098a Fixes #440 - removed unique constraint on serial snipe 2015-02-17 14:15:22 -08:00
  • 3ee9e93349 Note about key:generate Brady Wetherington 2015-02-16 20:45:00 -08:00
  • c9b51bface Docker kinda-sorta working, and documentation Brady Wetherington 2015-02-16 20:34:40 -08:00
  • 1f0f9c2441 Merge remote-tracking branch 'origin/develop' snipe 2015-02-16 20:50:41 -08:00
  • d4fbea3571 Merge remote-tracking branch 'origin/develop' snipe 2015-02-16 20:49:55 -08:00
  • b32d74de57 Fixed seeder with duplicate ID snipe 2015-02-16 19:56:11 -08:00
  • 4e4144ea74 Fixed blade reference snipe 2015-02-16 19:43:22 -08:00
  • 7b331b26d3 Language string for nothing updated on bulk update snipe 2015-02-16 18:27:27 -08:00
  • e02bea4275 Fixes #457 - added bulk options to hardware snipe 2015-02-16 18:21:29 -08:00
  • 24f5cdc743 Fixes #523 - added file uploads to assets snipe 2015-02-16 13:49:51 -08:00
  • 08ee02d0cd Fixes #525 - added serial to asset model UI snipe 2015-02-16 13:12:57 -08:00
  • ec1ab6913e Merged layout blades for unified nav snipe 2015-02-16 12:55:32 -08:00
  • f40bb7b8b3 Fixes #520 postal code requirement snipe 2015-02-13 11:40:28 -08:00
  • 17258b73a1 Fixes #520 - state no longer required snipe 2015-02-13 11:37:47 -08:00
  • 4a5007264e Fixed mac address not showing snipe 2015-02-12 21:34:20 -08:00
  • bd01b11f4f Merge pull request #519 from madd15/patch-2 snipe 2015-02-12 13:21:48 -08:00
  • 064c0211db Fix #517 - User Requestable Assets madd15 2015-02-13 07:50:47 +10:30
  • 4cb931a93b Merge remote-tracking branch 'origin/develop' snipe 2015-02-12 12:50:15 -08:00
  • 3df8243d80 Updated composer to include mockery snipe 2015-02-12 12:49:57 -08:00
  • f57c61dd4d Possible fix for #518 - license count issue snipe 2015-02-12 12:25:22 -08:00
  • 7a4f115cb3 Merge remote-tracking branch 'origin/develop' v1.2.4 snipe 2015-02-11 22:57:47 -08:00
  • 58ff929d71 Fixes error when no model present because new asset snipe 2015-02-11 22:57:22 -08:00
  • 49f25a23a9 Merge pull request #516 from splaer/fix-475 snipe 2015-02-11 21:42:33 -08:00
  • bcf75073ec Update style Splaer 2015-02-12 00:38:58 -05:00
  • 6908456d09 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 21:27:56 -08:00
  • c26369f8cc Added spacing between buttons snipe 2015-02-11 21:21:19 -08:00
  • 56e090f3e7 Unlink username if they've been deleted snipe 2015-02-11 21:19:18 -08:00
  • 00f7717142 Fix #475 and styling Splaer 2015-02-11 23:38:59 -05:00
  • 823e0c8562 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 16:55:29 -08:00
  • 95be7908f8 New language strings snipe 2015-02-11 16:51:16 -08:00
  • c660c71556 Added MAC address to view snipe 2015-02-11 16:43:46 -08:00
  • fbf03b225d Fixes #509 - added MAC address as model option snipe 2015-02-11 16:37:24 -08:00
  • a5f4c51ab2 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 14:31:25 -08:00
  • 89dce89035 Moved expiration date below purchase date snipe 2015-02-11 14:02:34 -08:00
  • 8cdd215614 Fixed intenting snipe 2015-02-11 14:02:21 -08:00
  • 342a8b81af Fix for error when asset has null status snipe 2015-02-11 13:51:28 -08:00
  • cd5a352961 Fix for wrong math on remaining licenses when assigned to an asset snipe 2015-02-11 13:39:08 -08:00
  • a451fa1fa6 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 12:49:39 -08:00
  • e343c157c5 Fixed naming conflict for requestable snipe 2015-02-11 12:49:21 -08:00
  • 37fc216c5a Additional language strings snipe 2015-02-11 05:19:23 -08:00
  • 96feb84fd4 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 04:59:35 -08:00
  • 80e10c4c98 Fixes #387 - sortable asset view by manufacturer snipe 2015-02-11 04:57:59 -08:00
  • 35a133bbf9 Fixes #382 - allow admins to restore deleted assets snipe 2015-02-11 04:44:39 -08:00
  • 0adbce77f9 Merge remote-tracking branch 'origin/develop' snipe 2015-02-11 03:52:08 -08:00