 snipe
|
87adb5e0ca
|
Use old Datatables for maintenances until we can build the bootstrap tables API
|
2015-10-21 13:11:27 -07:00 |
|
|
snipe
|
dfca1386ac
|
Accessories bootstrap tables for #1266
|
2015-10-21 13:05:14 -07:00 |
|
|
snipe
|
03e36736c2
|
Nicer responsive display
|
2015-10-20 22:11:06 -07:00 |
|
|
snipe
|
644cfee086
|
Merge branch 'develop-bootstrap-tables-integration' of github.com:snipe/snipe-it into develop-bootstrap-tables-integration
|
2015-10-20 21:51:23 -07:00 |
|
|
snipe
|
c346dbaff6
|
Location search, deleted users for #1266
|
2015-10-20 21:50:58 -07:00 |
|
|
snipe
|
fc458e571b
|
Merge pull request #1269 from madd15/patch-4
Change Models tables and category text search
|
2015-10-20 21:08:38 -07:00 |
|
|
madd15
|
d61983efdf
|
Change to Bootstrap Table
|
2015-10-21 14:35:51 +10:30 |
|
|
madd15
|
07f1c5774e
|
Add scopeTextSearch
|
2015-10-21 14:31:26 +10:30 |
|
|
madd15
|
f96e4ebd4c
|
Add scopeTextSearch
|
2015-10-21 14:30:32 +10:30 |
|
|
madd15
|
de0e1627c7
|
Change Models Datatables - #1266
|
2015-10-21 14:28:20 +10:30 |
|
|
madd15
|
46a02b25da
|
Update getDatatable and getDataView
|
2015-10-21 14:24:25 +10:30 |
|
|
snipe
|
3095af4a8e
|
Merge pull request #1268 from madd15/patch-3
Categories Index table view
|
2015-10-20 20:46:41 -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
|
b39e617e96
|
Added inelegant nobr for actions column for #1266
|
2015-10-20 20:02:18 -07:00 |
|
|
snipe
|
93bd9120cc
|
Updated orderby for #1266
|
2015-10-20 19:57:31 -07:00 |
|
|
snipe
|
2171e668fe
|
Bumped version
|
2015-10-20 19:51:52 -07:00 |
|
|
snipe
|
103c61d936
|
Updated users view with bootstrap tables
|
2015-10-20 19:51:46 -07:00 |
|
|
snipe
|
f4d882606a
|
New getDataTable method for Bootstrap tables
|
2015-10-20 19:51:28 -07:00 |
|
|
snipe
|
b56aba3cc2
|
Added basic text search - this needs to be fleshed out more with more search options
|
2015-10-20 19:51:10 -07:00 |
|
|
snipe
|
377e4c06a1
|
Standardizing BS tables options for #1266
(should be made into a macro)
|
2015-10-20 18:58:21 -07:00 |
|
|
snipe
|
58911cd10e
|
Use moar_scripts to limit unnecessary loading
|
2015-10-20 18:51:21 -07:00 |
|
|
snipe
|
9264e7bdc4
|
Fixed missing limit
|
2015-10-20 18:08:53 -07:00 |
|
|
snipe
|
78143cbd1c
|
Bumped version
|
2015-10-20 17:52:20 -07:00 |
|
|
snipe
|
01f00cfe51
|
Updated ignore for LDAP
|
2015-10-20 17:52:14 -07:00 |
|
|
snipe
|
b492ac4950
|
Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
# Conflicts:
# .gitignore
# app/controllers/admin/AccessoriesController.php
# app/controllers/admin/AssetsController.php
# app/controllers/admin/LicensesController.php
# app/models/Accessory.php
# app/models/Asset.php
# app/routes.php
# app/views/backend/accessories/index.blade.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/hardware/index.blade.php
# app/views/backend/licenses/index.blade.php
|
2015-10-20 17:52:02 -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
|
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
|
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
|
58c497adb7
|
Updated language strings
|
2015-10-16 00:35:39 -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 |
|