Commit Graph

1851 Commits

Author SHA1 Message Date
Vincent Sposato cd7a7fa3d2 Updated migration to reflect relation to the asset 2015-06-27 11:02:41 -04:00
Vincent Sposato 255a492db6 Added the improvements table migration to create the improvements table 2015-06-27 10:51:22 -04:00
Vincent Sposato 6cff270d3d Updated start.php to reflect my local configuration
Also updated composer packages to latest versions
2015-06-26 17:13:03 -04:00
snipe 5084836737 Merge pull request #861 from strand/patch-1
Update Code of Conduct to Contributor Covenant 1.1.0
v1.2.8
2015-06-19 09:16:08 -07:00
Strand McCutchen 063e3bbea6 Update Code of Conduct to Contributor Covenant 1.1.0 2015-06-19 10:15:05 -06: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 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode 2015-06-15 11:20:09 -07:00
snipe 5a6fe6ccf8 Fixes #806 2015-06-09 02:20:00 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 5939e46eee Bumped version for fixed 1.2.7 2015-06-01 17:52:03 -07:00
snipe a8a0a59982 Fixes #825 - title bar spacing issue 2015-06-01 17:51:20 -07:00
snipe 73a08c031c Fixes #818, and randomizes password for dummy user v1.2.7-master 2015-05-27 11:45:44 -07:00
snipe c77e7bf725 Merge pull request #816 from tomcastleman/develop
Reassignable should default to true on create form
2015-05-24 10:49:41 -07:00
Tom Castleman 7a4299c724 Reassignable should default to true on create form 2015-05-24 13:35:28 +01:00
snipe b9b0239837 Merge pull request #813 from tomcastleman/develop-1
Update develop following PR #809
2015-05-22 11:51:50 -07:00
snipe a43ae71afd Merge pull request #812 from tomcastleman/develop
Reassignable License Setting
2015-05-22 11:50:44 -07:00
Tom Castleman c4339a5d94 Merge branch 'master' into develop
* master:
  Removed debugbar:publish
2015-05-22 14:37:01 +01: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 735268034d Merge pull request #809 from tomcastleman/patch-1
Removed debugbar:publish
2015-05-21 18:56:49 -07:00
snipe aad473486f Merge pull request #798 from DanielNemanic/patch-8
Generating Asset Name to Label Print
2015-05-21 18:56:36 -07:00
Tom Castleman 08970f2b7b Removed debugbar:publish
As per:
```
NOTICE: Since laravel-debugbar 1.7.x, publishing assets is no longer necessary. The assets in public/packages/barryvdh/laravel-debugbar and maximebf/php-debugbar can be safely removed.
```
2015-05-21 16:59:20 +01:00
Daniel Nemanic 6e8ad5b085 Generating Asset Name to Label Print
Added the Asset Name to the Label printing page.
2015-05-13 10:51:06 +02:00
snipe 145d386ce2 Updated lock file 2015-05-12 15:13:18 -07:00
snipe 94bfab762b Merge pull request #791 from DanielNemanic/patch-7
Updating Dashboard Link URL
2015-05-07 00:39:53 -07:00
Daniel Nemanic 20d8ad29e5 Updating Dashboard Link URL
Updating link to real application URL.
2015-05-07 09:38:16 +02:00
snipe bbdbd5397c Check for valid asset before attempting to get name 2015-05-04 00:46:26 -07:00
snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5
# Conflicts:
#	app/views/backend/models/view.blade.php
v1.2.7
2015-05-02 12:28:34 -07:00
snipe 126121065c Merge branch 'patch-3' of https://github.com/DanielNemanic/snipe-it into develop
# Conflicts:
#	public/assets/css/compiled/user-profile.css
2015-05-02 12:27:40 -07:00
snipe 48ccf844fa Merge pull request #748 from DanielNemanic/patch-4
Update user-profile.css
2015-05-02 12:24:11 -07:00
snipe 7556f989df Accessories Slack integration 2015-04-30 20:53:44 -07:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses 2015-04-30 18:17:44 -07:00
snipe c95af84452 Fixes #750 because @uberbrady can't code 2015-04-30 17:14:31 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe a2dd2509fd Updated language strings for slack v1.2.7-beta 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 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost 2015-04-29 16:31:38 -07:00
snipe 3b491d4a6b Fixes #757 - use showAssetName method 2015-04-29 16:22:25 -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 bce06543b2 Merge remote-tracking branch 'origin/master' into develop 2015-04-29 15:28:38 -07:00
snipe 9841dbbbc4 Fixed HTML so settings are saved correctly 2015-04-29 15:28:11 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category 2015-04-29 13:54:54 -07:00
snipe b4b273fc43 Fixed typo 2015-04-28 16:42:08 -07:00
snipe 495201ebf7 Merge branch 'develop'
# Conflicts:
#	composer.lock
2015-04-28 14:48:19 -07:00
snipe e6d0d83070 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-04-28 13:41:17 -07:00