snipe
4e4f338680
Merge remote-tracking branch 'origin/develop'
2016-07-29 14:32:49 -07:00
snipe
0f72989953
Updated language strings
2016-07-29 14:32:31 -07:00
snipe
93e038006c
Merge remote-tracking branch 'origin/develop'
2016-07-29 14:18:21 -07:00
snipe
b63a3abf70
Bumped hash
2016-07-29 14:18:05 -07:00
snipe
46eca54b44
Moved bulk checkout into assets nav
2016-07-29 14:17:59 -07:00
zjean
fcb1d6ac15
Fixed feedback on #2349 ( #2359 )
2016-07-29 13:59:50 -07:00
snipe
3f54c034dd
Merge remote-tracking branch 'origin/develop'
2016-07-29 12:15:45 -07:00
snipe
a53346be1f
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-29 12:15:14 -07:00
snipe
fd94c76874
Fixes asset created_at
2016-07-29 12:15:09 -07:00
zjean
108a3c9dad
Updated view for #2324 ( #2357 )
2016-07-29 11:55:16 -07:00
snipe
85232c47da
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-28 21:31:58 -07:00
snipe
47f6635992
A few more permissions tweaks
2016-07-28 21:31:53 -07:00
Daniel Meltzer
eef8d1609e
Small fixes ( #2350 )
...
* components.view should point to view, not create
* Fix comment
* Rename variable to accurately reflect its responsibility
* Fix line breaks in serial key, remove places where adding line breaks makes no sense. Fixes #2344
2016-07-28 20:59:42 -07:00
snipe
8a9307f357
Wordwrap license key
2016-07-28 18:56:02 -07:00
snipe
0a73297f24
Merge remote-tracking branch 'origin/develop'
2016-07-28 12:51:01 -07:00
snipe
1f0737cfb7
Allow super admins to override company
2016-07-28 12:40:19 -07:00
snipe
fae9755ffb
Merge remote-tracking branch 'origin/develop'
2016-07-28 09:16:46 -07:00
snipe
c07ad03e74
Removed unique from form request
2016-07-28 09:16:30 -07:00
snipe
011cb1120d
Merge remote-tracking branch 'origin/develop'
2016-07-28 08:51:15 -07:00
snipe
68b7b8f932
Fixes Carbon date
2016-07-28 08:51:01 -07:00
snipe
f78a577210
Merge remote-tracking branch 'origin/develop'
2016-07-28 08:41:47 -07:00
snipe
c0f4e621ea
Bumped version
2016-07-28 08:41:33 -07:00
snipe
c78dbfc21f
Merge remote-tracking branch 'origin/develop'
2016-07-28 08:39:59 -07:00
snipe
f31637adb4
Fixes #2346
2016-07-28 08:39:28 -07:00
snipe
3e5d2b5385
Ability to remove field from fieldset
2016-07-28 08:10:15 -07:00
snipe
fbd0059bbb
Fixes #2317
2016-07-28 08:07:14 -07:00
snipe
f53c5706f6
Fixes #2341
2016-07-28 07:36:58 -07:00
snipe
214a7d548d
Bumped version
2016-07-28 06:44:59 -07:00
snipe
0ee5dea1a1
Fixes #2344
2016-07-28 06:43:31 -07:00
snipe
29c60ee6b5
Merge remote-tracking branch 'origin/develop'
2016-07-28 05:50:22 -07:00
snipe
075f8fd021
Fixed typo
2016-07-28 05:49:55 -07:00
snipe
14b0a6315f
Pass users path to get_src
2016-07-28 05:49:41 -07:00
snipe
b99d300ab2
Merge remote-tracking branch 'origin/develop'
2016-07-27 21:47:25 -07:00
snipe
9dda0d02ea
Change default zerofill to 5
2016-07-27 21:47:03 -07:00
snipe
8e6c157e7e
Merge remote-tracking branch 'origin/develop'
2016-07-27 21:33:00 -07:00
snipe
9fbe6c68ac
Fixes #2304
2016-07-27 21:30:38 -07:00
snipe
eb508901c5
Zerofilling for auto-increment
2016-07-27 21:28:00 -07:00
snipe
07b70a8cd0
Merge remote-tracking branch 'origin/develop'
2016-07-27 20:30:25 -07:00
snipe
e9eb5ad372
Bumped version
2016-07-27 20:30:11 -07:00
snipe
3fd5fb836f
Restore linebreaks in notes
2016-07-27 20:24:09 -07:00
snipe
3514ae2c0d
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-27 20:16:54 -07:00
snipe
1493251794
Gitignore cleanup
2016-07-27 20:16:46 -07:00
Daniel Meltzer
b4e54225a2
Fix exports ( #2338 )
...
* Update tableexport.js to the new version.
* Give the export file in each table a useful name.
The name takes the form of tabletype-export-YYYY-MM-DD.extension.
2016-07-27 19:45:45 -07:00
Daniel Meltzer
4c9e75cec9
Install php-zip so backups work. Not needed in 14.04 because it looks like this is part of the php7 split. ( #2340 )
...
Issue #2269
2016-07-27 19:44:46 -07:00
Daniel Meltzer
a401986ef5
Only set the category_type in postEdit if the category is empty. ( #2337 )
...
Fixes #2333
2016-07-27 16:13:54 -07:00
snipe
288584cb60
Merge branch 'master' of github.com:snipe/snipe-it
2016-07-26 16:33:32 -07:00
Daniel Meltzer
399e70763b
Scope requestable assets to company as well. Updates to #2206 . ( #2326 )
2016-07-26 16:22:56 -07:00
Brady Wetherington
f145d6cc8c
Change README to point to new documentation site
2016-07-26 13:56:40 -07:00
Daniel Meltzer
9e4ac018ea
Don't allow users without a company to change the company of items if full company support is enabled. ( #2321 )
2016-07-26 13:31:36 -07:00
Daniel Meltzer
0bf5c6978e
Make sure the assigned user is actually shown in the dropdown list. Not sure why this wasn't throwing an error for me, but this makes it actually behave. ( #2322 )
2016-07-26 13:06:38 -07:00
