1921 Commits

Author SHA1 Message Date
snipe 41b3f5b5c8 Bumped version 2015-09-20 18:10:37 -07:00
snipe 9b0495453d Merge pull request #1147 from jotterbot/develop
Adding Purchase Cost to AssetImporterCommand
2015-09-18 16:17:59 -07:00
snipe fe765b3c9c Fixed not found error message string 2015-09-17 13:59:43 -07:00
snipe 740967e4f2 Additional translations 2015-09-17 11:02:43 -07:00
snipe cffd87c5a3 Fix user display if no location was provided 2015-09-15 10:52:12 -07:00
snipe abd0acbe9d Add username to user's list view 2015-09-15 09:58:56 -07:00
snipe 3719f9a5a8 Added supplier ID to asset seeder 2015-09-15 03:45:00 -07:00
snipe f9dc5766a7 Suppliers seeder 2015-09-15 03:41:37 -07:00
snipe c6b6ccc814 More seeders 2015-09-15 03:31:20 -07:00
snipe 611da2ffbd Only show location map if $user->userloc is valid 2015-09-15 02:59:19 -07:00
snipe 911e9092f9 Prevent group altering from trolling douchebags 2015-09-15 02:46:40 -07:00
snipe 06c9076c2f Prevent generating backups, deleting files and file downloads in demo mode 2015-09-15 02:32:19 -07:00
snipe b8fa5abadf Disable manual backup on demo 2015-09-15 02:25:53 -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 a2f6d8f72e Change to #1174 - pull other functions out of if statement 2015-09-14 21:52:51 -07:00
snipe 39f82e546f Fixes #1174 - broken migration if asset_logs table has uploads 2015-09-14 21:40:05 -07:00
snipe d79e2a0864 Allow > tags for custom CSS to modify bootstrap 2015-09-14 16:47:16 -07:00
snipe 3b359d7c6e Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-09-14 15:49:00 -07:00
snipe 3da5c15249 Bumped version 2015-09-14 15:48:49 -07:00
snipe fcec12f3b2 Allow asset-level EOL to override model level if given 2015-09-14 15:48:42 -07:00
jbirdkerr d70aa42cc9 Update checkin-asset.blade.php 2015-09-11 21:48:05 -05:00
snipe 2c54c93859 Fixes #1170 - barcode alternative 2015-09-11 16:13:44 -07:00
snipe 97ecdba262 Bumped version 2015-09-10 11:49:47 -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 416be43061 Added the fideveloper service provider to app.php 2015-09-09 16:36:50 -07:00
snipe 2c89d05156 Smaller font size for labels to prevent them from getting cut off 2015-09-09 14:11:15 -07:00
snipe 680b189709 Fixes #1151 - additional LDAP option 2015-09-09 14:01:17 -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 d1fc48d82e Disable CSS edits for demo 2015-09-09 13:27:50 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe 9b353ae0d8 Fixes #1150 - added note about lowercasing 2015-09-09 11:47:18 -07:00
snipe cbcc43828e Removed required indicator for serial 2015-09-09 11:19:43 -07:00
James Otter c59122a125 Adding Purchase Cost to AssetImporterCommand 2015-09-04 16:03:20 +10:00
snipe 7bd5ddc516 Fixes incorrect title for unaccepted assets report 2015-09-01 16:41:47 -07:00
snipe ed05a32f0b Merge pull request #1061 from vsposato/feature/setupCodeception
DO NOT MERGE - testing codeception
2015-08-31 13:57:37 -07:00
snipe 780226a612 Merge pull request #1127 from madd15/patch-1
Fix #1109 - Asset names are missing when viewing user history
2015-08-31 13:57:12 -07:00
snipe ca37c63649 Merge pull request #1128 from madd15/patch-2
Fix #1123 - fix new lines in serial not being recognised
2015-08-31 13:57:04 -07:00
Vincent Sposato 9107784746 More tweaks 2015-08-28 20:11:01 -04:00
Vincent Sposato 7555b97f80 More tweaks, more prayers... 2015-08-28 20:11:00 -04:00
Vincent Sposato 0d76ea5050 Putting app.php back to production state 2015-08-28 20:10:59 -04:00
Vincent Sposato 3199dfd1d8 Checking testing issue to see if wrong environment is loading 2015-08-28 20:10:58 -04:00
Vincent Sposato bfeb4560ca Got some more tweaks, and changes to make things work 2015-08-28 20:10:53 -04:00
Vincent Sposato 855a155178 Tweaking the configuration to work with travis - attempting hostname tweaks 2015-08-28 20:10:52 -04:00
Vincent Sposato 0cadab8fc6 Initial changes to allow travis-ci to run codeception tests 2015-08-28 20:10:50 -04:00
snipe da10a9a2aa Fixes #1130 - don't try to send email if email is not provided with the user 2015-08-28 12:15:07 -07:00
madd15 6e13da6293 Fix #1123 - fix new lines in serial not being recognised
Hope this is the right way to fix this
2015-08-28 16:28:17 +09:30