You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@taverna.apache.org by Samhane <gi...@git.apache.org> on 2015/06/12 18:59:49 UTC

[GitHub] incubator-taverna-databundle-viewer pull request: Databundle viewe...

GitHub user Samhane opened a pull request:

    https://github.com/apache/incubator-taverna-databundle-viewer/pull/1

    Databundle viewer with authorization, some docs and bootstrap theme

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/Samhane/incubator-taverna-databundle-viewer master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-taverna-databundle-viewer/pull/1.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1
    
----
commit 042ef369762de3019d539a4d8a605e68d5087391
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T15:48:54Z

    Create Rails application

commit f4fbd035564d997cc42d493b02f2d338394316d5
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T16:08:12Z

    Installed needed gems:
    Devise - for authentication
    Slim and slim-rails - for replace erb in view templates
    Better_errors and binding_of_caller - for replace gem web-console
    Quiet_assets - for mutes assets pipeline log messages.

commit 760e058a30a66e385319df47dc8b28d8c413382b
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T17:56:25Z

    Installed devise: generated views, created configs

commit dfde15f30017f33edad494888b684e4b9b15db0a
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T17:57:33Z

    Generated User model with devise

commit 4896e834a2a4aaf690bf5a74cd924e2c5cd22feb
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T17:58:41Z

    Add css, fonts and js files from bootstrap theme: https://github.com/almasaeed2010/AdminLTE

commit 1c231973bb7e4c9bd40303587183a538620f9a71
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T18:30:27Z

    Install gems for testing: rspec, factory-girl, capybara, database_rewinder

commit 5f2cc7c76f2ef879a5adfe3f95aec3c3a0b9c290
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T18:32:14Z

    Setup rspec and create file for customizing generators

commit 97a5de74bddc2f48e66ceb162e80db7c5cc8eb41
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T18:39:30Z

    Add to README badges from CodeClimate and semaphoreci

commit 13862d12cd5ffc9308fd8d7f378d19e975a24d4b
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T18:44:41Z

    Install gem codeclimate-test-reporter and setup for using with rspec

commit b1cac9ec5b908221ee2e0ee9864885f09332eb86
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T19:06:50Z

    Specified version of ruby in Gemfile. Install puma as default web server. Create Procfile for heroku and install gem rails_12factor for use in heroku

commit 6a7f14854bfc5023557ada5b4a00b07a4824743e
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T19:09:19Z

    Translate layout from erb to slim. Set up default navigation bar, etc

commit 085d51810e99f0387d4dfce5af0e4089727ccee8
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-03T19:09:41Z

    Generate welcome controller and set up root path

commit c4877790f096cec9b00b2062b5855c9f111ac35b
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-05T20:44:41Z

    Added the Apache license header to controllers, helper and model files

commit db6fbb05405c4c7c4723d708c4eb783bd724039a
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-05T20:49:46Z

    Added the Apache license header to coffee and scss files

commit b366b6f4985bc8b565dec2be3cd90f066d2823ed
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-08T10:09:01Z

    Copied css and js files from AdminLTE to the vendor directory for the next usage in login page

commit 1abec0d9e8195417405b344318986ba1ef292b33
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-08T11:12:01Z

    Installed gem faker for generate data in tests.
    Created User factory for using in tests.
    Write tests for sign up and sign in

commit 168087d3b4681ee429ffd7d1e3e8d31d8ffd84ae
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-08T12:32:45Z

    Updated makeup for login and registration pages

commit 68097062a43121a068491afe9e7a60e8f9b61489
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-08T16:41:47Z

    Installed gems omniauth-facebook and omniauth-google-oauth2, setted it in devise config and added to user fields provider and uid

commit b1366b45ab6bb6911336a41c8866cb643e58454a
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-10T15:06:39Z

    Added correct links to sign in and sign out in layout

commit 5f116341cc268ba856f26e64c78fe6d6b435fa8a
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-10T15:08:49Z

    Added ability to sign in with omniauth: facebook (works correct) and google (in progress)

commit 42ead3bd73464d0362076af9dcfdeaab62aa65e5
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-10T15:11:42Z

    Update gems

commit 6765e144dc6072505e4a2c20e575a50e9f8872e4
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-10T20:22:13Z

    Added to README link to application on heroku

commit f8665dafffaa5fbd7a8db9f4bfbe532008d32d45
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-12T16:38:05Z

    Set up validation for email in user model, write tests for it

commit e71f30733a2fc9b896a95bd057e80f66f580369f
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-12T16:38:57Z

    Wrote tests for omniauth with facebook and google

commit d1d207c2fecb93b7918dd8eebafb84ffa752faf2
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-12T16:40:16Z

    Updated view for devise. Corrected view icons for google in login page

commit b68154a014523de92078d070e31cfbcfed08abf7
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-12T16:44:16Z

    Installed carrierwave gem for uploading files

commit c7ac631946394a76fd08ae13b96b60e0f0f8619e
Author: Denis Karyakin <sa...@gmail.com>
Date:   2015-06-12T16:44:27Z

    Wrote documentation in README for install and run application

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Re: [GitHub] incubator-taverna-databundle-viewer pull request: Databundle viewe...

Posted by Denis Karyakin <sa...@gmail.com>.

I have updated pull request with new file GEM_LICENSES, comprising licenses
for all used gems.
Also, I update rails to 4.2.2, it's a security upgrade

Work by the uploading and parsing databundle file I now do in separate
branch and send next pull request with working code

2015-06-18 23:49 GMT+03:00 Alan Williams <al...@googlemail.com>:

> On 18-Jun-15 20:26, Denis Karyakin wrote:
>
>> Hello Alan,
>>
>
> Thanks Denis.
>
>  Yes, I found all license and put there together, grouped by type of the
>> license
>>
>
> [snip]
>
>  puma - unknown type of license,
>> https://github.com/puma/puma/blob/master/LICENSE
>>
>
> I think that is 3 clause BSD - see
> http://opensource.org/licenses/BSD-3-Clause for comparison.
>
>  pg has two license files: BSDL (
>> https://github.com/ged/ruby-pg/blob/master/BSDL) and
>> https://github.com/ged/ruby-pg/blob/master/LICENSE
>>
>
> The first is 2 clause BSD - see
> http://opensource.org/licenses/BSD-2-Clause
>
> Can you put that information into a file? Then I think we will be good to
> pull :)
>
> I think it is best to be certain and methodical about the licensing now.
>
> Alan
>
>
>

Re: [GitHub] incubator-taverna-databundle-viewer pull request: Databundle viewe...

Posted by Alan Williams <al...@googlemail.com>.

On 18-Jun-15 20:26, Denis Karyakin wrote:
> Hello Alan,

Thanks Denis.

> Yes, I found all license and put there together, grouped by type of the
> license

[snip]

> puma - unknown type of license,
> https://github.com/puma/puma/blob/master/LICENSE

I think that is 3 clause BSD - see 
http://opensource.org/licenses/BSD-3-Clause for comparison.

> pg has two license files: BSDL (
> https://github.com/ged/ruby-pg/blob/master/BSDL) and
> https://github.com/ged/ruby-pg/blob/master/LICENSE

The first is 2 clause BSD - see http://opensource.org/licenses/BSD-2-Clause

Can you put that information into a file? Then I think we will be good 
to pull :)

I think it is best to be certain and methodical about the licensing now.

Alan