Skip to content
This repository has been archived by the owner on May 8, 2019. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xebia-functional/nine-cards-v2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.5-alpha
Choose a base ref
...
head repository: xebia-functional/nine-cards-v2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 17, 2016

  1. Adds owned field in API

    Fede Fernández committed Oct 17, 2016
    Copy the full SHA
    6c80327 View commit details

Commits on Oct 18, 2016

  1. Copy the full SHA
    fe36309 View commit details

Commits on Nov 21, 2016

  1. Added some tests

    anamariamv committed Nov 21, 2016
    Copy the full SHA
    794a5db View commit details
  2. Copy the full SHA
    d1bb9a1 View commit details
  3. Added more tests

    anamariamv committed Nov 21, 2016
    Copy the full SHA
    76a7def View commit details
  4. Copy the full SHA
    38d9d99 View commit details
  5. Added tests

    anamariamv committed Nov 21, 2016
    Copy the full SHA
    ca7dda3 View commit details
  6. Copy the full SHA
    e30fa41 View commit details

Commits on Nov 22, 2016

  1. Upgrades scala android plugin and cats library

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    331b002 View commit details
  2. Travis using java8

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    7f4b89c View commit details
  3. Added last tests

    anamariamv committed Nov 22, 2016
    Copy the full SHA
    c70d542 View commit details
  4. reviewed indentation

    anamariamv committed Nov 22, 2016
    Copy the full SHA
    a9920e2 View commit details
  5. Implicit of monix using monix cats

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    108e5f7 View commit details
  6. Merge pull request #1134 from 47deg/am-test-group-collection-jobs

    Test group collection jobs
    Javi Pacheco authored Nov 22, 2016
    Copy the full SHA
    ac70a9a View commit details
  7. Merge branch 'master' into javi-1133-upgrade-libraries

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    63cfc25 View commit details
  8. Changed string of wizards inline

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    1d2e084 View commit details
  9. Upgraded monix to 2.1.1

    Javi Pacheco committed Nov 22, 2016
    Copy the full SHA
    7f26d50 View commit details

Commits on Nov 23, 2016

  1. Copy the full SHA
    2890cb3 View commit details
  2. Copy the full SHA
    cc162da View commit details

Commits on Nov 24, 2016

  1. Bugs fixed in autocancelable tasks in monix

    Javi Pacheco committed Nov 24, 2016
    Copy the full SHA
    1cab792 View commit details
  2. Merge pull request #1137 from 47deg/am-test-navigationJobs-collections

    Test navigation jobs collections
    Javi Pacheco authored Nov 24, 2016
    Copy the full SHA
    f435321 View commit details
  3. Merge branch 'master' into javi-1133-upgrade-libraries

    Javi Pacheco committed Nov 24, 2016
    Copy the full SHA
    0914834 View commit details
  4. Copy the full SHA
    2ad3f00 View commit details
  5. Copy the full SHA
    2c71e20 View commit details
  6. Merge pull request #1135 from 47deg/javi-1133-upgrade-libraries

    Upgrade libraries
    Javi Pacheco authored Nov 24, 2016
    Copy the full SHA
    de2a73c View commit details
  7. Copy the full SHA
    848d22d View commit details
  8. Refactor commons package

    Javi Pacheco committed Nov 24, 2016
    Copy the full SHA
    faa160a View commit details

Commits on Nov 25, 2016

  1. Clock removed in moment bar and dark theme fixed

    Javi Pacheco committed Nov 25, 2016
    Copy the full SHA
    227b7a2 View commit details
  2. Changes in menu drawer

    Javi Pacheco committed Nov 25, 2016
    Copy the full SHA
    c26281d View commit details
  3. Tests fixed

    Javi Pacheco committed Nov 25, 2016
    Copy the full SHA
    e017f13 View commit details
  4. Added more tests

    anamariamv committed Nov 25, 2016
    Copy the full SHA
    f0ee9d4 View commit details
  5. Merge pull request #1144 from 47deg/javi-1140-fix-ui

    Menu and moments
    Javi Pacheco authored Nov 25, 2016
    Copy the full SHA
    1077a78 View commit details

Commits on Nov 28, 2016

  1. New version for Google Play

    Javi Pacheco committed Nov 28, 2016
    Copy the full SHA
    d407dd6 View commit details
  2. Merge pull request #1146 from 47deg/javi-new-version

    New version for Google Play
    Javi Pacheco authored Nov 28, 2016
    Copy the full SHA
    fb487e2 View commit details
  3. Deleting information in steps on wizard

    Javi Pacheco committed Nov 28, 2016
    Copy the full SHA
    2846f03 View commit details

