Fixed merge conflicts

This commit is contained in:
Peter Kos 2015-04-01 18:58:03 -04:00
commit 61918cb06e

View File

@ -32,7 +32,8 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://houndci.com/ - Comments on github commits about code quality - free for Open Source
* https://coveralls.io/ - Display test coverage reports - free for open source
* https://scrutinizer-ci.com/ - Continuous inspection platform - free for Open Source
* https://codecov.io/ - Code coverage tool (SaaS) free for 1 private project and no restrictions for public repos
* https://codecov.io/ - Code coverage tool (SaaS), free for 1 private project and no restrictions for publics repos
* https://insight.sensiolabs.com/ _ Code Quality for PHP/Symfony projects, free for Open Source
## CI / CD
@ -44,16 +45,23 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://semaphoreci.com/ - 100 private builds / month. Unlimited for Open Source.
* http://www.shippable.com/ - Free for 1 build container, private and public repos, unlimited builds.
* https://snap-ci.com - Free for public repositories, 1 build at the time
* http://www.appveyor.com/ - CD service for Windows. Free for open-source projects.
* [Comparison of Continuous Integration services](https://github.com/ligurio/Continuous-Integration-services)
* https://saucelabs.com/ - CI with scalable testing for mobile and web apps, free for Open Source
* http://ftploy.com/ - 1 project w/ unlimited deployments
* https://deployhq.com/ - 1 project w/ 10 daily deployments
## Security and PKI
* https://www.globalsign.com/en/ssl/ssl-open-source/ - Free SSL certs for Open Source projects
* https://www.startssl.com/ - Free SSL certs
* https://stormpath.com/ - Free user management, authentication, social login, and SSO.
* https://auth0.com/ - Hosted free for development SSO
* https://getclef.com/ - A new take on auth, unlimited free tier for anyone not using premium features
* https://getclef.com/ - New take on auth unlimited free tier for anyone not using premium features
* https://ringcaptcha.com/ - Tools to use phone number as id, available for free
* https://www.ssllabs.com/ssltest/ - Very deep analysis of the configuration of any SSL web server
* https://qualys.com/forms/freescan/owasp/ - Find web app vulnerabilities, audit for OWASP Risks
* [alienvault.com ThreatFinder](https://www.alienvault.com/open-threat-exchange/threatfinder) - Uncovers compromised systems in your metwork
## Management Systems
@ -67,9 +75,12 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* http://sematext.com/logsene - Free for 1M logs, unlimited retention
## Analytics
* http://www.splunk.com/en_us/products/splunk-cloud.html - Upload 5GB of data per day up to 28GB of total data stored
* https://parse.com - Unlimited free analytics
## Monitoring
* https://www.thousandeyes.com - Network & user experience monitoring. 3 locations, plus 20 data feeds of major web services free.
* https://www.datadoghq.com/ - Free for up to 5 nodes
* http://www.stackdriver.com/ - Free for up to 10 nodes/services
@ -86,9 +97,12 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://ghostinspector.com/ - Free website and web application monitoring. Single user, 100 test runs per month
* http://java-monitor.com/ - Free monitoring of JVM's and uptime
* http://sematext.com/spm - Free for 24h metrics, unlimited number of servers, 10 custom metrics, 500K custom metrics data points, unlimited dashboards, users, etc.
* https://sealion.com/ - Free up to 2 servers, 3 days data retention, graphs and raw command output history (`top`, `ps`, `ifconfig`, `netstat`, `iostat`, `free`, custom, etc.)
* https://www.stathat.com - Get started with ten stats for free, no expiration.
## Crash / Exception handling
* https://rollbar.com/ - Exception and error monitoring, free for prototypes and personal projects
* https://rollbar.com/ - Exception and error monitoring, free plan - 5000 errors/month, unlimited users, 30 days retention.
* https://bugsnag.com/ - Free for up to 2000 errors a month after the initial trial
* https://airbrake.io/ - Free for 1 project, 1 user, 2 errors per minute, 2 day retention
* http://getsentry.com/ - Sentry tracks app exceptions in realtime, has a small free plan
@ -96,18 +110,21 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
## Search
* https://swiftype.com hosted search solution (API and crawler). Free for a single search engine with up to 1000 documents. Free upgrade to Premuim level for open-source projects.
* https://bonsai.io - Free 1GB memory and 1GB storage.
* http://www.searchly.com - Free 2 Indices and 5MB storage.
## Email
* http://www.mailgun.com/ - First 10,000 emails are free
* http://www.mailgun.com/ - First 10,000 emails per month are free
* http://mailchimp.com/ - Send 12,000 emails to 2,000 subscribers for free
* http://sendgrid.com/ - 400 emails per day for free
* http://mandrill.com/ - First 12,000 emails are free
* https://www.phplist.com/ - Hosted version allow 300 emails per months for free
* https://www.mailjet.com/ - 6,000 emails per months for free
* https://www.sendinblue.com/ - 9,000 emails per months for free
* https://www.phplist.com/ - Hosted version allow 300 mails per month for free
* https://www.mailjet.com/ - 6000 mails per month for free
* https://www.sendinblue.com/ - 9000 mails per month for free
## CDN and Protection
* http://www.cloudflare.com/ - Basic service is free, good for a blog
* http://www.bootstrapcdn.com/ - CDN for bootstrap, bootswatch and font awesome
* https://surge.sh - Zero-bullshit, singlecommand, bring your own source control web publishing CDN.
@ -121,6 +138,8 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* http://hpcloud.com/ - $300 credit over 90 days.
* https://appharbor.com/ - A .Net PaaS that provides 1 free worker
* https://www.heroku.com/ - Host your apps in the cloud, free for single process apps
* https://www.firebase.com/ - Build realtime apps, free plan has 50 Max Connections, 5 GB Data Transfer, 100 MB Data Storage.
1 GB Hosting Storage and 100 GB Hosting Transfer.
* https://bluemix.net/ - IBM PaaS with a monthly free allowance
* https://www.openshift.com/ - RedHat OpenShift offers 3 free hosted apps
* https://bitnami.com/ - One free small app
@ -129,6 +148,14 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://bigml.com/ - Hosted machine learning algorithms. Unlimited free tasks for development, limit of 16MB data per task
* https://www.activestate.com/stackato/ - Enterprise-hardened Cloud Foundry PaaS from ActiveState, for private, public and hybrid cloud, free up to 20GB
## BaaS
* https://www.parse.com - Mobile backends, free plan has 30 requests per second, with 20 GB of file and database storage, as well as push notifications for up to 1,000,000 unique recipients.
## Web Hosting
* https://www.simplybuilt.com - SimplyBuilt offers free website building and hosting for open source projects (http://www.simplybuilt.com/explore/free-websites-for-open-source-projects). Simple alternative to GitHub Pages.
## IaaS
* https://exoscale.ch/ - Free resources for Open Source projects
@ -136,13 +163,16 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://developer.rackspace.com/ - Rackspace Cloud gives $50/month for 12 months
* https://cloud.google.com/compute/ - Google Compute Engine gives $300 over 60 days
* https://cloud.google.com/container-engine/ - Google Container Engine for run Docker containers(Alpha). Pricing: same of Google Compute Engine.
* https://nsone.net/ - Data Driven DNS, automatic traffic management, 1M free Queries
## DBaaS
* https://mongolab.com/ - MongoDB as a service (500mb free)
* https://realm.io - Free to use even for commercial projects, under Apache 2.0 License
* https://orchestrate.io/ - 1 application free
* https://redislabs.com/redis-cloud - Redis as a Service (25 mb free)
* https://www.backand.com/ - Back-end as a service (for AngularJS)
* http://www.zenginehq.com - Build business workflow apps in minutes - free for single users
* https://parsehub.com/ — Extract data from dynamic sites, turn dynamic websites into APIs, 5 projects free.
## STUN, WebRTC, Web Socket Servers and other Routers
* https://pusher.com. Hosted Web Sockets broker. Free for up to 20 simultaneous connections and 100k messages a day.
@ -154,6 +184,8 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://www.atlassian.com/opensource/overview - Free Jira etc for Open Source projects
* https://kanbanflow.com/ - Board based project management. Free (premium version with more options).
* https://kanbanpad.com/ - Board based project management. Free (premium version with more options).
* https://kanbanery.com/ - Board based project management. Free for 2 users (premium tiers with more options).
* https://trello.com/ - Board based project management. Free
* https://waffle.io/ - Board based project management solution from your existing GitHub Issues. Free for open-source.
* https://huboard.com/ - Instant project management for your GitHub issues. Free for open-source.
@ -161,23 +193,42 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar```
* https://www.jetbrains.com/youtrack/buy/open_source_incloud.jsp - Free hosted YouTrack (InCloud) for FOSS projects (private projects free for 10 users: https://www.jetbrains.com/youtrack/buy/)
* https://github.com - In addition to its git storage facility, github offers basic issue tracking
* https://asana.com - Free for private project with collaborators.
* http://www.acunote.com/ - Free project management and SCRUM software for up to 5 team members.
* http://gliffy.com/ - Online diagrams: flowchart, UML, wireframe... Also Plugins for Jira & Confluence. 5 diagrams and 2 MB free.
* https://cacoo.com/ - Online diagrams in real time: flowchart, UML, network. Free max. 15 users/diagram, 25 sheets.
## Storage and Media Processing
* https://www.aerofs.com/ - P2P file syncing, free for up to 30 users
* http://cloudinary.com - Image upload, powerful manipulations, storage, and delivery for sites and apps, with libraries for Ruby, Python, Java, PHP, Objective-C and more. Perpetual free tier includes 7500 images/month, 2gb storage, 5gb bandwidth.
## Package Build Systems
* https://build.opensuse.org/ - package build service for multiple distros (SUSE, EL, Fedora, Debian etc.)
* https://copr.fedoraproject.org/ - mock-based RPM build service for Fedora and EL
* https://help.launchpad.net/Packaging - Ubuntu and Debian build service
## IDE and Code Editing
* https://c9.io - IDE in a browser. Incorporates an Ubuntu virtual machine and in-browser terminal access. Integrates with github and bitbucket, but also adds SFTP and generic Git access.
* https://koding.com - IDE in a browser. Features: Full sudo access - VMs hosted on Amazon EC2 - SSH Access - Real EC2 VM, no LXCs/hypervising - Custom sub-domains - Publicly accessible IP - Ubuntu 14.04 - IDE/Terminal/Collaboration
* https://www.nitrous.io - Private Linux instance(s) with interactive collaboration {[More Details](http://goo.gl/J1Zbsg)}
* https://www.nitrous.io - Private Linux instance(s) with interactive collaboration {[More Details](http://goo.gl/J1Zbsg)}
* http://visualstudio.com/free - Fully-featured IDE with thousands of extensions, cross-platform app development (Microsoft extensions available for download for iOS and Android), desktop, web and cloud development, multi-language support (C#, C++, JavaScript, Python, PHP and more).
* https://wakatime.com - quantified self metrics about your coding activity, using text editor plugins - Limited plan for free.
* https://codenvy.com/ - IDE in a browser, collaborative, git integration, build and run your app in customizable Docker-based runners (free 512Mb RAM to distribute between you runners), pre-integrated deploy to Google Apps.
* https://apiary.io/ - Collaborative design API with instant API mock and generated documentation (Free for unlimited API blueprints and unlimited user with one admin account and hosted documentation)
* https://www.jetbrains.com/ruby/ - RubyMine IDE primarily used for Ruby/RoR Projects. Free license for students, teachers, open source projects, and user groups.
## Analytics, Events and Statistics
* https://www.librato.com/ - Event/Data collection service with analysis and graphs. Limited plan for free.
* https://google.com/analytics/ - Google Analytics
* http://sematext.com/search-analytics - Free for up to 50K actions/month, 1 day data retention, unlimited dashboards, users, etc.
* https://usabilityhub.com - Test designs and mockups on real people, track visitors. Free for one user, unlimited tests.
## Other Packs
* https://education.github.com/pack - As long as you're a student at a recognized university
## Docker Related