Skip to content

Commit

Permalink
Merge branch 'release/0.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesus89 committed Apr 14, 2018
2 parents ab5158c + 568f972 commit ece800e
Show file tree
Hide file tree
Showing 27 changed files with 2,075 additions and 1,047 deletions.
26 changes: 15 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<img src="./doc/images/icestudio-logo-label.png" align="center">

[![Build Status](https://travis-ci.org/FPGAwars/icestudio.svg?branch=0.3.2-beta)](https://travis-ci.org/FPGAwars/icestudio)
[![Version](https://img.shields.io/badge/version-v0.3.2--beta-orange.svg)](https://github.com/FPGAwars/icestudio/releases)
[![Build Status](https://travis-ci.org/FPGAwars/icestudio.svg?branch=0.3.2)](https://travis-ci.org/FPGAwars/icestudio)
[![Version](https://img.shields.io/badge/version-v0.3.2-orange.svg)](https://github.com/FPGAwars/icestudio/releases)
[![License](http://img.shields.io/:license-gpl-blue.svg)](http://opensource.org/licenses/GPL-2.0)
[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=latest)](http://icestudio.readthedocs.io/en/latest)

**Experimental** graphic editor for open FPGAs. Built on top of the [Icestorm project](http://www.clifford.at/icestorm/).
**Experimental** graphic editor for open FPGAs. Built on top of the [Icestorm project](http://www.clifford.at/icestorm/) using [Apio](https://github.com/FPGAwars/apio).

Graphic design -> Verilog, PCF -> Bistream -> FPGA

Expand Down Expand Up @@ -86,14 +86,15 @@ npm start

### Languages

| Language | Translated strings |
|:----------:|:------------------------------------------:|
| English | ![Progress](http://progressed.io/bar/100) |
| Spanish | ![Progress](http://progressed.io/bar/100) |
| French | ![Progress](http://progressed.io/bar/97) |
| Galician | ![Progress](http://progressed.io/bar/97) |
| Basque | ![Progress](http://progressed.io/bar/96) |
| Catalan | ![Progress](http://progressed.io/bar/86) |
| Language | Translated strings |
|:----------:|:-----------------------------------------:|
| English | ![Progress](http://progressed.io/bar/100) |
| Spanish | ![Progress](http://progressed.io/bar/100) |
| French | ![Progress](http://progressed.io/bar/100) |
| Chinese | ![Progress](http://progressed.io/bar/100) |
| Catalan | ![Progress](http://progressed.io/bar/100) |
| Galician | ![Progress](http://progressed.io/bar/97) |
| Basque | ![Progress](http://progressed.io/bar/95) |

**Contribute!**

Expand Down Expand Up @@ -173,6 +174,9 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo
* v0.3, v0.2: using [JointJS](https://github.com/clientIO/joint) and [AlertifyJS](https://github.com/MohammadYounes/AlertifyJS)
* v0.1: using [AngularJS-Flowchart](https://github.com/codecapers/AngularJS-FlowChart)

* [FPGAwars](http://fpgawars.github.io/) community has developed this project in a voluntary and altruistic way since 02/2017.

<img src="https://avatars3.githubusercontent.com/u/18257418?s=100">

* [BQ](https://www.bq.com) sponsored this project from 02/2016 to 02/2017. Thanks

Expand Down
26 changes: 13 additions & 13 deletions app/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
"tests"
],
"dependencies": {
"angular": "^1.6.0",
"angular-route": "^1.5.5",
"jquery": "^2.0.3",
"backbone": "^1.2.1",
"lodash": "^3.10.1",
"joint": "^0.9.6",
"angular-bootstrap": "^1.3.3",
"bootstrap": "^3.3.6",
"ace-builds": "^1.2.5",
"select2": "^4.0.3",
"async": "^1.5.2",
"svg-pan-zoom": "~3.4.0",
"alertify-js": "^1.8.0",
"angular": "~1.6.9",
"angular-route": "~1.6.9",
"jquery": "~2.2.4",
"backbone": "~1.3.3",
"lodash": "~3.10.1",
"joint": "~0.9.10",
"angular-bootstrap": "~1.3.3",
"bootstrap": "~3.3.7",
"ace-builds": "~1.2.9",
"select2": "~4.0.5",
"async": "~1.5.2",
"svg-pan-zoom": "~3.4.1",
"alertify-js": "~1.11.1",
"jquery-resize": "v1.1",
"angular-gettext": "https://github.com/Jesus89/angular-gettext.git#master"
}
Expand Down
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "icestudio",
"version": "0.3.2-beta",
"version": "0.3.2",
"description": "Experimental graphic editor for open FPGAs",
"author": "Jesús Arroyo Torrens <[email protected]>",
"repository": "https://github.com/FPGAwars/icestudio",
Expand Down Expand Up @@ -52,7 +52,7 @@
"ssh-exec": "^2.0.0",
"sudo-prompt": "^7.1.0",
"svgo": "~0.7.2",
"temporary": "0.0.8"
"tmp": "0.0.33"
},
"readme": "../README.md",
"keywords": [
Expand Down
Loading

0 comments on commit ece800e

Please sign in to comment.