Commits on Nov 29, 2016

  1. Added more tests

    anamariamv committed Nov 29, 2016
    Copy the full SHA
    b813022 View commit details
  2. Tests added to rollback methods

    Javi Pacheco committed Nov 29, 2016
    Copy the full SHA
    cef3b2a View commit details
  3. Copy the full SHA
    020eab6 View commit details
  4. Copy the full SHA
    7ee0511 View commit details
  5. New documentation added

    Javi Pacheco committed Nov 29, 2016
    Copy the full SHA
    9beeefd View commit details
  6. Merge pull request #1151 from 47deg/javi-1150-documentation

    New documentation
    Javi Pacheco authored Nov 29, 2016
    Copy the full SHA
    b464c32 View commit details
  7. Merge branch 'master' into javi-1147-rollback.wizard

    Javi Pacheco committed Nov 29, 2016
    Copy the full SHA
    0ce6d53 View commit details
  8. Copy the full SHA
    29e05eb View commit details
  9. Copy the full SHA
    e9028f7 View commit details
  10. Merge pull request #1148 from 47deg/javi-1147-rollback.wizard

    Deleting information in steps on wizard
    Javi Pacheco authored Nov 29, 2016
    Copy the full SHA
    abcb479 View commit details
  11. Copy the full SHA
    b6be3e2 View commit details
  12. Copy the full SHA
    6f00251 View commit details
  13. Copy the full SHA
    c270d2c View commit details
  14. fixed test with sequential

    anamariamv committed Nov 29, 2016
    Copy the full SHA
    4009bfd View commit details
  15. Copy the full SHA
    2c3d5d4 View commit details
Showing 878 changed files with 40,645 additions and 19,162 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -58,3 +58,8 @@ proguard-sbt.txt
#Gen
modules/api/gen/
modules/repository/gen/

#Keys

travis-deploy-key
travis-deploy-key.pub
22 changes: 22 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
style = defaultWithAlign
maxColumn = 100

continuationIndent.callSite = 2

newlines {
sometimesBeforeColonInMethodReturnType = false
}

align {
arrowEnumeratorGenerator = false
ifWhileOpenParen = false
openParenCallSite = false
openParenDefnSite = false
}

docstrings = JavaDoc

rewrite {
rules = [SortImports, RedundantBraces]
redundantBraces.maxLines = 1
}
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
sudo: false
language: scala
jdk:
- oraclejdk8
scala:
- 2.11.7
addons:
@@ -9,6 +11,9 @@ addons:
- lib32z1
- lib32stdc++6
before_install:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash
scripts/decrypt-keys.sh; fi
- export PATH=${PATH}:./vendor/bundle
- wget http://dl.google.com/android/android-sdk_r24-linux.tgz
- tar xf android-sdk_r24-linux.tgz
- export ANDROID_HOME=$PWD/android-sdk-linux
@@ -20,6 +25,11 @@ before_install:
- echo yes | android update sdk --all --filter extra-android-support --no-ui
- echo yes | android update sdk --all --filter extra-android-m2repository --no-ui
- echo yes | android update sdk --all --filter extra-google-m2repository --no-ui
install:
- rvm use 2.2.3 --install --fuzzy
- gem update --system
- gem install sass
- gem install jekyll -v 3.2.1
script:
- sbt ++$TRAVIS_SCALA_VERSION "project commons" coverage test
- sbt ++$TRAVIS_SCALA_VERSION "project api" coverage test
@@ -30,3 +40,5 @@ script:
after_success:
- sbt ++$TRAVIS_SCALA_VERSION "project tests" test:coverageAggregate
- bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash
scripts/publishMicrosite.sh; fi
49 changes: 48 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
## 2017/02/06 - Version Name: 2.0.11-rc2 - Version Code: 68

* FlowUp have to be activated from Developer Options

## 2017/01/30 - Version Name: 2.0.10-rc1 - Version Code: 67

* Improved the experience when the user back to the launcher from App Drawer
* New technical documentation
* Changed URL for sharing collections
* Some bugs fixed in UI

## 2016/12/23 - Version Name: 2.0.9-beta - Version Code: 66

* The user can add Bluetooth devices to Moment
* Improved Widgets screen
* Added Apptentive
* The user can disable Google Analytics
* Added tests for jobs
* Some bugs fixed in UI

## 2016/12/16 - Version Name: 2.0.8-beta - Version Code: 65

