113854 aowian: 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/BRANCHES/DEV/5.1.N/root@114049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113704 adavis: Fix build error after
Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
113602 cturlica: MNT-14504: Cloud pull process not working after large delete
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
- Fixed the starting time for the purge old nodes process.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113291 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113279 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
113102 amorarasu: MNT-10305: DeletedNodeCleanupWorker should be improved.
- Moved the retrying transaction helper declaration back in the while loop - fix test attempt.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
111742: MNT-10305: DeletedNodeCleanupWorker should be improved
- Delete in multiple statements, filtering by transactions with commit time in a time interval.
112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113036 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113030 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113019 amukha: MNT-14862 MNT-13871: [UserAuth] Login via FTP works when the license limit exceed
- Corrected the AlfrescoFtpAuthenticator to rollback teh transaction if an exception was thrown.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
112930: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
112707 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
112677 dvaserin: MNT-14780 (MNT-13871): Licence Error message when in overage
- Place overage buffer information into License MBean and use it in admin license ftl.
112634 adavis: MNT-13871: Merged DEV (V4.2.5-MNT-13871-LATEST) to V4.2.5 (4.2.5)
111550: Merged DEV (4.1.11) to DEV (4.2.5)
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Merged all made changes in core alfresco projects as single commit to fresh dev branch forked from V4.1-BUG-FIX.
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- added try/finally approach to reset show delete users flag to default value.,
111574: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added V4.2.5 specific changes.,
111582: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Updated the jar to correspond with the latest changes in authorised-users/4.2,
111751: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed unnecessary configuration.,
111752: Merged DEV (V4.1.11) to DEV (V4.2.5)
111632: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Fixed unit tests for build plan: https://bamboo.alfresco.com/bamboo/browse/DEV-ENT414-1,
111753: Merged DEV (4.1.11) to DEV (V4.2.5)
111719: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated authorization related icons with ones provided by Mark Howarth.
- Information message in Deauthorize Dialog was changed to the on provided by Mark Howarth.,
111754: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated to the latest authorised-users lib.,
111761: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Fix for the SchemaReferenceFileTest.,
111800: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Modified the test to create a tenant in a retrying transaction to solve the DataIntegrityViolationException.,
111801: Megred DEV (4.1.11) to DEV (4.2.5)
111795: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated Deleted column to display text instead of tick icon.
- Added name for actions column.,
111813: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Updated to the latest authorisation jar to fix the Scema Reference test.,
112020: MNT-14775: De-authorisation pop-up has similar title to first line of text
- Remove the duplicated text from the pop-up body
- Updated link to point the 4.2 documentation,
112134: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Update authorization jar,
112144: MNT-13871: Optimized strings in users.get.properties,
112184: MNT-14762 : [UserAuth]Users from the ALFRESCO_ADMINISTRATORS LDAP group are not pre-authorized
- Updated authorized-users jar with fix for ldap administrators pre-authorization.,
112196: MNT-14729 : [UserAuth] The column header for the Deauthorize and Reauthorize button should have a name
- Updated name for re/de-authorize actions column.,
112202: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Add new authorization jar to fix null errors,
112203: MNT-14779: System behaviour when system set read only due to licence exception
- Force read-write transaction for LoginPost script.,
112225: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Add new authorization jar after unit test fixing.,
112226: MNT-14740 : [UserAuth] The message for the failed re authorization is not displayed onIE
- Code for reloading page was wrapped with YAHOO.lang.later() function.,
112247: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
- Updated authorization jar with fix for kerberos unit test.,
112259: MNT-14776: Heading banner text when using all allowed authorised users.
- Changed the message.
- Updated the authorised-users jar.,
112269: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Wrap methods that uses 'authenticationComponent.setCurrentUser' into RetryingTransaction for retrying on DataIntegrityViolationException.,
112285: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
- Updated version for authorized-users jar.,
112388: MNT-14809: [UserAuth] On a cluster setup after running the hourly job only one node goes into R/O mode
- Updated the authorised-users.jar,
112439: MNT-14815 : Wrong documentation link used in the deauthorize message window
- Corrected link to documentation.,
112445: MNT-14818 : [UserAuth] Missing quotation mark in the user reauthorization window message
- Corrected message for reauthorization dialog.,
112450: MNT-14802: [UserAuth] License warning message displayed for all the users
- Updated the authorised-users jar.,
112454: MNT-14780: Licence Error message when in overage
- Make license warn messages on admin console the same as banner warn messages.,
112471: MNT-14773 : Sort state not persisted after authorisation action
- Sorting/paging state is now persists in sessionStorage.,
112478: MNT-14773 : Sort state not persisted after authorisation action
- Corrected previous fix.,
112483: MNT-14814: [UserAuth] System goes into R/O mode after running the hourly job
- Updated the authorised-users jar to the latest version.,
112512: MNT-14833: [UserAuth] User cannot login on both nodes (cluster env.)
- Update authorization jar.,
112556: MNT-14787: [UserAuth] Login via NFS works when the license limit exceed
- Modified the exception handling of setCurrentUser method. Now all the exceptions are rethrown.,
112570: MNT-14838: Correct the Max Users string in the Admin Console License Screen
- Corrected the string, remove the incorrect translations from the bundle.,
112572: REVERSE MERGED <<code is not worth to implement>>
112471 : MNT-14773 : Sort state not persisted after authorisation action
- Sorting/paging state is now persists in sessionStorage.
112478 : MNT-14773 : Sort state not persisted after authorisation action
- Corrected previous fix. ,
112610: MNT-14837 : Report license overage to the log files on authorization/deauthorization of users
- Updated users authorization jar file.,
112627: MNT-14839: [UserAuth]Alfresco goes in read -only after reauthorize a user from LDAP ALFESCO_ADMINISTRATORS group
- Updated the authorised-users jar to the latest version.
Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
111954: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed context reference to authorization.,
112003: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added copying of sources and configuration from authorised-users to the output directory during build.,
112014: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Modified the build configuration to unpack the resources to the test folders.,
112027: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added unpacking of authorisation resources to repoitory-crypto project.,
112067: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed unpacking of resources, changed the context imports to point to authorization.,
112952: Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
111887: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Corrected the authorised-users version to correspond to 5.0.,
113060: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113059 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113058 adavis: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Version dependency for alfresco-authorised-users moved to top level pom
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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/BRANCHES/DEV/5.1.N/root@113040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
111792: MNT-11957: Approving a request to join site not available for auditing
- move rejectModeratedInvitation to InvitationService so its auditable
111854: MNT-11957: Approving a request to join site not available for auditing
- move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
111890: MNT-11957: Approving a request to join site not available for auditing
- Removed obsolete methods from InviteHelper
111991: MNT-11957: Approving a request to join site not available for auditing
- move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Extra changes that are required to make authorization module build green.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added small changes required for compilation of authorization module.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111501: Merged DEV to 5.0.N (5.0.3)
110986: MNT-14221 : CMIS aclCapability.getPermissionMappings() returns permissions that are not returned in aclCapability.getPermissions()
- Changed getRepositoryPermissions() to returned all repository permissions not only the exposed ones.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111249: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110999: Merged DEV to V4.2.5 (4.2.5)
MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition
- As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath.
- Unit test added.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110726: ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
- Implemented a JUnit test.
- Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111037: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110885: MNT-14532: Revert changes for MNT-14474 and MNT-12849: Merged V4.2.2 (4.2.2.24) to V4.2-BUG-FIX (4.2.6): Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110477: MNT-14532 : Revert changes for MNT-14474 and MNT-12849
-reverted revision 93098 done for MNT-12849 My Sites public API is not returning the expected list of sites
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110822: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110619: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110422: Merged DEV to V4.2.5 (4.2.5)
110332: MNT-14151 : CMIS Upload/Create in 4.2 adds the sys:hidden and cm:indexControl Aspect to documents starting with a period
- added system property in order to enable/disable cmis hidden behavior
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110768: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110604: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
110200: Merged DEV to V4.1-BUG-FIX (4.1.11)
109557: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
- Caching mechanism for the actions' parameters labels has been implemented. Labels for action's parameters will be loaded into RAM for the configured set of locales for each parameter of each definition of the action. Affected tests have been changed.,
110327: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
- Changed locale setting to fix build failure.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106201: SHA-1021: Add Leave Site Link to Email Template
- Added siteLeaveLink to properties for email generation in InviteSender
- Added link and styling to email template
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106196: SHA-993: Create Site Link in Email
- Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
- Updated email template with siteDashboardLink
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
