Commit Graph

8 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Tatyana Valkevych
4ae85c623b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103721: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103683: Merged DEV to V5.0.N (5.0.2)
         102953: MNT-13933: CalendarHelpersTest unit test fails in negative offset timezone e.g. US/Atlanta.
                    - In CalendarHelpersTest.simpleTimeZoneNorthern() was changed date.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 15:27:36 +00:00
Samuel Langlois
8d7f1a1520 Merge HEAD-BUG-FIX (5.1) to HEAD (5.1/Cloud40)
102529: Merge RA-SPRINT3 to HEAD-BUG-FIX (5.1)
      102321: RA-106 - CalendarHelpersTest unit test fails in non-British timezone
         fixed for non english language.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 11:14:59 +00:00
Alan Davis
38efc4c619 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60607: Fixed generics, unused code and and some minor formatting - found during investigations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:17:51 +00:00
Alan Davis
efca2709c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59252: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59196: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58963 : MNT-10006: SPP: NPE occurs for recurrent event which occurs monthly/yearly on any weekday/weekend day
            - Support of day/weekday/weekend recurrence pattern was implemented
            - Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:16:36 +00:00
Alan Davis
8fecf5f0fc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57915: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57908: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57900: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57890: Merged DEV to V4.1.7 (4.1.7)
               57718:  MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                  - Implemented the functionality that allow updating series in outlook calendar.
               57846: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                 - Unit tests and unforeseen behaviour (deletion of updated occurrence; update of recurrence, when occurrence was deleted) were implemented. Also, mini calendar dashlet was updated.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:28:24 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00