 snipe
|
a3f5dc331d
|
Fixes #1007 and #1053
|
2015-10-22 02:11:39 -07:00 |
|
|
snipe
|
27799dc78a
|
Nicer activity report display
(This needs the API/Bootstrap tables treatment soon)
|
2015-10-21 23:39:45 -07:00 |
|
|
snipe
|
b1d5812ae2
|
Fixed categorys page
|
2015-10-21 23:19:27 -07:00 |
|
|
snipe
|
dba7983189
|
Added new fields to index view
|
2015-10-21 23:07:23 -07:00 |
|
|
snipe
|
5ff75e7f42
|
Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop
# Conflicts:
# app/controllers/admin/CategoriesController.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/categories/index.blade.php
# app/views/backend/settings/edit.blade.php
|
2015-10-21 23:06:43 -07:00 |
|
|
snipe
|
69c95f1f73
|
Merge pull request #1225 from ddreier/1088-acc-prices
Accessory and Consumable Price info #1088
|
2015-10-21 22:44:14 -07:00 |
|
|
snipe
|
059993b064
|
Make groups table responsive
|
2015-10-21 22:41:50 -07:00 |
|
|
snipe
|
9d6608c8f1
|
Asset maintenances for #1266
|
2015-10-21 22:19:02 -07:00 |
|
|
snipe
|
28fcd2b8ab
|
Fixed indenting
|
2015-10-21 21:31:38 -07:00 |
|
|
snipe
|
7087e86ca5
|
Nicer (tho non-ajaxy) table
|
2015-10-21 21:23:58 -07:00 |
|
|
snipe
|
7a306cd0f0
|
Depreciations bootstrap tables for #1266
|
2015-10-21 19:43:09 -07:00 |
|
|
snipe
|
95b033bdb8
|
Load table export helpers locally
|
2015-10-21 19:33:22 -07:00 |
|
|
snipe
|
ea4dfdd50c
|
Status labels for #1266
|
2015-10-21 19:24:01 -07:00 |
|
|
snipe
|
f761b2e953
|
Suppliers for #1266
|
2015-10-21 19:09:20 -07:00 |
|
|
snipe
|
e03f07bb44
|
Manufacturers for #1266
|
2015-10-21 19:09:02 -07:00 |
|
|
snipe
|
0c830fa564
|
Added hidden ID column
|
2015-10-21 19:08:30 -07:00 |
|
|
snipe
|
218c76592c
|
Added currency to display table for #1266
|
2015-10-21 16:01:44 -07:00 |
|
|
snipe
|
b5b8865b36
|
Locations in bootstrap tables for #1266
|
2015-10-21 15:43:12 -07:00 |
|
|
snipe
|
a896bb0eff
|
Updated categories with cookie and export stuff for #1266
|
2015-10-21 15:42:59 -07:00 |
|
|
snipe
|
36a3d655ad
|
Added cookie name to make column cookies work
|
2015-10-21 15:15:04 -07:00 |
|
|
snipe
|
6800559596
|
Fixed dumb braces
|
2015-10-21 14:41:00 -07:00 |
|
|
snipe
|
def6b4ff50
|
Categories for accessories in #1266
|
2015-10-21 13:48:52 -07:00 |
|
|
snipe
|
d9ea718d51
|
Added back missing div
|
2015-10-21 13:36:35 -07:00 |
|
|
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 |
|
|
madd15
|
d61983efdf
|
Change to Bootstrap Table
|
2015-10-21 14:35:51 +10:30 |
|
|
madd15
|
de0e1627c7
|
Change Models Datatables - #1266
|
2015-10-21 14:28:20 +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 |
|
|
snipe
|
103c61d936
|
Updated users view with bootstrap tables
|
2015-10-20 19:51:46 -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
|
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 |
|
|
Stefan
|
0db075cb13
|
fixes lang option for remote script
|
2015-10-12 21:00:27 +02:00 |
|
|
Stefan
|
a6586b5919
|
Added option to select brand type text or logo or text + logo
|
2015-10-12 20:34:12 +02:00 |
|
|
Stefan
|
485b34b66e
|
fixed layout and added branding option
|
2015-10-12 19:14:05 +02:00 |
|
|
Stefan Kittner
|
e9e04e86da
|
added fixed width for navbar icons (fa-fw)
|
2015-10-12 10:26:27 +02:00 |
|
|
snipe
|
66fd0c2315
|
Fixes #1232 - adds category to accessory listing view
|
2015-10-09 13:22:36 -07:00 |
|
|
Daniel Dreier
|
73d4c65daf
|
Finished work on #1088. Added info to view, translation strings and logic to controllers.
|
2015-10-06 19:29:44 -05:00 |
|
|
snipe
|
f6b57adda3
|
Fixes #1211 and duplicate column in view
|
2015-10-06 14:58:13 -07:00 |
|
|
Daniel Dreier
|
3ecfff94ef
|
Created the migration, copied view stuff from asset edit to acc. and consumable.
|
2015-09-30 22:44:55 -05: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
|
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
|
6f6427a298
|
fa-icon instead of glyphicon
|
2015-09-23 16:56:58 -07:00 |
|
|
snipe
|
4abe93ae2e
|
Call the artisan command to do import, show output
|
2015-09-23 02:36:16 -07:00 |
|