 snipe
|
1d12104eef
|
Merge remote-tracking branch 'origin/develop'
v2.0.4
|
2015-10-21 12:40:18 -07:00 |
|
|
snipe
|
a90f7218de
|
Revert "Change Categories Datatables - #1266"
This reverts commit ca625418fe.
|
2015-10-20 20:45:52 -07:00 |
|
|
snipe
|
84c12e5f01
|
Revert "Change Categories Datatables - #1266"
This reverts commit 4beb3b024d.
|
2015-10-20 20:45:52 -07:00 |
|
|
snipe
|
8f02e0e26f
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2015-10-20 20:42:10 -07:00 |
|
|
snipe
|
50abb87276
|
Merge pull request #1267 from madd15/patch-3
Categories Index table view
|
2015-10-20 20:34:05 -07:00 |
|
|
madd15
|
ca625418fe
|
Change Categories Datatables - #1266
|
2015-10-21 13:54:05 +10:30 |
|
|
madd15
|
4beb3b024d
|
Change Categories Datatables - #1266
Convert categories index to new table.
EULA is still not working correctly
|
2015-10-21 13:49:30 +10:30 |
|
|
snipe
|
03daecdfed
|
Merge remote-tracking branch 'origin/develop'
|
2015-10-19 14:11:26 -07:00 |
|
|
snipe
|
2dcb59dd8f
|
Bumped version
|
2015-10-19 14:10:46 -07:00 |
|
|
snipe
|
e7f14f66dc
|
Fixes #1260 - removed domain from cli list
The web upload form is still in beta, and shouldn't be used in production. Still need to add email/username formatting options to the form.
|
2015-10-19 11:23:02 -07:00 |
|
|
snipe
|
d0aab3e2c7
|
Merge pull request #1261 from patgmac/patch-1
Include installation of php-gd for Ubuntu
|
2015-10-19 11:08:01 -07:00 |
|
|
Patrick Gallagher
|
58f323721c
|
Include installation of php-gd for Ubuntu
php-gd is installed for RH distros, but not Ubuntu.
|
2015-10-19 11:50:38 -04:00 |
|
|
snipe
|
923d1d34de
|
Merge remote-tracking branch 'origin/develop'
|
2015-10-16 01:27:33 -07:00 |
|
|
snipe
|
cf767d255d
|
Bumped version
|
2015-10-16 01:26:44 -07:00 |
|
|
snipe
|
daa6943cfc
|
Added username column to sample CSV
|
2015-10-16 01:26:34 -07:00 |
|
|
snipe
|
707e5c50e4
|
Merge remote-tracking branch 'origin/develop'
|
2015-10-16 01:21:05 -07:00 |
|
|
snipe
|
a7ea98ad93
|
Use domain from config
|
2015-10-16 01:20:38 -07:00 |
|
|
snipe
|
52a60bd6a5
|
Removed extra method
|
2015-10-16 01:20:31 -07:00 |
|
|
snipe
|
e75cebafeb
|
Added domain config option for email
|
2015-10-16 01:08:38 -07:00 |
|
|
snipe
|
26c0e96e56
|
Merge remote-tracking branch 'origin/develop'
|
2015-10-16 00:36:00 -07:00 |
|
|
snipe
|
58c497adb7
|
Updated language strings
|
2015-10-16 00:35:39 -07:00 |
|
|
snipe
|
d0ebaf3cb9
|
Merge remote-tracking branch 'origin/develop'
|
2015-10-16 00:33:04 -07:00 |
|
|
snipe
|
c4f85fb74d
|
Bumped version
|
2015-10-16 00:32:42 -07:00 |
|
|
snipe
|
71b85732b0
|
Updates to importer
|
2015-10-16 00:32:35 -07:00 |
|
|
snipe
|
66fd0c2315
|
Fixes #1232 - adds category to accessory listing view
|
2015-10-09 13:22:36 -07:00 |
|
|
snipe
|
0287821d44
|
Brought sidenav up higher for better layout
|
2015-10-06 16:30:18 -07:00 |
|
|
snipe
|
00b93883e4
|
Updated translations
|
2015-10-06 16:14:38 -07:00 |
|
|
snipe
|
89816d90b4
|
Corrected consumable string
|
2015-10-06 16:09:10 -07:00 |
|
|
snipe
|
4f74ad077a
|
Fixes #1136 - allow consumables to be deleted, even if they have been assigned
|
2015-10-06 16:08:32 -07:00 |
|
|
snipe
|
75af50def1
|
Accessories fix for #1204
|
2015-10-06 15:58:03 -07:00 |
|
|
snipe
|
ec80c99a48
|
Fixes #1204
|
2015-10-06 15:50:49 -07:00 |
|
|
snipe
|
f6b57adda3
|
Fixes #1211 and duplicate column in view
|
2015-10-06 14:58:13 -07:00 |
|
|
snipe
|
76dc518846
|
Better output filename
|
2015-10-06 14:39:58 -07:00 |
|
|
snipe
|
d149fb1a0f
|
Change output file to text
|
2015-10-06 14:36:00 -07:00 |
|
|
snipe
|
d15ef5c79d
|
Addd user_id to suppliers seeder
|
2015-09-28 16:32:56 -07:00 |
|
|
snipe
|
10909a21cd
|
Fixes #1206 - updated seeder with is_warranty value
|
2015-09-28 16:30:51 -07:00 |
|
|
snipe
|
141c77fed7
|
Fixed #1205 set default nullable in purchase order for strict mode
|
2015-09-28 14:08:45 -07:00 |
|
|
snipe
|
9027ed8864
|
More aggressive autocomplete blocking on user edit/create
|
2015-09-27 21:39:38 -07:00 |
|
|
snipe
|
4c662b7136
|
Fixes #1196 - added licensed to name and email in list view
|
2015-09-25 16:56:12 -07:00 |
|
|
snipe
|
9ba2779e5f
|
Simpler results output for now
|
2015-09-23 20:37:30 -07:00 |
|
|
snipe
|
6500af5125
|
Temp placeholder file - need to ajaxify this
|
2015-09-23 20:37:06 -07:00 |
|
|
snipe
|
ff6fe331f3
|
Add the newly uploaded row to the table
|
2015-09-23 19:18:28 -07:00 |
|
|
snipe
|
567cd4847b
|
Added sample CSV
|
2015-09-23 18:37:29 -07:00 |
|
|
snipe
|
97d0d789f0
|
Updated gitkeep and gitignore for new dirs
|
2015-09-23 18:11:37 -07:00 |
|
|
snipe
|
ba9f00365a
|
Error checking on filetype
|
2015-09-23 16:57:27 -07:00 |
|
|
snipe
|
6f6427a298
|
fa-icon instead of glyphicon
|
2015-09-23 16:56:58 -07:00 |
|
|
snipe
|
b943ace21b
|
Fixed wrong model type reference
|
2015-09-23 09:58:09 -07:00 |
|
|
snipe
|
4abe93ae2e
|
Call the artisan command to do import, show output
|
2015-09-23 02:36:16 -07:00 |
|
|
snipe
|
64c5ea033c
|
Bumped version
|
2015-09-22 20:23:46 -07:00 |
|
|
snipe
|
bedb97c0d8
|
jQUery File Upload libraries
|
2015-09-22 20:23:35 -07:00 |
|