Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Add 'bisq.asset' to IDEA import layout table #1

Merged
merged 1 commit into from
Mar 28, 2018
Merged

Add 'bisq.asset' to IDEA import layout table #1

merged 1 commit into from
Mar 28, 2018

Conversation

cbeams
Copy link
Contributor

@cbeams cbeams commented Mar 27, 2018

To be merged along with bisq-network/bisq-core#32.

ManfredKarrer
ManfredKarrer reviewed Mar 27, 2018
View reviewed changes
Copy link
Contributor

@ManfredKarrer ManfredKarrer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about the name 'asset' - I though initially on the assets in the code like images, resource bundles, etc.... Not sure whats the best name. Tokens or altcoin is more specific, asset is more general but maybe a bit too overloaded.

ManfredKarrer
ManfredKarrer approved these changes Mar 27, 2018
View reviewed changes
Copy link
Contributor

@ManfredKarrer ManfredKarrer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But as I also don't find a better term to asset I am fine to go with it...
tuACK
I leave the merge to yourself to sync best with the other PR.

@cbeams cbeams merged commit 9421f43 into bisq-network:master Mar 28, 2018
cbeams added a commit that referenced this pull request Mar 28, 2018
@cbeams
Merge pull request #1 from cbeams/asset-redesign
17912c1 
Add 'bisq.asset' to IDEA import layout table
@cbeams cbeams mentioned this pull request Mar 28, 2018
Merged
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Generate defaut Jekyll _config.yml (bisq-network#1)
e464d61
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Customize and remove boilerplate from _config.yml (bisq-network#1)
2d3229f
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert line endings from CRLF (dos) to LF (unix)
9c559a6 
Using command:

    git ls-files | xargs dos2unix

Note that this change also strips trailing whitespace.

See: bisq-network#1
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert tabs to spaces (bisq-network#1)
63a2b73 
Using command:

    git ls-files \
        | egrep -v '(jpg|png|ttf|pdf|ico|gif)$' \
        | xargs -I file tab2space -lf file file

And verified with `git diff -w` to ensure only whitespace changes were
made and that no binary files were modified.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove Disqus Javascript from index.html (bisq-network#1)
b3cdc98
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove 'Add To Any' js/css from index.html (bisq-network#1)
ad4a6ee
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove 'Powered by WordPress' footer text (bisq-network#1)
479f936 
This had been set to `display: none` anyway, so was already dead code,
but the site is indeed no longer powered by WordPress at all, thus the
removal.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove commented out survey CTA (bisq-network#1)
2d349fb
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove WP xmlrpc references from index.html (bisq-network#1)
b3867c3
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove WP emoji from index.html (bisq-network#1)
d6dfd33
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove WP-json references from index.html (bisq-network#1)
b7f3e80
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove WP fd-ffootnotes JS from index.html (bisq-network#1)
7d11ded
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove WP feed links from index.html (bisq-network#1)
d652da8
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove 'canonical' and 'shortlink' links from index.html (bisq-network#1
801e58d 
)
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove 'clear' and 'comment' divs from index.html (bisq-network#1)
2ff1336
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Put empty spacer <p> back in place in index.html (bisq-network#1)
03c202a 
To match exact spacing of current https://bisq.io page. This can be
adjusted later.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove conditional IE comments from index.html (bisq-network#1)
05cb1ba
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Add .editorconfig (bisq-network#1)
399e4d2
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Reformat index.html (bisq-network#1)
9f91d89
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Avoid header/footer nav getting shifted to right (bisq-network#1)
dc7ecc2 
The formatting changes in the previous commit broke layout of header and
footer navs. This change puts the previous formatting back in place.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Enable Liquid template processing in index.html (bisq-network#1)
3151f85
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Extract page.title variable to index.html front matter (bisq-network#1)
5e71a2e
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Replace hard-coded copyright date with generated value (bisq-network#1)
f2caa51
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Extract default layout from index.html (bisq-network#1)
1003ae4
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove unused images (bisq-network#1)
cf01a39 
Using the following command:

    for i in $(find images);
    do
        count=$(git grep -l $i | wc -l);
        echo $count:$i;
    done | grep '^0:' | cut -d":" -f2 | xargs git rm
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Rename _posts/{*.html => *.md} (bisq-network#1)
10da937 
In preparation for actually converting their contents to Markdown in
subsequent commits.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Enable LiveReload by default and mention in README (bisq-network#1)
dd7c1b9
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
List and order posts properly on /blog index (bisq-network#1)
23d2b72
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert several posts from HTML => Markdown (bisq-network#1)
6b443db
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'dao manifesto' post to Markdown (bisq-network#1)
df3cdcb
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'privacy in bitsquare' post to Markdown (bisq-network#1)
35624fd 
Note in particular the conversion to first-class footnotes with
[^footnote] syntax.
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'Bitsquare becomes Bisq' post to Markdown (bisq-network#1)
e40604e
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'rebranding bounty' post to Markdown (bisq-network#1)
a68e8a6
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'bitsquare is rebranding' post to Markdown (bisq-network#1)
00e7d54
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'exploring the new territory' post to Markdown (bisq-network#1)
c2f0589
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Fix typo in 'exploring the new territory' post slug (bisq-network#1)
4d69b2a
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Polish 'exploring the new territory' post copy (bisq-network#1)
5f6036d
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert several short posts to Markdown (bisq-network#1)
6116b1f
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'now in alpha' post to Markdown (bisq-network#1)
ae38a91
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'decentralization is essential' post to Markdown (bisq-network#1
0a6ab34 
)
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'crowdfunding conclusion' post to Markdown (bisq-network#1)
ade60d3
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'update' post to Markdown (bisq-network#1)
d16d670
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'v0.4' post to Markdown (bisq-network#1)
ab5fdda
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Fix typo in 'v0.4' post slug (bisq-network#1)
c019523
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'development update' post to Markdown (bisq-network#1)
d3f807e
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'killer apps' post to Markdown (bisq-network#1)
81c83bc
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'new team members' post to Markdown (bisq-network#1)
0eabe7e
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'crypto governance' post to Markdown (bisq-network#1)
6bb1c8e
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'new p2p network' post to Markdown (bisq-network#1)
94a11f7
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Convert 'beta version launched' post to Markdown (bisq-network#1)
6f969cb
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Fix Markdown typo in 'killer apps' post (bisq-network#1)
d717daf
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Remove references to staging site url (bisq-network#1)
51bb591
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Revert "Remove unused pubkey dir (bisq-network#1)"
465ed7e 
This reverts commit 6ac95d2.

See bisq-network/bisq#900
ManfredKarrer pushed a commit to ManfredKarrer/archived_bisq that referenced this pull request Jun 26, 2018
@cbeams
Replace outdated PDFs and GitHub urls with clean redirs
a0a2aa2 
Problem bisq-network#1: we were linking to outdated arbitration-system and
risk-assessment PDFs.

Solution bisq-network#1: introduce /docs/exchange/arbitration-system and
/docs/exchange/risk-analysis redirects pointing to more up-to-date GDoc
versions

Problem bisq-network#2: we were linking to newly transcribed exchange and dao docs with
full GitHub URLs, which are long and hard to read at a glance when
mousing over.

Solution bisq-network#2: introduce /docs/exchange/whitepaper, /docs/dao/overview,
/docs/dao/specification redirects pointing to correct URL for these
docs in GitHub (and in GDocs for the latter).
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ManfredKarrer ManfredKarrer ManfredKarrer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cbeams @ManfredKarrer