Commit Graph

70 Commits

Author SHA1 Message Date
snipe 676bedc9be LDAP UI language strings 2015-08-14 20:15:24 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
snipe 305c22f72d Added request to dashboard 2015-07-30 14:59:24 -07:00
snipe 08ce08db62 Missing language strings for accept/decline 2015-07-26 23:01:31 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
Vincent Sposato d1d6fe26a6 Fixed all issues that were reported by @leobg
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
Vincent Sposato 3df0550b19 Built the report and the export for the Improvements report
Added the links on the navigation
2015-07-20 21:26:23 -04:00
Vincent Sposato 60d3af7bb7 Added all of the language items needed 2015-07-20 21:03:51 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
2015-07-20 16:12: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
Vincent Sposato 1b423f5b54 Fixed all issues that were reported by @leobg
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-06 10:36:54 -04: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
Vincent Sposato 269f73205a Built the report and the export for the Improvements report
Added the links on the navigation
2015-06-28 15:00:55 -04:00
Vincent Sposato 95f8e9fbe8 Added all of the language items needed 2015-06-27 14:35:37 -04: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 49b746a811 QTY strings 2015-06-18 15:00:23 -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 5997dd9387 Missing string for action 2015-05-27 11:13:42 -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 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -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
madd15 07e9ff4290 Add Users 2015-03-18 09:19:23 +10:30
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00
snipe 38961298ed Fixes #439 - loads javascript and CSS locally 2015-02-17 15:29:57 -08:00
snipe 24f5cdc743 Fixes #523 - added file uploads to assets 2015-02-16 13:49:51 -08:00
madd15 fa9cf35ff5 Added Archived Lang 2015-02-11 13:43:19 +10:30
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
snipe 11f46474ab New file upload language 2015-02-06 18:41:24 -08:00
snipe 53f279f55f Language string for "generate" 2014-11-12 17:34:22 -05:00
madd15 7ddc6d497a Fix Report Langs 2014-11-13 08:43:42 +10:30
snipe ce9c616843 Updated language strings 2014-11-12 16:33:11 -05:00
Madd15 6d2a073d04 Custom Asset Report 2014-11-12 16:05:59 +10:30
Madd15 02605bdf69 Add Asset Report with Reduced Load Time 2014-11-12 12:03:33 +10:30
Madd15 432e348e56 Add Report Controller and License Report 2014-11-12 12:02:55 +10:30
madd15 672e2e5fd4 Add gravatar_email 2014-10-30 09:06:13 +10:30
madd15 26ab53c02c Added Location and Website 2014-10-29 17:33:10 +10:30
madd15 e8737b156a Add image and avatar lang vars 2014-10-29 17:19:27 +10:30
R Ryan Dial 94ead64386 Spelling correction. 2014-09-02 14:57:27 -04:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00