f743bacd0f
Updated language strings
2015-06-09 16:14:37 -07:00
123caf42c2
Merge remote-tracking branch 'origin/develop' into 1.3.0
...
# Conflicts:
# app/views/backend/hardware/labels.blade.php
# app/views/backend/layouts/default.blade.php
2015-05-27 11:17:14 -07:00
b161a38e9b
Add licenses.reassignable migration
...
Implement licenses.reassignable
View edit for licenses.reassignable
Add licenses.reassignable to LicensesController
Disable Check In when !license->reassignable
Validate license check-in post
2015-05-22 14:11:36 +01:00
7c95f4231e
Fixes #799 - missing text in file delete confirmation
2015-05-14 20:52:19 -07:00
2f52369d07
Fixed location string
2015-05-04 15:13:04 -07:00
f463cd6c8d
Fixes for #759 - location heirarchy
2015-05-04 02:50:42 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
63b1f3834e
New language strings
2015-04-13 11:26:02 -07:00
80090a41ec
Add Group User View
2015-04-07 13:25:20 +09:30
7bb9929624
Add Notes Lang
2015-03-18 16:46:47 +10:30
4932fe3397
Add button current/deleted
2015-03-18 09:25:28 +10:30
f27fb90457
Allow override of checkin/checkout date
...
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -08:00
4076b29b63
Support for DATAMATRIX and PDF417 barcodes
2015-03-04 17:43:53 -08:00
3263543d84
Added language string for already accepted
2015-03-01 15:33:07 -08:00
b986b3276c
Dynamic version number on settings and footer
2015-02-28 14:59:03 -08:00
1273c4ca87
EULA/req improvements
2015-02-26 18:20:52 -08:00
6efd268004
Disable checkouts if there are none left
2015-02-26 13:28:08 -08:00
15a7e205be
Force Model Restore before Asset Restore
2015-02-27 07:33:48 +10:30
62cb1daefd
Language strings for checkin/checkout
2015-02-26 11:42:11 -08:00
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
eb5d4983de
more model functionality and icons
2015-02-27 00:53:16 +10:30
379f6bef6c
catergories lang and serveral icons
2015-02-26 23:48:17 +10:30
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
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
346b62bf26
Missing language string
2015-02-25 16:37:57 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
6ab95ff387
Prevent auth changes on demo
2015-02-25 10:37:39 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
de94311c47
Add ability to prevent passwords from being changed
2015-02-24 11:57:46 -08:00
e04ac89c5a
Added expiring warrantee alerts
2015-02-24 02:07:33 -08:00
f8e12cabd4
Fixes #476 - added logo upload and header color
2015-02-19 15:14:50 -08:00
87936a58fa
CSV user import
2015-02-18 02:48:16 -08:00
38961298ed
Fixes #439 - loads javascript and CSS locally
2015-02-17 15:29:57 -08:00
7b331b26d3
Language string for nothing updated on bulk update
2015-02-16 18:27:27 -08:00
e02bea4275
Fixes #457 - added bulk options to hardware
2015-02-16 18:21:29 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
95be7908f8
New language strings
2015-02-11 16:51:16 -08:00
fbf03b225d
Fixes #509 - added MAC address as model option
2015-02-11 16:37:24 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
ab1c921443
Requestable assets views and controllers
2015-02-10 23:55:06 -08:00
6f2f7cc214
Updated language strings
2015-02-10 20:52:22 -08:00
c2e532e32e
Fixed language file for status label messages
2015-02-10 18:33:19 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
6d0828bfe5
Delete file interface and routes
2015-02-06 20:42:40 -08:00
3787a3f4ba
Fixed language strings for incrementing IDs
2015-01-22 15:34:19 -08:00
3c141e8f50
Fixes #467
2015-01-22 12:56:13 -08:00
dce1d47228
Updated language files
2014-12-23 14:48:43 -05:00
d858861d0f
Add termination_date and maintained fields to the License edit form. Add field labels to language file.
2014-12-10 07:44:47 -06:00
d6a0249c60
Fixed #373 - added ability to auto-increment asset tags
2014-11-20 18:28:45 -05:00
snipe