Merge branch '2.5.x' into saas

Conflicts: airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
2015-01-23 16:24:09 -05:00 · 2015-01-23 16:24:09 -05:00 · ef6572aea9
commit ef6572aea9
parent fd42c67b0b 239aae029e
22 changed files with 22 additions and 22 deletions
--- a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
@ -32,4 +32,4 @@
            <value></value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
@ -136,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
@ -106,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
@ -136,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
@ -96,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
@ -96,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
@ -86,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
@ -250,4 +250,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
@ -96,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
@ -96,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
@ -136,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
@ -272,4 +272,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
@ -136,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
@ -262,4 +262,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
@ -96,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
@ -159,4 +159,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
@ -136,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
@ -136,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
@ -136,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
@ -106,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
@ -86,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>