Commit Graph

  • 2aaa635345 Fixes crash on asset detail view snipe 2017-06-08 18:26:55 -07:00
  • 8269aec71a Removed erroneous file snipe 2017-06-08 17:51:30 -07:00
  • d62896f945 Fixes #3414 - bulk update for asset models snipe 2017-06-08 17:48:48 -07:00
  • a717ca683c Fixes #3648 - missing endif in blade snipe 2017-06-08 16:16:49 -07:00
  • d7827fedd9 Fixed dashboard size element snipe 2017-06-06 15:19:19 -07:00
  • fbcc40a145 Commented out dashboard chart until proper data provided snipe 2017-06-06 02:51:29 -07:00
  • 12a7309ecd Note that the chart doesn’t work, to clear things up snipe 2017-06-06 02:40:50 -07:00
  • 9caf045930 Production assets snipe 2017-06-06 02:36:02 -07:00
  • 1c056d1a59 Updated asset urls snipe 2017-06-06 02:35:26 -07:00
  • 240a07b108 Formatting for error pages snipe 2017-06-06 02:32:04 -07:00
  • c977dda5bb Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-06-06 01:45:25 -07:00
  • 03411a3ae8 Removed poop class, added comment to webpack file snipe 2017-06-06 01:44:17 -07:00
  • 01cc00c832 Fixing webpack. Again snipe 2017-06-06 01:39:53 -07:00
  • 9338b37b74 Try to fix the datepicker :( snipe 2017-06-06 00:51:41 -07:00
  • 9cd2881ad0 Initiate datepicker snipe 2017-06-06 00:29:52 -07:00
  • 64b483b686 Updated build css output snipe 2017-06-06 00:06:29 -07:00
  • 1f7266274d Updated manifest snipe 2017-06-06 00:06:01 -07:00
  • 4e5b2d1fe9 Updated font awesome snipe 2017-06-06 00:05:47 -07:00
  • ada2ac06f2 Minified all.css snipe 2017-06-06 00:05:22 -07:00
  • 9d948e8d23 Removed erroneous bower dir snipe 2017-06-06 00:04:55 -07:00
  • 4062228092 Updated contribs snipe 2017-06-05 23:54:13 -07:00
  • 3e67cdc501 Allows a null location value for importing LDAP users (#3598) Wyatt 2017-06-01 23:20:40 -05:00
  • be42a0add1 Add @steveelwood as a contributor snipe 2017-06-01 21:03:05 -07:00
  • 6cadde23d7 Add @manassesferreira as a contributor snipe 2017-06-01 21:00:47 -07:00
  • a6c1f7b30b Add @n8felton as a contributor snipe 2017-06-01 20:59:15 -07:00
  • 1b5b0e9d19 Add @jasonspriggs as a contributor snipe 2017-06-01 20:58:50 -07:00
  • 2a226fd3f9 Update @pakkua80 as a contributor snipe 2017-06-01 20:58:26 -07:00
  • 043182593d Add @BrettFagerlund as a contributor snipe 2017-06-01 20:57:55 -07:00
  • 08dc07b46b Apply PR #3620 to develop (oracle linux support) snipe 2017-06-01 20:55:30 -07:00
  • 9a9b6ae228 Update snipeit.sh (#3620) Lee Thoong Ching 2017-06-02 11:54:23 +08:00
  • 2d3ea4eec6 Apply PR #3616 (Docker updates) snipe 2017-06-01 20:53:01 -07:00
  • 7c8dc9fe2d docker: use ubuntu:xenial with php7.0 (#3616) morph027 2017-06-02 05:50:09 +02:00
  • 74aaadcdc5 Fixes #3583 - incorrect 404 status code, use curl for checking .env snipe 2017-06-01 20:41:23 -07:00
  • 0238dd59a3 Fixes #3600 - wrong route for hardware snipe 2017-06-01 20:34:01 -07:00
  • 461ca53289 Fixes #3603 - Depreciation report crashes snipe 2017-06-01 20:31:44 -07:00
  • ccc0063556 Fixes #3604 - company view not displaying assets on page load snipe 2017-06-01 20:28:09 -07:00
  • 66145a625c Upgraded laravel mix snipe 2017-05-31 13:57:34 -07:00
  • cc5192c91e Updated asset url snipe 2017-05-31 13:57:23 -07:00
  • de5334e525 Updated with production assets snipe 2017-05-31 13:27:17 -07:00
  • b797604627 Fixed &%#!@@!ing ES that prevented npm run production from working snipe 2017-05-31 13:26:48 -07:00
  • 293981148c Few more stabs at this dumb uglify error snipe 2017-05-31 12:56:09 -07:00
  • 66eaff739a More npm/css/js updates snipe 2017-05-31 12:34:05 -07:00
  • 8b5cb6e8c2 Added build directory for misc laravel mix crap snipe 2017-05-31 12:01:45 -07:00
  • 7b4b2d79cf Moved CSS/JS/etc assets up one level snipe 2017-05-31 10:31:56 -07:00
  • c3af13298e Added webpack.mix.js snipe 2017-05-31 10:28:53 -07:00
  • 312fd27d11 Removed weird temp file snipe 2017-05-31 10:28:07 -07:00
  • 1b55d38c63 Attempts at un-fscking package.json for laravel mix snipe 2017-05-31 10:26:27 -07:00
  • 1992906790 Use laravel mix asset call snipe 2017-05-31 09:41:52 -07:00
  • b0fc2489f6 Almost fixes user history table snipe 2017-05-31 09:39:52 -07:00
  • b13726880e Fixes #3601 - HTML instead of username for manager in user view snipe 2017-05-31 09:39:30 -07:00
  • 25dca80644 Fixes #3602 - actions missing from suppliers in v4 snipe 2017-05-31 06:52:37 -07:00
  • 748aba3c48 Add assets dashboard feature snipe 2017-05-31 05:23:54 -07:00
  • c9484fa30b Updated compiled assets snipe 2017-05-31 05:23:26 -07:00
  • d950ddbda7 Changed go button to primary class snipe 2017-05-31 05:23:09 -07:00
  • fd0165b4b8 New compiled assets snipe 2017-05-31 03:32:29 -07:00
  • fd0da6ecf0 Ignore the icon column in exports snipe 2017-05-31 02:03:09 -07:00
  • 7b1265cb89 Cache totals for later dashboard use snipe 2017-05-31 02:02:55 -07:00
  • 92052442e3 Include department in user info snipe 2017-05-31 01:17:30 -07:00
  • 71b668e1a3 Removed extra else to make Codacy happy snipe 2017-05-23 15:53:39 -07:00
  • 3c167c9d33 Remove debugging frowny-face snipe 2017-05-23 15:06:43 -07:00
  • 9f87f72c96 Updated route name for activity report API call snipe 2017-05-23 14:33:36 -07:00
  • 5e0cc93ba2 Use new formatters in bootstrap table snipe 2017-05-23 14:33:19 -07:00
  • 3724442318 Exclude some BS table calls if it’s just a simple ajax table with no sorting/searching snipe 2017-05-23 14:32:58 -07:00
  • 610a773620 Use activity report for view-assets snipe 2017-05-23 14:32:21 -07:00
  • a1c7d2922e Tweaks to dashboard API calls snipe 2017-05-23 14:32:02 -07:00
  • 8ab29c628f Added icon to presenter snipe 2017-05-23 14:31:44 -07:00
  • 4ada5eaa94 Added targetType method snipe 2017-05-23 14:31:14 -07:00
  • 5499735f3a Actionlogs API transformer snipe 2017-05-23 14:31:04 -07:00
  • 40e11b6661 Removed old getActivityReportDataTable() method, since we’re using the API now snipe 2017-05-23 14:30:55 -07:00
  • b1fa25b73e Added filter to report by user_id for activity snipe 2017-05-23 14:30:29 -07:00
  • 452c52a3ab Changed variable name for consistency snipe 2017-05-23 14:30:07 -07:00
  • 76926c97c1 Updated dashboard to use new API activity report and added category summary snipe 2017-05-23 09:25:45 -07:00
  • 6775c39a5e Added simple_view to use compact, no pagination view of tables snipe 2017-05-23 09:25:20 -07:00
  • ce856bdb0a Moves activity report into API routes snipe 2017-05-23 09:24:53 -07:00
  • 52f24f7587 Reports API controller snipe 2017-05-23 09:24:36 -07:00
  • fba7f1ccf6 Fixes #3605 - missing table close tag causing page layout bonking snipe 2017-05-23 03:20:50 -07:00
  • ed46dee646 Dept tests snipe 2017-05-23 03:03:30 -07:00
  • 332076bbe5 Fixed location test method name snipe 2017-05-23 03:03:25 -07:00
  • 9d45375b8a Added dept to user edit/create/bulk edit views snipe 2017-05-23 02:51:09 -07:00
  • d3b07411da Added depts to bootstrap-table javascript formatters snipe 2017-05-23 02:50:51 -07:00
  • d17d3a2ef0 Dept views snipe 2017-05-23 02:50:27 -07:00
  • dd8511c66a Dept strings snipe 2017-05-23 02:50:16 -07:00
  • f57ebc664e Added dept management to permissions snipe 2017-05-23 02:50:08 -07:00
  • f285bd3c29 Added Dept field to users table presenter snipe 2017-05-23 02:49:51 -07:00
  • aeca549bab Dept search in User query scopes snipe 2017-05-23 02:49:27 -07:00
  • e0d2cbef20 Allow manager to be null for dept snipe 2017-05-23 02:49:00 -07:00
  • 96e8109d01 Allow location/company/manager to be null via validation snipe 2017-05-23 02:48:51 -07:00
  • b223630f72 Added dept to User API transformer snipe 2017-05-23 02:48:03 -07:00
  • e9c39add4f Added dept helper reference in create/edit/bulk edit users snipe 2017-05-23 02:47:49 -07:00
  • 7ec1724308 Create, edit and destroy for depts snipe 2017-05-23 02:47:25 -07:00
  • 811ddd2f67 Include depts in returned list, sort by dept snipe 2017-05-23 02:46:55 -07:00
  • cefb20d46f Set dept manager ID for dept snipe 2017-05-23 02:46:25 -07:00
  • bb323db685 Load relationships in query snipe 2017-05-23 02:46:03 -07:00
  • eb3aa99e4f Added destroy method to dept snipe 2017-05-23 02:45:51 -07:00
  • a7592de304 Added helper for dept list snipe 2017-05-23 02:37:37 -07:00
  • 64f17cecbf Updated department transformer snipe 2017-05-23 02:37:30 -07:00
  • e2f2f9e154 Additional methods for Department web UI snipe 2017-05-23 01:09:13 -07:00
  • 8caf6623f1 Filter by dept for user display snipe 2017-05-23 01:09:03 -07:00
  • 6c623866c0 Additional API methods for departments snipe 2017-05-23 01:08:55 -07:00
  • 659e60fd12 Department controllers and transformer snipe 2017-05-22 21:32:33 -07:00