Merge authors: Morten Olav Hansen (mortenoh) ------------------------------------------------------------ revno: 15341 [merge] committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Wed 2014-05-21 21:12:39 +0200 message: Merge branch localized-calendar from Morten. Implements new and more sophisticated calendar solution. added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParser.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/TimeUnit.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParserTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/DateUnitTypeTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/TimeUnitTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/impl/ dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/impl/NepaliCalendarTest.java modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateInterval.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnit.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Cal.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialAprilPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialJulyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialOctoberPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAbstractPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAprilPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/DateUnitTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/PeriodTypeTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/QuarterlyPeriodTypeTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtilsImpl.java The size of the diff (5258 lines) is larger than your specified limit of 5000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
