f743bacd0f
Updated language strings
2015-06-09 16:14:37 -07:00
309158352e
Added Korean translation
2015-06-09 16:14:28 -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
5997dd9387
Missing string for action
2015-05-27 11:13:42 -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
a2dd2509fd
Updated language strings for slack
2015-04-29 18:01:43 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
179ef7f060
Removed unsupport languages
2015-04-29 16:17:13 -07:00
a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
d61506fcf7
Fixes for #766 - add activity report
2015-04-29 14:50:12 -07:00
30c8fffa0a
Loading string
2015-04-15 09:51:48 -07:00
63b1f3834e
New language strings
2015-04-13 11:26:02 -07:00
30966b14af
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-08 16:25:46 -07:00
9bbf933b05
Added missing search string
2015-04-08 16:25:34 -07:00
80090a41ec
Add Group User View
2015-04-07 13:25:20 +09:30
0cff78d127
Updated language strings
2015-04-02 15:42:58 -07:00
c88ce0d14d
Fixes for #722 datatables
2015-04-02 14:55:36 -07:00
33e7ce6761
Fixes for #722 localization
2015-04-02 14:28:11 -07:00
b53847cb61
Updated language strings
2015-04-01 15:48:02 -07:00
7f07f35beb
Updated language strings
2015-03-20 14:56:12 -07:00
617cc67467
Added Thai language files
2015-03-20 14:31:31 -07:00
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
07e9ff4290
Add Users
2015-03-18 09:19:23 +10:30
bb33e3c831
Updated language strings
2015-03-09 16:14:56 -07:00
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
c822fff714
New language strings
2015-02-27 21:07:17 -08:00
c881535fda
Updated language strings
2015-02-27 13:32:53 -08:00
1273c4ca87
EULA/req improvements
2015-02-26 18:20:52 -08:00
afe2eb736c
Added category type
2015-02-26 15:48:44 -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
d4cafe364f
Item language string
2015-02-25 16:38:05 -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
snipe