Commit Graph

193 Commits

Author SHA1 Message Date
snipe bb33e3c831 Updated language strings 2015-03-09 16:14:56 -07:00
snipe f27fb90457 Allow override of checkin/checkout date
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -08:00
snipe 4076b29b63 Support for DATAMATRIX and PDF417 barcodes 2015-03-04 17:43:53 -08:00
snipe 3263543d84 Added language string for already accepted 2015-03-01 15:33:07 -08:00
snipe b986b3276c Dynamic version number on settings and footer 2015-02-28 14:59:03 -08:00
snipe c822fff714 New language strings 2015-02-27 21:07:17 -08:00
snipe c881535fda Updated language strings 2015-02-27 13:32:53 -08:00
snipe 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 6efd268004 Disable checkouts if there are none left 2015-02-26 13:28:08 -08:00
madd15 15a7e205be Force Model Restore before Asset Restore 2015-02-27 07:33:48 +10:30
snipe 62cb1daefd Language strings for checkin/checkout 2015-02-26 11:42:11 -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
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 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 f9f3b5b4f9 Smaller buttons 2015-02-26 02:42:25 -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 ad39ec1dc3 Added markdown to EULA 2015-02-25 11:25:10 -08:00
snipe 6ab95ff387 Prevent auth changes on demo 2015-02-25 10:37:39 -08:00
snipe 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 de94311c47 Add ability to prevent passwords from being changed 2015-02-24 11:57:46 -08:00
snipe dee4baf7dd Updated language strings 2015-02-24 02:11:10 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
snipe 7f1489a701 Updated language strings for logo/header color 2015-02-19 18:15:55 -08:00
snipe f8e12cabd4 Fixes #476 - added logo upload and header color 2015-02-19 15:14:50 -08:00
snipe c07907833c Updated laguage strings 2015-02-18 13:33:05 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe 8777a1a9f1 Updated language strings 2015-02-17 20:44:01 -08:00
snipe 38961298ed Fixes #439 - loads javascript and CSS locally 2015-02-17 15:29:57 -08:00
snipe 7b331b26d3 Language string for nothing updated on bulk update 2015-02-16 18:27:27 -08:00
snipe e02bea4275 Fixes #457 - added bulk options to hardware 2015-02-16 18:21:29 -08:00
snipe 24f5cdc743 Fixes #523 - added file uploads to assets 2015-02-16 13:49:51 -08:00
snipe 95be7908f8 New language strings 2015-02-11 16:51:16 -08:00
snipe fbf03b225d Fixes #509 - added MAC address as model option 2015-02-11 16:37:24 -08:00
snipe 37fc216c5a Additional language strings 2015-02-11 05:19:23 -08:00
snipe 35a133bbf9 Fixes #382 - allow admins to restore deleted assets 2015-02-11 04:44:39 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -08:00
snipe 6f2f7cc214 Updated language strings 2015-02-10 20:52:22 -08:00
madd15 fa9cf35ff5 Added Archived Lang 2015-02-11 13:43:19 +10:30
snipe c2e532e32e Fixed language file for status label messages 2015-02-10 18:33:19 -08:00
snipe d2438f9fdb Fixes #502 - normalized statuses 2015-02-10 15:57:19 -08:00
snipe 22af5561b2 Updated translation strings 2015-02-09 00:48:03 -08:00
snipe 42d5d8db80 Updated language files 2015-02-08 16:17:45 -08:00
snipe cfe0472ea2 New language strings for file uploads 2015-02-06 22:18:57 -08:00
snipe 6d0828bfe5 Delete file interface and routes 2015-02-06 20:42:40 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
snipe a8681225f5 Added language for add button 2015-02-06 18:46:20 -08:00