Commit Graph

247 Commits

Author SHA1 Message Date
madd15 d12d1f161f Add Expected Checkin Date 2015-07-23 11:52:04 +09:30
madd15 8b77be9da3 Update for change to username on sign in 2015-07-16 10:04:20 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00
snipe 84ffc1a728 Migration for location-specific currency, updated views for #819
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
snipe 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
snipe de23ec5785 Fixes #544 - disable checking an asset out to a user if it is not a deployable status 2015-07-08 17:18:46 -07:00
snipe 05f0b94bf6 Fixed language string 2015-07-08 13:05:17 -07:00
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 6915987239 Added demo language string 2015-06-30 22:38:19 -07:00
snipe 3caded990a Added parent string 2015-06-23 18:32:06 -07:00
snipe 3bca2566d7 Added missing create/update consumable string 2015-06-23 16:35:38 -07:00
snipe 8ef3d00f22 Fixed language string for users 2015-06-23 14:10:15 -07:00
snipe 26540b1aac Updated bad data string 2015-06-23 14:02:01 -07:00
snipe 17ca66f4a2 Added update string 2015-06-23 12:59:19 -07:00
snipe f30285eaea Added text string for consumable name 2015-06-23 11:39:28 -07:00
snipe 74a9a176e9 New language strings 2015-06-23 10:25:44 -07:00
snipe e8e0c7bfe4 Missing filetype info string 2015-06-22 17:57:21 -07:00
snipe ccdda7b8e8 Missing reassignable string 2015-06-22 17:57:09 -07:00
snipe 40c59e664b Backup language string 2015-06-19 17:37:58 -07:00
snipe df59e7f699 New strings 2015-06-19 11:44:19 -07:00
snipe 49b746a811 QTY strings 2015-06-18 15:00:23 -07:00
snipe 1013580236 Fixed typo 2015-06-18 15:00:16 -07:00
snipe 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00
snipe fdef266089 Addresses #577 and fixes #165 - switch from email to username 2015-06-15 12:16:39 -07:00
snipe 19604480bb Consumables section
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
snipe f743bacd0f Updated language strings 2015-06-09 16:14:37 -07:00
snipe 309158352e Added Korean translation 2015-06-09 16:14:28 -07:00
snipe 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
snipe 5997dd9387 Missing string for action 2015-05-27 11:13:42 -07:00
Tom Castleman 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
snipe 7c95f4231e Fixes #799 - missing text in file delete confirmation 2015-05-14 20:52:19 -07:00
snipe 2f52369d07 Fixed location string 2015-05-04 15:13:04 -07:00
snipe f463cd6c8d Fixes for #759 - location heirarchy 2015-05-04 02:50:42 -07:00
snipe a2dd2509fd Updated language strings for slack 2015-04-29 18:01:43 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 179ef7f060 Removed unsupport languages 2015-04-29 16:17:13 -07:00
snipe 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
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 30c8fffa0a Loading string 2015-04-15 09:51:48 -07:00
snipe 63b1f3834e New language strings 2015-04-13 11:26:02 -07:00
snipe 30966b14af Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-04-08 16:25:46 -07:00
snipe 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -07:00
Madd15 80090a41ec Add Group User View 2015-04-07 13:25:20 +09:30
snipe 0cff78d127 Updated language strings 2015-04-02 15:42:58 -07:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
snipe b53847cb61 Updated language strings 2015-04-01 15:48:02 -07:00
snipe 7f07f35beb Updated language strings 2015-03-20 14:56:12 -07:00