Jamal Kaabi-Mofrad 
							
						 
					 
					
						
						
							
						
						de94938b0d 
					 
					
						
						
							
							Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)  
						
						... 
						
						
						
						135804 jkaabimofrad: APPSREPO-35, APPSREPO-118: Added tests for reset password service and REST API.
       - Added a utility class (EmailUtil) to work with MailActionExecutor in test mode
       - Added a new workflow task responsible for sending the reset password confirmation email (per peer review)
       - Changed the reset-password endpoint to return a 202 response for an inactive workflow or invalid workflow id, key or mismatched user
       - Some other minor changes as the result of adding tests
       - Also, fixed tests failures by changing the reset password workflow definition target namespace URI.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135931  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2017-03-16 19:39:31 +00:00 
						 
				 
			
				
					
						
							
							
								Jamal Kaabi-Mofrad 
							
						 
					 
					
						
						
							
						
						b96832b0fd 
					 
					
						
						
							
							Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)  
						
						... 
						
						
						
						135590 jkaabimofrad: APPSREPO-35: Added password reset V1 API.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135930  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2017-03-16 19:39:24 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						c76eb01e32 
					 
					
						
						
							
							BRAZILIAN PORTUGUESE: Amended term, changed from "e-mail" to "email" in REBRANDED files based on EN rev133628.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133663  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-12-14 13:53:13 +00:00 
						 
				 
			
				
					
						
							
							
								Alan Davis 
							
						 
					 
					
						
						
							
						
						c927123331 
					 
					
						
						
							
							Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)  
						
						... 
						
						
						
						133140 adavis: REPO-1458 English property file changes (From Andy H)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133232  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-28 20:21:25 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						8eacaef237 
					 
					
						
						
							
							SIMPLIFIED CHINESE: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132975  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 17:29:41 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						4841dbb00d 
					 
					
						
						
							
							RUSSIAN: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132972  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 17:12:00 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						7435dacdc9 
					 
					
						
						
							
							NORWEGIAN Bokmal: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132970  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 16:58:36 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						1a1cbde134 
					 
					
						
						
							
							JAPANESE: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132967  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 16:43:36 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						16997fdaf3 
					 
					
						
						
							
							FRENCH: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132965  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 16:25:02 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						547834cb9b 
					 
					
						
						
							
							ITALIAN: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132955  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 15:17:34 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						b7f4bbab5a 
					 
					
						
						
							
							GERMAN: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132952  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 14:58:14 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						0b824a5293 
					 
					
						
						
							
							BRAZILIAN PORTUGUESE: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132937  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 11:22:13 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						98b9939679 
					 
					
						
						
							
							SPANISH: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132932  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-21 11:02:28 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						5ad55d7b71 
					 
					
						
						
							
							DUTCH: Bundle updated as per EN-rev132594  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132869  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-11-17 14:49:52 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Mukha 
							
						 
					 
					
						
						
							
						
						33ee24817c 
					 
					
						
						
							
							Merged DEV to 5.2.N (5.2.1)  
						
						... 
						
						
						
						131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-10-10 17:34:57 +00:00 
						 
				 
			
				
					
						
							
							
								Constantin Popa 
							
						 
					 
					
						
						
							
						
						b6715f9b35 
					 
					
						
						
							
							SHA-1627 : CLONE - Create email template  
						
						... 
						
						
						
						- Hooked a new step into the invite moderated workflow, so as to notify by email all site managers of site join requests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129048  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-08-01 13:57:30 +00:00 
						 
				 
			
				
					
						
							
							
								Ancuta Morarasu 
							
						 
					 
					
						
						
							
						
						67f2d6ccb7 
					 
					
						
						
							
							Merged HEAD (5.2) to 5.2.N (5.2.1)  
						
						... 
						
						
						
						126628 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125414 gbroadbent: DUTCH: Updated bundle as per EN-rev125231
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126975  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2016-05-11 12:36:04 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						8bb57b3f21 
					 
					
						
						
							
							SIMPLIFIED CHINESE: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116388  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:55:28 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						64525bbf72 
					 
					
						
						
							
							BRAZILIAN Portuguese: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116387  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:54:40 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						71a4dcc523 
					 
					
						
						
							
							RUSSIAN: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116386  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:54:12 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						2836c74eed 
					 
					
						
						
							
							DUTCH: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116385  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:53:46 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						486f0035d3 
					 
					
						
						
							
							NORWEGIAN Bokmal: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116384  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:53:24 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						f93db3cca3 
					 
					
						
						
							
							JAPANESE: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116383  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:52:59 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						c234fc188e 
					 
					
						
						
							
							ITALIAN: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116382  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:52:20 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						7adf8248dd 
					 
					
						
						
							
							FRENCH: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116381  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:51:53 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						146ea794d8 
					 
					
						
						
							
							SPANISH: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116380  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:51:30 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						6accc7f565 
					 
					
						
						
							
							GERMAN: Updated bundles based on EN rev115827  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116379  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-11-06 12:51:04 +00:00 
						 
				 
			
				
					
						
							
							
								Alan Davis 
							
						 
					 
					
						
						
							
						
						113f170a22 
					 
					
						
						
							
							Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)  
						
						... 
						
						
						
						115569 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113040 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         112938 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112693 nsmintanca: Merged NESS/4.2.N-2015-09-17 (4.2.6) to V4.2-BUG-FIX (4.2.6)
               112598: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                  - added check on task status in workflow/TaskFormPersister.java;
                  - added localization for the error message in workflow/workflow-messages.properties;
                  - added condition to display a friendly error message in alfresco.js
                  - referenced  current object to access its properties in task-edit-header.js
                  - added noCache parameter to the URL to ensure that requests are always made to the server to update data at back action in data-loader.js
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115699  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-10-30 00:18:06 +00:00 
						 
				 
			
				
					
						
							
							
								Ahmed Owian 
							
						 
					 
					
						
						
							
						
						a1a53bc3de 
					 
					
						
						
							
							Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)  
						
						... 
						
						
						
						113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
     - Removed user task step from add-direct workflow
     - Added check for completed start task in InvitationServiceImpl to avoid error throwing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113854  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-10-07 20:10:40 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						d076fff262 
					 
					
						
						
							
							SIMPLIFIED CHINESE: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111817  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:30:43 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						15977fadb4 
					 
					
						
						
							
							BRAZILIAN Portuguese: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111816  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:30:01 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						87c2fd887b 
					 
					
						
						
							
							RUSSIAN: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111815  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:29:06 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						69eb720a7a 
					 
					
						
						
							
							DUTCH: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111814  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:28:32 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						57362fa8d7 
					 
					
						
						
							
							JAPANESE: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111811  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:27:08 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						a4f7a583b1 
					 
					
						
						
							
							ITALIAN: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111810  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:25:46 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						d7bbdd2f7a 
					 
					
						
						
							
							FRENCH: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111809  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:24:30 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						21f239d057 
					 
					
						
						
							
							SPANISH: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111808  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:23:44 +00:00 
						 
				 
			
				
					
						
							
							
								Gloria Broadbent 
							
						 
					 
					
						
						
							
						
						fbcde047fe 
					 
					
						
						
							
							GERMAN: Updated bundle based on EN rev111175  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111807  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-09-10 08:22:54 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						970409fa59 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110821: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110618: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110368: SIMPLIFIED CHINESE: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110934  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:41:55 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						d87cb2bcdc 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110820: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110617: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110366: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110933  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:39:56 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						31f61c2b55 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110818: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110616: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110365: DUTCH: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110932  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:38:47 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						f9080d5579 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110816: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110615: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110364: NORWEGIAN (Bokmal): Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110931  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:37:42 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						be29d6c811 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110815: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110614: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110361: JAPANESE: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110930  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:36:21 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						29a12ce25c 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110814: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110613: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110360: ITALIAN: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110929  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:35:12 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						1aee971b4b 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110812: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110612: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110358: FRENCH: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110927  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:33:32 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						0ee089d95e 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110811: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110611: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110356: SPANISH: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110924  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:30:37 +00:00 
						 
				 
			
				
					
						
							
							
								Tatyana Valkevych 
							
						 
					 
					
						
						
							
						
						d6f7e67bdf 
					 
					
						
						
							
							Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)  
						
						... 
						
						
						
						110810: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110610: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110354: GERMAN: Updated bundle based on EN-rev110125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110915  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-26 13:15:49 +00:00 
						 
				 
			
				
					
						
							
							
								Ray Gauss 
							
						 
					 
					
						
						
							
						
						dd308bc12f 
					 
					
						
						
							
							Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)  
						
						... 
						
						
						
						105662: SHA-944: Change Order of Email Send to Be After Adding Site
     - Changed workflow order
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110793  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-25 14:02:06 +00:00 
						 
				 
			
				
					
						
							
							
								Ray Gauss 
							
						 
					 
					
						
						
							
						
						39a3ac65fd 
					 
					
						
						
							
							Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)  
						
						... 
						
						
						
						105365: SHA-957: Create New Email Template
     - Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
     - Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate bean definition
     - Added localization messages for subject and space
     - Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
     - Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-25 14:01:33 +00:00 
						 
				 
			
				
					
						
							
							
								Ray Gauss 
							
						 
					 
					
						
						
							
						
						aee14f6158 
					 
					
						
						
							
							Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)  
						
						... 
						
						
						
						105016: SHA-935: Repository Invite Flow Changes
     - Added new invitation-add-direct.bpmn20.xml workflow
     - Added bootstrapping of new workflow
     - Changed InvitationServiceImpl to allow setting of workflows used
     - Added configuration of workflows used in invitationService bean
     - Added repository properties for default workflows
     - Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
     - Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
     - Added test of new flow to Activiti test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110788  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2015-08-25 14:00:26 +00:00