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

Login Tout & Sign Up, GDPR style #249

Merged
merged 5 commits into from
May 17, 2018
Merged

Login Tout & Sign Up, GDPR style #249

merged 5 commits into from
May 17, 2018

Commits on May 14, 2018

  1. updating the strings and login tout copy

    @eoji
    eoji committed May 14, 2018
    Configuration menu
    Copy the full SHA
    a42f278 View commit details
    Browse the repository at this point in the history

  2. new strings broke my other views so i am combining PRs

    @eoji
    eoji committed May 14, 2018
    Configuration menu
    Copy the full SHA
    e427ed8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into log-in-tout-gdpr-copy 

    # Conflicts:
#	app/src/main/assets/json/server-config.json
#	app/src/main/res/values-es/strings_i18n.xml
#	app/src/main/res/values-fr/strings_i18n.xml
#	app/src/main/res/values-ja/strings_i18n.xml
    @eoji
    eoji committed May 14, 2018
    Configuration menu
    Copy the full SHA
    1a0384a View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. updating landscape login tout copy and updating the italian strings (… 

    …why do we have them?!?!!?)
    @eoji
    eoji committed May 17, 2018
    Configuration menu
    Copy the full SHA
    95a626e View commit details
    Browse the repository at this point in the history

  2. WHY

    @eoji
    eoji committed May 17, 2018
    Configuration menu
    Copy the full SHA
    149d9a3 View commit details
    Browse the repository at this point in the history