* Drag&Drop for managing widgets
* Share from other apps have been improved
* Bugs fixed in shortcuts
* Bugs fixed in subscriptions
* Added tests for jobs
* Some bugs fixed in UI

## 2016/12/02 - Version Name: 2.0.7-beta - Version Code: 64

* New About screen with Scala libraries and Team
* Number of views in Public Collections is updated when the user adds it to his collections
* New actions to access to Google Play and Phone in AppDrawer
* Fixed some problems with AppDrawer in empty lists
* Fixed problems in Wizard when some steps launch an exception
* Added tests for jobs
* Some bugs fixed in UI

## 2016/11/28 - Version Name: 2.0.6-alpha - Version Code: 63

* Removed clock in Moment bar
* Added options to menu: wallpaper, settings and widgets
* Upgrade libraries: SBT-Android plugin, Cats and Monix
* Added tests for jobs
* Some bugs fixed in UI

## 2016/11/21 - Version Name: 2.0.5-alpha - Version Code: 62

* We have removed the collapse toolbar in Collections Screen
@@ -59,4 +106,4 @@

## 2016/10/14 - Version Name: 2.0-alpha - Version Code: 57

* First alpha version
* First alpha version
31 changes: 31 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

## How Can I Contribute?

The issues have been integrated into all stages of the development process. This way, the work is coordinated through the so-called Agile Management following Scrum techniques. For this process, we used Projects in GitHub.

First, you should create a new issue with the bug or new behaviour that you want to implement in 9 Cards. You also can contribute implementing the [existing issues in 9 Cards](https://github.com/47deg/nine-cards-v2/issues).

When you create a new issue you have to add [the labels](https://github.com/47deg/nine-cards-v2/labels) so other developers can understand the problem or new behaviour.

The mandatory labels are:

- **Story Points:** Rate the relative work effort in a Fibonacci-like format: 1, 2, 3, 5, or 8. If we are referring to time, the correspondence for every SP is: 2 hours, 1 day, 2 or 3 days, 1 week and 2 weeks. If you want to put 8 SP on one issue, you should consider dividing the issue.
- **Server or Client:** You should add a new label if the issue is for the [server](https://github.com/47deg/nine-cards-backend) or [client](https://github.com/47deg/nine-cards-v2). In addition, if it's a client issue, you can add a `ui` label if you're only working on UI.
- **Expertise Level:** Add the label for `beginner`, `intermediate` or `advanced`.

You have more labels that you can use if you think they're relevent for other developers such as `bug`, `critical`, `test`, and so on.

When you have selected the issue that you want to work on, you must add the issue in [the board](https://github.com/47deg/nine-cards-v2/projects) (Server or Client) in the `In progess` column. After that, you should create a new `branch` where you'll implement the code. The name of the branch is important:

- [Github Name]-[Issue Number]-[Small Description]

For example, `47dev-1213-Fixing_Tests`

Every issue passes through four statuses:

- **Development:** you are resolving the issue. The issue is in `In Progress` column.
- **Code review:** another person is reviewing the style of the code. You can assign the issue to another developer. The issue is in the `Code review` column. You need a `LGTM!` or `Thumbs up` to pass on to the next step.
- **QA:** another person verifies that the code resolves the issue. The issue is in `QA` column. If the branch covers the description as expected, you can pass on to the next step.
- **Ready to Master:** The issue is in the `Ready to Master` column. You have to wait until we include the code in master.

If you finish the process, you'll be a contributor of 9 Cards and we'll be happy to have you!
14 changes: 14 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
### Description

[Description of the issue]

### Steps to Reproduce

1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:** [What you expect to happen]

**Actual behavior:** [What actually happens]

25 changes: 25 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright 2016 47 Degrees, LLC. <http://www.47deg.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Regarding the use of a piece of code from the cards.nine.utils.SystemBarTintManager.java by readyState Software:

Copyright (C) 2013 readyState Software Ltd

And cards.nine.app.ui.components.layouts.SlidingTabLayout.scala by The Android Open Source Project

Copyright (C) 2013 The Android Open Source Project

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15 changes: 15 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Pull Request Checklist

* [ ] Have you read through the [contributor guidelines](https://github.com/47deg/nine-cards-v2/blob/master/CONTRIBUTING.md)?
* [ ] Have you added copyright headers to new files?
* [ ] Have you updated the documentation?
* [ ] Have you added tests for any changed functionality?

## Fixes

Fixes #xxxx

## Purpose

What does this PR do?

Loading