Commit graph

1791 commits

Author SHA1 Message Date
Daniel Meltzer
dfea47a272 Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page. 2017-06-12 18:24:20 -05:00
Daniel Meltzer
f0d78091d2 Add a manager field to locations.
This is round one of the rethink of checkout-to-everything.  A location
now has a manager field, and the manager (by default) be responsible for
assets checked out to the location.
2017-06-12 18:23:50 -05:00
snipe
966a736602 Patches #3640 to develop 2017-06-12 15:31:11 -07:00
Daniel Meltzer
30487bfee7 Fix importer vue issues. (#3655)
We currently depend on a "vue-strap" module to provide the modal dialog.
The default npm vue-strap is not compatible with vue2, so we need to use
a fork.  Update package.json to reflect this.  Probably makes sense to
move away from vue-strap in all my copious amounts of free time.
2017-06-12 15:24:49 -07:00
snipe
3046d7d33c Fixes #3644 - broken datepicker 2017-06-09 18:53:19 -07:00
snipe
0aa76bd946 PHPStorm lag strikes again 2017-06-09 16:49:55 -07:00
snipe
26d7fffae8 Added in/out string to general 2017-06-09 16:47:28 -07:00
snipe
14f3868b46 Update all controllers to use laravel 5 return view method 2017-06-09 16:44:03 -07:00
snipe
a5cd4a0a22 Use updated view method for laravel 5 2017-06-09 16:31:25 -07:00
snipe
ad816264e9 WIP import mapper #3639
@dmeltzer, I’m not sure how much extra work this will be to integrate.
2017-06-09 16:29:42 -07:00
snipe
c2494fe0e5 Removed social buttons for BS styles 2017-06-09 14:59:23 -07:00
snipe
02edb74cdf Style updates 2017-06-09 14:58:43 -07:00
snipe
408bb6476f Removed some unneeded styles 2017-06-09 14:57:57 -07:00
snipe
ee5b5acffb Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-06-09 12:44:49 -07:00
snipe
e387673e74 Fixes #3651 - backups not working 2017-06-09 12:44:11 -07:00
Ben
17ce4ea08b Fixes #3649 (#3650)
Fixes issue #3649 with gohilurvish’s recommended fix.
2017-06-09 12:23:32 -07:00
snipe
0bc709206f Fixes #3652 - missing groups UI element in user edit view 2017-06-09 12:19:12 -07:00
snipe
e9dd119b9c Fixes some vue styles 2017-06-09 02:06:10 -07:00
snipe
269997a1fb Push v3.6.5 changes into v4 2017-06-09 00:35:23 -07:00
snipe
041b794e1f Fixes #3634 - use new routes for groups 2017-06-08 20:24:26 -07:00
snipe
da2d9b2374 Fixes presenter issue on user history 2017-06-08 19:09:42 -07:00
snipe
a59db7062d Fix license datatable on license view 2017-06-08 18:59:53 -07:00
snipe
58b2834c54 Fixed case for userloc 2017-06-08 18:46:07 -07:00
snipe
2aaa635345 Fixes crash on asset detail view 2017-06-08 18:26:55 -07:00
snipe
8269aec71a Removed erroneous file 2017-06-08 17:51:30 -07:00
snipe
d62896f945 Fixes #3414 - bulk update for asset models 2017-06-08 17:48:48 -07:00
snipe
a717ca683c Fixes #3648 - missing endif in blade 2017-06-08 16:16:49 -07:00
snipe
d7827fedd9 Fixed dashboard size element 2017-06-06 15:19:19 -07:00
snipe
fbcc40a145 Commented out dashboard chart until proper data provided 2017-06-06 02:51:29 -07:00
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