snipe
64ffd261fc
Bumped version
2016-08-02 01:14:11 -07:00
snipe
de17da099f
Fixed tests
2016-08-02 01:12:58 -07:00
snipe
886a31190c
Fixed route
2016-08-02 01:08:37 -07:00
snipe
8246a319a2
Fixes #2363 and #1097
2016-08-02 00:54:38 -07:00
snipe
27adeb427e
Generate barcodes locally and try to serve them if they exist
2016-08-01 22:56:28 -07:00
snipe
bfc18c758a
Removed console message from JS
2016-08-01 21:43:56 -07:00
snipe
735595be07
Typeahead library
...
(not implemented yet)
2016-08-01 21:43:01 -07:00
snipe
27dee1b793
Removed comment
2016-08-01 20:15:25 -07:00
snipe
cdeccb399f
Hide extra options if superadmin is checked
2016-08-01 20:11:54 -07:00
snipe
2f679ccc29
Merge remote-tracking branch 'origin/develop'
2016-08-01 18:44:32 -07:00
snipe
eac6abe60a
Fixes #2378 - disallow admins to create/edit superadmins
...
Also disables admins from being able to edit groups, since that can grant superadmin access.
2016-08-01 18:43:11 -07:00
Daniel Meltzer
c9d3cd724b
Fix installer again ( #2370 )
...
I hate bash... anyone else want to maintain this? :)
2016-08-01 11:08:46 -07:00
snipe
1fa2fe3c24
Merge remote-tracking branch 'origin/develop'
2016-08-01 10:32:04 -07:00
snipe
b6986ad808
Bumped version
2016-08-01 10:31:46 -07:00
snipe
715c9aa780
Merge remote-tracking branch 'origin/develop'
2016-08-01 10:18:01 -07:00
snipe
139325d8ba
Small tweaks for bad data
2016-08-01 10:17:46 -07:00
snipe
d65a9091c8
Merge remote-tracking branch 'origin/develop'
2016-07-30 17:27:29 -07:00
snipe
1f30bdee99
Fixes #2361
2016-07-30 17:27:08 -07:00
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
