Commit Graph

299 Commits

Author SHA1 Message Date
snipe d41c3fde10 Updated bulgarian and thai translation strings 2015-09-20 23:58:00 -07:00
snipe 740967e4f2 Additional translations 2015-09-17 11:02:43 -07:00
snipe dac2747c01 Updated localization for new backup strings 2015-09-15 02:10:01 -07:00
snipe db44430870 Generate button localization 2015-09-15 02:08:39 -07:00
snipe c12139e624 Added generate and delete backups 2015-09-15 02:05:51 -07:00
snipe 8c2ee9e96c Fixes #1167 - don't allow double checkin 2015-09-10 11:49:43 -07:00
snipe e05baf1df4 Fixed language strings for accessories 2015-09-10 11:49:26 -07:00
snipe 29d5682956 Updated language strings, added Bulgarian 2015-09-09 13:56:10 -07:00
snipe 32604f0715 Fixes #1154 - DL CVS string 2015-09-09 13:40:14 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe 2e7fd02f42 Updated language strings 2015-08-24 12:59:35 -07:00
Aladin Alaily 27efae93ac Add some explanation about the location field. 2015-08-21 10:42:37 -04:00
snipe 21bb2f8b44 Updated language string for asset request 2015-08-17 11:11:09 -07:00
snipe e7d7cc6fc2 Added space after error intro 2015-08-14 21:33:39 -07:00
snipe e14ebd0daa Improved error messages and error handling 2015-08-14 20:50:01 -07:00
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
snipe 959df613ae Updated language strings 2015-08-11 13:39:09 -07:00
snipe 9540db424a Fixes #948 - validate on model name+modelno+manufacturer combination 2015-08-06 05:58:50 -07:00
snipe 77bff707fa English is hard :( 2015-08-04 12:54:45 -07:00
snipe 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php
2015-08-04 12:51:35 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -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 9f81792e70 Request button strings 2015-07-30 14:52:55 -07:00
snipe 57e21193c9 Added language strings for not requestable 2015-07-30 14:50:06 -07:00
snipe 480fd78c51 Disllow delete if parent 2015-07-28 20:45:32 -07:00
snipe 0c9018289b Fixes #970 2015-07-28 20:24:58 -07:00
snipe 8b101b10ec Updated language files 2015-07-27 10:25:35 -07:00
snipe 8b5de894df Updated language files 2015-07-27 10:24:21 -07:00
snipe 5781a01311 Added English, Indonesian 2015-07-27 10:24:08 -07:00
snipe de1adf227b New language files 2015-07-27 10:18:40 -07:00
snipe 08ce08db62 Missing language strings for accept/decline 2015-07-26 23:01:31 -07:00
snipe a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined 2015-07-26 22:53:48 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe 59963b88f5 Fixes #941 - looser restrictions on alpha_space custom validator 2015-07-24 17:29:47 -07:00
madd15 e8c8509ed3 Add checkin_email Lang 2015-07-24 10:25:52 +09:30
snipe 0de1d45492 Merge pull request #944 from madd15/Feature/Additional-Email-Info
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
2015-07-23 16:16:19 -07:00
madd15 d12d1f161f Add Expected Checkin Date 2015-07-23 11:52:04 +09:30
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 5ee4eb5871 Update the migration to fix an issue with the improvement_time so it would be an integer
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-07-20 21:15:46 -04:00
Vincent Sposato 0da0998e44 Made sure that all language files were there, even though they were blank 2015-07-20 21:04:46 -04:00
Vincent Sposato 60d3af7bb7 Added all of the language items needed 2015-07-20 21:03:51 -04:00
Vincent Sposato 3e2bd02ce5 Fixed issue with migration that left off the deleted_at field 2015-07-20 21:02:04 -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
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