Compare commits

...

11 Commits

Author SHA1 Message Date
snipe a61e913824 Squashed commit of the following:
commit 95ae26eb2a
Author: snipe <snipe@snipe.net>
Date:   Sun Feb 8 16:21:33 2015 -0800

    Updated docs location

commit cfebe11755
Author: snipe <snipe@snipe.net>
Date:   Sun Feb 8 16:20:36 2015 -0800

    Updated docs for 4.2

commit d86b5aa613
Author: snipe <snipe@snipe.net>
Date:   Sun Feb 8 16:20:24 2015 -0800

    Bumped version
2015-02-08 16:22:12 -08:00
snipe c255de7fc0 Merge remote-tracking branch 'origin/develop' 2015-02-08 16:18:09 -08:00
snipe 91bf9763d2 Merge remote-tracking branch 'origin/develop' 2015-02-08 16:13:25 -08:00
snipe 9c66dd5431 Added gitignore 2015-02-08 16:13:10 -08:00
snipe dede09e9c5 Merge remote-tracking branch 'origin/develop' 2015-01-22 15:41:36 -08:00
snipe f39922f51f Merge remote-tracking branch 'origin/develop'
Conflicts:
	CONTRIBUTING.md
2015-01-22 13:31:19 -08:00
snipe 5268c579e2 Update CONTRIBUTING.md 2015-01-08 17:34:23 -08:00
snipe 21448ea8e6 Update CONTRIBUTING.md 2015-01-08 17:33:49 -08:00
snipe 5c98dae57d Merge branch 'develop' 2015-01-08 11:34:19 -08:00
snipe 5a6139fb64 Merge pull request #391 from bitdeli-chef/master
Add a Bitdeli Badge to README
2014-11-22 22:57:29 -05:00
Bitdeli Chef 0fb2728e3f Add a Bitdeli badge to README 2014-11-23 04:06:26 +00:00
3 changed files with 8 additions and 5 deletions
+1 -2
View File
@@ -6,13 +6,12 @@ Please submit all issues and pull requests to the [snipe/snipe-it](http://github
If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
-----
[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
-----
## Translations!
Executable → Regular
+6 -2
View File
@@ -7,7 +7,7 @@
This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.
It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)
@@ -16,7 +16,7 @@ __This is web-based software__. This means there there is no executable file (ak
-----
### Documentation & Installation
__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!
__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__
We'll be adding a long-overdue user's manual soon as well.
@@ -65,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
php artisan migrate
Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+1 -1
View File
@@ -360,7 +360,7 @@
<a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> |
<a href="https://crowdin.com/project/snipe-it">Help Translate It! </a> |
<a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a>
&nbsp; &nbsp; (v1.2.2)</p>
&nbsp; &nbsp; (v1.2.3)</p>
</div>
</div>
</div>