Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Materialized the App. Addressed #10. #14

Merged
merged 5 commits into from
Sep 26, 2016
Merged

Materialized the App. Addressed #10. #14

merged 5 commits into from
Sep 26, 2016

Commits on Sep 26, 2016

  1. Materialized the App.

    @betterclever
    betterclever committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    c534a86 View commit details
    Browse the repository at this point in the history

  2. Display Error in case of Internet Unavailability. fossasia#9

    @betterclever
    betterclever committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    365e80d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/fossasia/susi_android 

    # Conflicts:
#	app/src/main/java/org/fossasia/susi/ai/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/layout/item_mine_message.xml
    @betterclever
    betterclever committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    a8c6246 View commit details
    Browse the repository at this point in the history

  4. Fixed RecyclerAdapter error in last commit

    @betterclever
    betterclever committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    2b14ecd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/fossasia/susi_android 

    # Conflicts:
#	app/src/main/java/org/fossasia/susi/ai/MainActivity.java
    @betterclever
    betterclever committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    93f067b View commit details
    Browse the repository at this point in the history