Commit Graph

  • 1bdd5886e6 Select * because reasons snipe 2015-10-21 23:58:07 -07:00
  • 9c71d34761 Merge pull request #1276 from madd15/patch-5 snipe 2015-10-21 23:40:53 -07:00
  • 79a69d7633 return getEdit to correct method madd15 2015-10-22 17:10:02 +10:30
  • 27799dc78a Nicer activity report display snipe 2015-10-21 23:39:45 -07:00
  • 4cb19d1aae More eager loading, pass $statuslabel_types to view snipe 2015-10-21 23:31:28 -07:00
  • c91113ac95 Eager load accessories snipe 2015-10-21 23:25:33 -07:00
  • eb5649d0b3 Eager load assets snipe 2015-10-21 23:25:23 -07:00
  • f06af97364 Account for no limit or offset passed snipe 2015-10-21 23:23:22 -07:00
  • b1d5812ae2 Fixed categorys page snipe 2015-10-21 23:19:27 -07:00
  • 2e044bf0a3 Fixed category bug snipe 2015-10-21 23:18:40 -07:00
  • bd418d1422 Eager load some models snipe 2015-10-21 23:17:22 -07:00
  • 440bc1a4b4 Fixes bug in people display snipe 2015-10-21 23:15:35 -07:00
  • dba7983189 Added new fields to index view snipe 2015-10-21 23:07:23 -07:00
  • 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop snipe 2015-10-21 23:06:43 -07:00
  • 69c95f1f73 Merge pull request #1225 from ddreier/1088-acc-prices snipe 2015-10-21 22:44:14 -07:00
  • 30bbc9ad46 Merge pull request #1238 from Miliamber/develop snipe 2015-10-21 22:43:30 -07:00
  • 059993b064 Make groups table responsive snipe 2015-10-21 22:41:50 -07:00
  • ed612287ee Merge pull request #1273 from ddreier/ldap-auth-harden snipe 2015-10-21 22:38:02 -07:00
  • ba7b56f5d7 Merge pull request #1274 from patgmac/patch-2 snipe 2015-10-21 22:37:07 -07:00
  • 5b5d262d3c Merge pull request #1275 from ddreier/custom-report-purchase-cost snipe 2015-10-21 22:36:38 -07:00
  • 9d6608c8f1 Asset maintenances for #1266 snipe 2015-10-21 22:19:02 -07:00
  • 28fcd2b8ab Fixed indenting snipe 2015-10-21 21:31:38 -07:00
  • 7087e86ca5 Nicer (tho non-ajaxy) table snipe 2015-10-21 21:23:58 -07:00
  • bf32e89e0c Corrected delete modal string for #1266 snipe 2015-10-21 19:46:50 -07:00
  • 7a306cd0f0 Depreciations bootstrap tables for #1266 snipe 2015-10-21 19:43:09 -07:00
  • 95b033bdb8 Load table export helpers locally snipe 2015-10-21 19:33:22 -07:00
  • ea4dfdd50c Status labels for #1266 snipe 2015-10-21 19:24:01 -07:00
  • 0b87357f3b Search text method for #1266 snipe 2015-10-21 19:10:00 -07:00
  • 9c914e7ef5 New API routes for #1266 snipe 2015-10-21 19:09:47 -07:00
  • 68e7941c21 Added hidden ID field for #1266 snipe 2015-10-21 19:09:35 -07:00
  • f761b2e953 Suppliers for #1266 snipe 2015-10-21 19:09:20 -07:00
  • e03f07bb44 Manufacturers for #1266 snipe 2015-10-21 19:09:02 -07:00
  • 0c830fa564 Added hidden ID column snipe 2015-10-21 19:08:30 -07:00
  • 8ad220701e Fixes Purchase Cost not showing up on custom reports Daniel Dreier 2015-10-21 20:24:07 -05:00
  • 7087a191c6 Typo in package name Patrick Gallagher 2015-10-21 21:18:06 -04:00
  • d1192095d0 Fix for showing deleted items snipe 2015-10-21 18:05:27 -07:00
  • 348a566f89 More responsive fixes snipe 2015-10-21 18:05:03 -07:00
  • 9724d118e6 Changing the comparison to not care about type allows for auth to fail when no user is found in the LDAP directory. Daniel Dreier 2015-10-21 19:17:55 -05:00
  • b18be5aee8 Fixed relationshop again? snipe 2015-10-21 16:14:15 -07:00
  • 7dc0039c3b Fixed parent relationship snipe 2015-10-21 16:01:54 -07:00
  • 218c76592c Added currency to display table for #1266 snipe 2015-10-21 16:01:44 -07:00
  • b5b8865b36 Locations in bootstrap tables for #1266 snipe 2015-10-21 15:43:12 -07:00
  • a896bb0eff Updated categories with cookie and export stuff for #1266 snipe 2015-10-21 15:42:59 -07:00
  • 36a3d655ad Added cookie name to make column cookies work snipe 2015-10-21 15:15:04 -07:00
  • e12e2f2c7c Updated BS tables library snipe 2015-10-21 14:49:58 -07:00
  • cab5dba7c2 Only show manager name if a manager is listed snipe 2015-10-21 14:49:39 -07:00
  • b25b3321f9 Fixes skip/offset for #1266 snipe 2015-10-21 14:49:24 -07:00
  • 4e3c196664 Manager search for #1266 snipe 2015-10-21 14:49:09 -07:00
  • 27735a8821 Asset model text search for #1266 snipe 2015-10-21 14:48:59 -07:00
  • 6800559596 Fixed dumb braces snipe 2015-10-21 14:41:00 -07:00
  • 47d6682098 Updated cookie.js for #1266 snipe 2015-10-21 14:40:46 -07:00
  • def6b4ff50 Categories for accessories in #1266 snipe 2015-10-21 13:48:52 -07:00
  • d9ea718d51 Added back missing div snipe 2015-10-21 13:36:35 -07:00
  • cf7571d3a6 Fixed inline display od checkboxes snipe 2015-10-21 13:27:40 -07:00
  • 21982a1d51 Additional fields for text search on licenses snipe 2015-10-21 13:14:56 -07:00
  • 87adb5e0ca Use old Datatables for maintenances until we can build the bootstrap tables API snipe 2015-10-21 13:11:27 -07:00
  • dfca1386ac Accessories bootstrap tables for #1266 snipe 2015-10-21 13:05:14 -07:00
  • 1d12104eef Merge remote-tracking branch 'origin/develop' v2.0.4 snipe 2015-10-21 12:40:18 -07:00
  • 03e36736c2 Nicer responsive display snipe 2015-10-20 22:11:06 -07:00
  • 644cfee086 Merge branch 'develop-bootstrap-tables-integration' of github.com:snipe/snipe-it into develop-bootstrap-tables-integration snipe 2015-10-20 21:51:23 -07:00
  • c346dbaff6 Location search, deleted users for #1266 snipe 2015-10-20 21:50:58 -07:00
  • fc458e571b Merge pull request #1269 from madd15/patch-4 snipe 2015-10-20 21:08:38 -07:00
  • d61983efdf Change to Bootstrap Table madd15 2015-10-21 14:35:51 +10:30
  • 07f1c5774e Add scopeTextSearch madd15 2015-10-21 14:31:26 +10:30
  • f96e4ebd4c Add scopeTextSearch madd15 2015-10-21 14:30:32 +10:30
  • de0e1627c7 Change Models Datatables - #1266 madd15 2015-10-21 14:28:20 +10:30
  • 46a02b25da Update getDatatable and getDataView madd15 2015-10-21 14:24:25 +10:30
  • 3095af4a8e Merge pull request #1268 from madd15/patch-3 snipe 2015-10-20 20:46:41 -07:00
  • a90f7218de Revert "Change Categories Datatables - #1266" snipe 2015-10-20 20:45:52 -07:00
  • 84c12e5f01 Revert "Change Categories Datatables - #1266" snipe 2015-10-20 20:45:52 -07:00
  • 8f02e0e26f Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-10-20 20:42:10 -07:00
  • 50abb87276 Merge pull request #1267 from madd15/patch-3 snipe 2015-10-20 20:34:05 -07:00
  • 20c35fd0bb Okay, most migrations are kinda-sorta working now, but validations aren't Brady Wetherington 2015-10-20 20:26:18 -07:00
  • ca625418fe Change Categories Datatables - #1266 madd15 2015-10-21 13:54:05 +10:30
  • 4beb3b024d Change Categories Datatables - #1266 madd15 2015-10-21 13:49:30 +10:30
  • b39e617e96 Added inelegant nobr for actions column for #1266 snipe 2015-10-20 20:02:18 -07:00
  • 93bd9120cc Updated orderby for #1266 snipe 2015-10-20 19:57:31 -07:00
  • 2171e668fe Bumped version snipe 2015-10-20 19:51:52 -07:00
  • 103c61d936 Updated users view with bootstrap tables snipe 2015-10-20 19:51:46 -07:00
  • f4d882606a New getDataTable method for Bootstrap tables snipe 2015-10-20 19:51:28 -07:00
  • b56aba3cc2 Added basic text search - this needs to be fleshed out more with more search options snipe 2015-10-20 19:51:10 -07:00
  • 377e4c06a1 Standardizing BS tables options for #1266 snipe 2015-10-20 18:58:21 -07:00
  • 58911cd10e Use moar_scripts to limit unnecessary loading snipe 2015-10-20 18:51:21 -07:00
  • 9264e7bdc4 Fixed missing limit snipe 2015-10-20 18:08:53 -07:00
  • 78143cbd1c Bumped version snipe 2015-10-20 17:52:20 -07:00
  • 01f00cfe51 Updated ignore for LDAP snipe 2015-10-20 17:52:14 -07:00
  • b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration snipe 2015-10-20 17:52:02 -07:00
  • bdc0619016 Merge branch 'develop' into custom_fields Brady Wetherington 2015-10-20 17:11:04 -07:00
  • 273d838a42 Wide swing at custom fields Brady Wetherington 2015-10-20 17:06:07 -07:00
  • 03daecdfed Merge remote-tracking branch 'origin/develop' snipe 2015-10-19 14:11:26 -07:00
  • 2dcb59dd8f Bumped version snipe 2015-10-19 14:10:46 -07:00
  • e7f14f66dc Fixes #1260 - removed domain from cli list snipe 2015-10-19 11:23:02 -07:00
  • d0aab3e2c7 Merge pull request #1261 from patgmac/patch-1 snipe 2015-10-19 11:08:01 -07:00
  • 58f323721c Include installation of php-gd for Ubuntu Patrick Gallagher 2015-10-19 11:50:38 -04:00
  • 923d1d34de Merge remote-tracking branch 'origin/develop' snipe 2015-10-16 01:27:33 -07:00
  • cf767d255d Bumped version snipe 2015-10-16 01:26:44 -07:00
  • daa6943cfc Added username column to sample CSV snipe 2015-10-16 01:26:34 -07:00
  • 707e5c50e4 Merge remote-tracking branch 'origin/develop' snipe 2015-10-16 01:21:05 -07:00
  • a7ea98ad93 Use domain from config snipe 2015-10-16 01:20:38 -07:00
  • 52a60bd6a5 Removed extra method snipe 2015-10-16 01:20:31 -07:00