Build: #11 was successful Changes by 3 people

Code commits

Africa Strikes 1.0 test

  • Lucien van Wouw <lwo@iisg.nl>

    Lucien van Wouw <lwo@iisg.nl> 1f36fb9dd9542c81af41dea5eefaa35318b2f4e2

    Merge pull request #3 from IISH/AFRICAM-38
    Update to add label to the strike provided

  • Igor &lt;igorvich1988@hotmail.com&gt;

    Igor <igorvich1988@hotmail.com> d623106f160c4fe1b34277eac27429f98835569a

    Update to add label to the strike provided
    Added Label model which can be added to the Strike.
    Changed the way the order of transactions in Ebean are done due to adding new Labels to the database if not existent.
    Added code to handle the adding of new Labels in StrikeController.
    Small textual edit in IdentityDetail.
    Added the Label variables to the class Strike.
    Adjusted the views for admin, index and update to fit the new information for the Label.
    Update on the database in the sql file.
    Added code in the javascript to handle the label input field.

    • app/controllers/AdminController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/controllers/HomeController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/controllers/StrikeController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/IdentityDetail.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/Label.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/Strike.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/admin.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/index.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/update.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • conf/evolutions/default/1.sql (version d623106f160c4fe1b34277eac27429f98835569a)
    • public/javascripts/africa-strikes-form.js (version d623106f160c4fe1b34277eac27429f98835569a)

Africa Strikes 1.0 production

  • Igor &lt;igorvich1988@hotmail.com&gt;

    Igor <igorvich1988@hotmail.com> d623106f160c4fe1b34277eac27429f98835569a

    Update to add label to the strike provided
    Added Label model which can be added to the Strike.
    Changed the way the order of transactions in Ebean are done due to adding new Labels to the database if not existent.
    Added code to handle the adding of new Labels in StrikeController.
    Small textual edit in IdentityDetail.
    Added the Label variables to the class Strike.
    Adjusted the views for admin, index and update to fit the new information for the Label.
    Update on the database in the sql file.
    Added code in the javascript to handle the label input field.

    • app/controllers/AdminController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/controllers/HomeController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/controllers/StrikeController.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/IdentityDetail.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/Label.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/models/Strike.java (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/admin.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/index.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • app/views/update.scala.html (version d623106f160c4fe1b34277eac27429f98835569a)
    • conf/evolutions/default/1.sql (version d623106f160c4fe1b34277eac27429f98835569a)
    • public/javascripts/africa-strikes-form.js (version d623106f160c4fe1b34277eac27429f98835569a)
  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 87403938067739083b9df592049ba0d3fa356d62

    Merge branch 'AFRICAM-37' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 5b4d29184cd288bf7a4ac7e756eff0ecf8a017c8 m

    Merge branch 'AFRICAM-37' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 87027a0ec9b10c4d8fb6d5a3af05ecc9bda083cc m

    Merge branch 'AFRICAM-37' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 93bd9ee107407c287918270f8b79ed0cc5cc252c m

    Merge branch 'AFRICAM-37' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 08b11e26eb5ea0194f814285d0b6810be18486dc m

    Merge remote-tracking branch 'origin/AFRICAM-35' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 873266b50f642ed671bcf25dd3a9807d20dd1d7d m

    Merge branch 'development' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 7eaa5bfe160fc07f8b87ccea3f508d4f4109ae87 m

    Merge branch 'development' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 31cde3484b24fc2fda12ba54707f2524fe47c473 m

    Merge branch 'development' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 0f7357ad49dbadb2fc269b21350319248ff820d3 m

    Merge branch 'development' into test

  • kerim1 &lt;kerim.meijer@gmail.com&gt;

    kerim1 <kerim.meijer@gmail.com> 5738e8a3f01d54f131af4a71606331426ce6f1a4 m

    Merge branch 'development' into test