Commit graph

1862 commits

Author SHA1 Message Date
snipe 12a7309ecd Note that the chart doesn’t work, to clear things up 2017-06-06 02:40:50 -07:00
snipe 9caf045930 Production assets 2017-06-06 02:36:02 -07:00
snipe 1c056d1a59 Updated asset urls 2017-06-06 02:35:26 -07:00
snipe 240a07b108 Formatting for error pages 2017-06-06 02:32:04 -07:00
snipe c977dda5bb Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-06-06 01:45:25 -07:00
snipe 03411a3ae8 Removed poop class, added comment to webpack file 2017-06-06 01:44:17 -07:00
snipe 01cc00c832 Fixing webpack. Again 2017-06-06 01:39:53 -07:00
snipe 9338b37b74 Try to fix the datepicker :(
Webpack has fucked everything. I hate everything.
2017-06-06 00:51:41 -07:00
snipe 9cd2881ad0 Initiate datepicker 2017-06-06 00:29:52 -07:00
snipe 64b483b686 Updated build css output
I don't know why I need to do this. :(
2017-06-06 00:06:29 -07:00
snipe 1f7266274d Updated manifest 2017-06-06 00:06:01 -07:00
snipe 4e5b2d1fe9 Updated font awesome 2017-06-06 00:05:47 -07:00
snipe ada2ac06f2 Minified all.css 2017-06-06 00:05:22 -07:00
snipe 9d948e8d23 Removed erroneous bower dir 2017-06-06 00:04:55 -07:00
snipe 4062228092 Updated contribs 2017-06-05 23:54:13 -07:00
Wyatt 3e67cdc501 Allows a null location value for importing LDAP users (#3598)
* Allows a null location value for importing LDAP users

* Forgot you need to set the variable to null..
2017-06-01 21:20:40 -07:00
snipe be42a0add1 Add @steveelwood as a contributor 2017-06-01 21:03:05 -07:00
snipe 6cadde23d7 Add @manassesferreira as a contributor 2017-06-01 21:00:47 -07:00
snipe a6c1f7b30b Add @n8felton as a contributor 2017-06-01 20:59:15 -07:00
snipe 1b5b0e9d19 Add @jasonspriggs as a contributor 2017-06-01 20:58:50 -07:00
snipe 2a226fd3f9 Update @pakkua80 as a contributor 2017-06-01 20:58:26 -07:00
snipe 043182593d Add @BrettFagerlund as a contributor 2017-06-01 20:57:55 -07:00
snipe 08dc07b46b Apply PR #3620 to develop (oracle linux support) 2017-06-01 20:55:30 -07:00
snipe 2d3ea4eec6 Apply PR #3616 (Docker updates) 2017-06-01 20:53:01 -07:00
snipe 74aaadcdc5 Fixes #3583 - incorrect 404 status code, use curl for checking .env 2017-06-01 20:41:23 -07:00
snipe 0238dd59a3 Fixes #3600 - wrong route for hardware 2017-06-01 20:34:01 -07:00
snipe 461ca53289 Fixes #3603 - Depreciation report crashes 2017-06-01 20:31:44 -07:00
snipe ccc0063556 Fixes #3604 - company view not displaying assets on page load 2017-06-01 20:28:09 -07:00
snipe 66145a625c Upgraded laravel mix 2017-05-31 13:57:34 -07:00
snipe cc5192c91e Updated asset url 2017-05-31 13:57:23 -07:00
snipe de5334e525 Updated with production assets 2017-05-31 13:27:17 -07:00
snipe b797604627 Fixed &%#!@@!ing ES that prevented npm run production from working 2017-05-31 13:26:48 -07:00
snipe 293981148c Few more stabs at this dumb uglify error 2017-05-31 12:56:09 -07:00
snipe 66eaff739a More npm/css/js updates 2017-05-31 12:34:05 -07:00
snipe 8b5cb6e8c2 Added build directory for misc laravel mix crap 2017-05-31 12:01:45 -07:00
snipe 7b4b2d79cf Moved CSS/JS/etc assets up one level 2017-05-31 10:31:56 -07:00
snipe c3af13298e Added webpack.mix.js
Everything is terrible
2017-05-31 10:28:53 -07:00
snipe 312fd27d11 Removed weird temp file 2017-05-31 10:28:07 -07:00
snipe 1b55d38c63 Attempts at un-fscking package.json for laravel mix 2017-05-31 10:26:27 -07:00
snipe 1992906790 Use laravel mix asset call 2017-05-31 09:41:52 -07:00
snipe b0fc2489f6 Almost fixes user history table
Something is still fucky here
2017-05-31 09:39:52 -07:00
snipe b13726880e Fixes #3601 - HTML instead of username for manager in user view 2017-05-31 09:39:30 -07:00
snipe 25dca80644 Fixes #3602 - actions missing from suppliers in v4 2017-05-31 06:52:37 -07:00
snipe 748aba3c48 Add assets dashboard feature
- also a really broken sample graph
2017-05-31 05:23:54 -07:00
snipe c9484fa30b Updated compiled assets 2017-05-31 05:23:26 -07:00
snipe d950ddbda7 Changed go button to primary class 2017-05-31 05:23:09 -07:00
snipe fd0165b4b8 New compiled assets 2017-05-31 03:32:29 -07:00
snipe fd0da6ecf0 Ignore the icon column in exports 2017-05-31 02:03:09 -07:00
snipe 7b1265cb89 Cache totals for later dashboard use 2017-05-31 02:02:55 -07:00
snipe 92052442e3 Include department in user info 2017-05-31 01:17:30 -07:00