 snipe
|
62cb1daefd
|
Language strings for checkin/checkout
|
2015-02-26 11:42:11 -08:00 |
|
|
snipe
|
acedab5587
|
Checkout for accessories
|
2015-02-26 11:42:02 -08:00 |
|
|
snipe
|
ad30aebcbc
|
Methods to extend the category EULA to the accessory
|
2015-02-26 11:41:47 -08:00 |
|
|
snipe
|
528c06cf7f
|
Reverting icon fix
|
2015-02-26 10:33:31 -08:00 |
|
|
snipe
|
97d97fc4df
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
|
2015-02-26 10:26:04 -08:00 |
|
|
snipe
|
e89cb883ec
|
Merge pull request #570 from madd15/models
Not Complete - Fix #565 - Models soft delete and restore, several icons and and Category lang
|
2015-02-26 10:20:15 -08:00 |
|
|
madd15
|
88ce0abe85
|
more icons
|
2015-02-27 01:32:24 +10:30 |
|
|
madd15
|
4570efc68b
|
Add restore to action button
|
2015-02-27 01:03:31 +10:30 |
|
|
madd15
|
ea28873fb0
|
remove edit, clone when deleted
|
2015-02-27 00:56:47 +10:30 |
|
|
madd15
|
eb5d4983de
|
more model functionality and icons
|
2015-02-27 00:53:16 +10:30 |
|
|
madd15
|
379f6bef6c
|
catergories lang and serveral icons
|
2015-02-26 23:48:17 +10:30 |
|
|
madd15
|
e090762b5a
|
Icon changes on hardware
|
2015-02-26 22:41:44 +10:30 |
|
|
madd15
|
9f3edd701b
|
Fixes #565 - Soft Delete Models and Allow Restore
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
|
2015-02-26 22:35:57 +10:30 |
|
|
snipe
|
54bad2e4f6
|
More accessory relationships
|
2015-02-26 03:19:45 -08:00 |
|
|
snipe
|
e41621def0
|
Fixed relation between accessory and category
|
2015-02-26 03:08:27 -08:00 |
|
|
snipe
|
95fd96f29a
|
Accessory checkout/checkin methods
|
2015-02-26 03:08:17 -08:00 |
|
|
snipe
|
663d5213eb
|
Accessory checkout/checkin routes
|
2015-02-26 03:08:01 -08:00 |
|
|
snipe
|
92d6ed0761
|
Migration for accessory checkout
|
2015-02-26 03:07:37 -08:00 |
|
|
snipe
|
59ea144b28
|
Minor UX tweaks
|
2015-02-26 03:07:19 -08:00 |
|
|
snipe
|
f9f3b5b4f9
|
Smaller buttons
|
2015-02-26 02:42:25 -08:00 |
|
|
snipe
|
3de1a8f96c
|
Pre-release version in footer
|
2015-02-26 01:07:34 -08:00 |
|
|
snipe
|
5d71628927
|
Accessories title
|
2015-02-26 00:22:15 -08:00 |
|
|
snipe
|
323a607130
|
Indenting formatting
|
2015-02-26 00:22:02 -08:00 |
|
|
snipe
|
8eaa70c39b
|
Fixes #567 - bug in depreciation report csv export
|
2015-02-26 00:21:48 -08:00 |
|
|
snipe
|
29863004e2
|
more small mobile fixes
|
2015-02-25 20:01:36 -08:00 |
|
|
snipe
|
c2bbc1281c
|
Mobile fixes
|
2015-02-25 19:30:37 -08:00 |
|
|
snipe
|
a6232cbfd8
|
Fix language string for create accessory
|
2015-02-25 19:19:23 -08:00 |
|
|
snipe
|
734dc49564
|
Fixed icon
|
2015-02-25 18:35:07 -08:00 |
|
|
snipe
|
a5a1c4223b
|
Fixed chevrons
|
2015-02-25 18:33:22 -08:00 |
|
|
snipe
|
ca1351b704
|
Switched to all FA
|
2015-02-25 18:14:51 -08:00 |
|
|
snipe
|
3135869d5a
|
Fixed font path
|
2015-02-25 17:53:25 -08:00 |
|
|
snipe
|
c2d30ce865
|
Ignore siteflow
|
2015-02-25 17:53:17 -08:00 |
|
|
snipe
|
69a446af97
|
Font awesome
|
2015-02-25 17:51:01 -08:00 |
|
|
snipe
|
93b11c35d0
|
CSS updates
|
2015-02-25 17:50:21 -08:00 |
|
|
snipe
|
cc3d007fa6
|
Use font-awesome for sidenav
|
2015-02-25 17:12:23 -08:00 |
|
|
snipe
|
8cc1bd0159
|
Updated font-awesome
|
2015-02-25 16:58:26 -08:00 |
|
|
snipe
|
8879bff160
|
Fixed bug for reporting on upload in dashboard
|
2015-02-25 16:48:42 -08:00 |
|
|
snipe
|
fae70bb485
|
Updated table strings
|
2015-02-25 16:38:15 -08:00 |
|
|
snipe
|
d4cafe364f
|
Item language string
|
2015-02-25 16:38:05 -08:00 |
|
|
snipe
|
346b62bf26
|
Missing language string
|
2015-02-25 16:37:57 -08:00 |
|
|
snipe
|
3ba6e45011
|
Added Accessories scaffolding
|
2015-02-25 16:31:22 -08:00 |
|
|
snipe
|
525a9225c8
|
Dashboard
|
2015-02-25 16:30:59 -08:00 |
|
|
snipe
|
df448f0c35
|
Merge pull request #564 from splaer/barcode-1
Barcode 1
|
2015-02-25 12:56:26 -08:00 |
|
|
Splaer
|
7808039d0d
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into barcode-1
|
2015-02-25 15:54:06 -05:00 |
|
|
Splaer
|
0ff0d18351
|
Functionality back to url view for the time being until other code is implemented
|
2015-02-25 15:52:24 -05:00 |
|
|
snipe
|
fc4f1fd7fc
|
Updated lock file
|
2015-02-25 12:35:41 -08:00 |
|
|
snipe
|
d55d9f5530
|
Merge pull request #562 from splaer/barcode-1
Barcode - Stage 1
|
2015-02-25 12:32:13 -08:00 |
|
|
Splaer
|
cd7461a3a8
|
Missed files. Composer to add new package and organized the view page label
|
2015-02-25 15:08:12 -05:00 |
|
|
snipe
|
ad39ec1dc3
|
Added markdown to EULA
|
2015-02-25 11:25:10 -08:00 |
|
|
Splaer
|
b2af455523
|
Merge conflict resolution. Added a use at the same line as remote. Fixed
|
2015-02-25 14:09:58 -05:00 |
|