inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
197 Commits 335 Branches 2,191 Tags
ba1f77de60394d00851f94daebca264eb8ae3bfd
Commit Graph

197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ramona Neamtu
ba1f77de60 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119862 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      118831 jphuynh: Merged JPHUYNH/BDE-409 (5.1.0) to 5.1-MC1 (5.1.0)
         115753 jphuynh: DOCS-1406: Reviewed messages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-15 12:54:12 +00:00
Ramona Neamtu
a6d311a245 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119861 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      118830 jphuynh: Merged JPHUYNH/BDE-409 (5.1.0) to 5.1-MC1 (5.1.0)
         115515 jphuynh: Enterprise only feature. It was lost during the rebase.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-15 12:54:00 +00:00
Ramona Neamtu
930e1e7fa7 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119860 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      118829 jphuynh: Merged JPHUYNH/BDE-409 (5.1.0) to 5.1-MC1 (5.1.0)
         115380 jphuynh: Merged  ^/alfresco/BRANCHES/DEV/JPHUYNH/BDE-409@114065
            114065: BDE-409: Solr Sharded is an Enterprise Only feature.
               + Fixed the Alfresco Platform Installer scenario. (No Solr1 in that case)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-15 12:53:49 +00:00
Ramona Neamtu
d276080acc Merged HEAD (5.1) to 5.1.N (5.1.1) 
119859 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      118828 jphuynh: Merged JPHUYNH/BDE-409 (5.1.0) to 5.1-MC1 (5.1.0)
         115378 jphuynh: Merged  ^/alfresco/BRANCHES/DEV/JPHUYNH/BDE-409@113834
          113834: BDE-409: Added remote Solr and Sharded Solr support in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-15 12:53:38 +00:00
Raluca Munteanu
c33b9f5f6e Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
119755 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119710 jphuynh: MNT-15358: Fixed the uninstaller to remove the applied-updates directory.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-09 12:14:50 +00:00
Andrei Rebegea
3fd94ae86b Merged HEAD (5.1) to 5.1.N (5.1.1) 
118408 jphuynh: ACE-4593: Updated translations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-27 10:10:21 +00:00
Andrei Rebegea
ce243175f7 Merged HEAD (5.1) to 5.1.N (5.1.1) 
118389 jphuynh: ACE-4593: Updated translations. Japanese, Norwegian and Dutch will arrive shortly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-27 10:10:02 +00:00
Natalia Smintanca
336e09c1b0 Merged HEAD (5.1) to 5.1.N (5.1.1) 
118336 slanglois: ACE-4709 Stop relying on system JAVA_OPTS when installing: Tomcat fails to start on some Windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 11:32:04 +00:00
Ramona Neamtu
2d1f99eb43 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE) 
118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      117710 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX (4.1.11)
            117543: MNT-15230 : Update Copyright year to 2016
               - Updated year; renamed splash_2016.png
      117912 rneamtu: MNT-15230 : Update Copyright year to 2016
         - Modified extra properties files for V4.2.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-20 10:18:44 +00:00
Natalia Smintanca
a07515b106 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117978 jphuynh: ACE-4531: Hide the complete version of Tomcat.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:48:14 +00:00
Natalia Smintanca
3aa4232df7 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117955 jphuynh: ACE-4537: Changed permissions for alfresco-global.properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:48:02 +00:00
Natalia Smintanca
691ca5c7d7 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117721 jphuynh: [GPL licensed components removal] Removed swftools from localisation messages.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:39:54 +00:00
Natalia Smintanca
4d618cc18e Merged HEAD (5.1) to 5.1.N (5.1.1) 
117632 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
         - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml
         - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui,
           admin ui English property values (translations still exist) and some obvious unit tests.
         - Note: SWFTransformationOptions has been left as it is used in tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:33:36 +00:00
Natalia Smintanca
19d41b613c Merged HEAD (5.1) to 5.1.N (5.1.1) 
117631 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      114606 jphuynh: - Changed version to 5.1-NO-GPL-SNAPSHOT
      - Updated LibreOffice, Common and PostgreSQL versions
      - Removed swftools


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:32:15 +00:00
Natalia Smintanca
39644fe34a Merged HEAD (5.1) to 5.1.N (5.1.1) 
117601 mcozma: CM-682 Disable virtual folders by default and provide sample configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:26:34 +00:00
Natalia Smintanca
0d4e703608 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117596 jphuynh: ACE-4604: Fix the Share installer with the renaming on ACE-4561.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:25:36 +00:00
Natalia Smintanca
4d514863c3 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117595 jphuynh: ACE-4593: Reordered port binding error messages to check syntax before trying to bind.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:25:09 +00:00
Alan Davis
acb40de71f Merged HEAD (5.1) to 5.1.N (5.1.1) 
117491 bhorje: CM-690 virtualization share configs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-14 13:37:40 +00:00
Tatyana Valkevych
daf3dc6dc9 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116607 jphuynh: ACE-4593: Updated port binding error message.
   - Will need to go through localisation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:59:28 +00:00
Tatyana Valkevych
f677120c09 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116577 jphuynh: ACE-4446, ACE-4547, ACE-4569: Fixed the English msgid for Japanese translation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:57:55 +00:00
Tatyana Valkevych
dc4be4d71f Merged HEAD (5.1) to 5.1.N (5.1.1) 
116575 jphuynh: ACE-4446, ACE-4547, ACE-4569: Added Japanese translation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:57:38 +00:00
Tatyana Valkevych
c58c84b504 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116374 jphuynh: ACE-4547: Removed the built-in messages translation. It breaks the whole localisation logic.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-09 10:38:54 +00:00
Tatyana Valkevych
005f166c1c Merged HEAD (5.1) to 5.1.N (5.1.1) 
116281 jphuynh: ACE-4446, ACE-4547, ACE-4569: Added translations for Built-in messages, Solr1 detailed description and other small messages changes. (Chinese,Portuguese (Brazil) and Norwegian)
   Pending: Japanese


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 13:20:55 +00:00
Tatyana Valkevych
1690919143 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116256 jphuynh: ACE-4446, ACE-4547, ACE-4569: Added translations for Built-in messages, Solr1 detailed description and other small messages changes.
   Pending: Chinese, Japanese, Portuguese (Brazil) and Norwegian


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 13:19:53 +00:00
Tatyana Valkevych
7165cc661a Merged HEAD (5.1) to 5.1.N (5.1.1) 
116248 jphuynh: ACE-4569: Fixed process_binding_message logic that prevented strings from being translated because of the combination of variables.
   + Fixed the warning panel msgid formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 13:19:17 +00:00
Tatyana Valkevych
ab7f4f068f Merged HEAD (5.1) to 5.1.N (5.1.1) 
116119 jphuynh: ACE-4561: Release Agility: Updates to the installer
   - Alfresco Share Enterprise


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 13:20:56 +00:00
Tatyana Valkevych
4e0c91c5a5 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116063 jphuynh: ACE-4547: Updated the Easy option string + Localisation update respecting the advanced configuration for German and Norwegian.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 13:19:32 +00:00
Alan Davis
66d2f7550d Merged HEAD (5.1) to 5.1.N (5.1.1) 
115797 jkaabimofrad: ACE-4230: Upgraded webscripts to 5.7. Also, added 'ssl-config' element into share-config-custom.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-03 08:09:44 +00:00
Alan Davis
cb1c9daa7a Merged HEAD (5.1) to 5.1.N (5.1.1) 
115795 jphuynh: ACE-4547, ACE-4446: Fixed process binding message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-03 08:04:14 +00:00
Alan Davis
b25bbef54d Merged HEAD (5.1) to 5.1.N (5.1.1) 
115780 jphuynh: ACE-4547: Added localisation for Language selection + updated various messages
   + Clean up and updated consistency of the README files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-03 08:04:06 +00:00
Tatyana Valkevych
19c1a6c8d3 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115760 jphuynh: ACE-4521: Changed Solr detailed description in the installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-02 14:57:53 +00:00
Tatyana Valkevych
f4df6bef57 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115522 jphuynh: ACE-4447: Updated localisation for the installers (Russian)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-02 14:48:06 +00:00
Tatyana Valkevych
e31980ec3f Merged HEAD (5.1) to 5.1.N (5.1.1) 
115518 mrogers: ACE-4386 - JBPM related properties are not removed from alfresco-global.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-02 14:45:41 +00:00
Tatyana Valkevych
a906113764 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115410 jphuynh: ACE-4447: Updated localisation for the installers (Italian)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-02 14:41:12 +00:00
Alan Davis
1d88061a92 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115348 jphuynh: ACE-4447: Updated localisation for the installers. Russian and Italian are pending review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:41 +00:00
Andreea Dragoi
6cad088ce8 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
115353 nsmintanca: Merged NESS/5.0.N-2015-09-09 (5.0.3) to 5.0.N (5.0.3)
      115075: MNT-14307 CMIS landing page URL incorrect in share-config-custom.xml
         - update the file to show the correct URL to find the RepositoryID


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 09:26:26 +00:00
Andreea Dragoi
22acb11a02 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115167 jphuynh: ACE-4508: Fixed missing alfresco-spp AMP.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-27 09:43:14 +00:00
Ancuta Morarasu
1e24c16e46 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114422 jphuynh: ACE-4447: Fixed messages around Java Validation and Share installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 12:56:37 +00:00
Ancuta Morarasu
5a715de30b Merged HEAD (5.1) to 5.1.N (5.1.1) 
114415 jphuynh: ACE-4456: Fixed warning message formatting.
   - Updated message on LibreOffice part with 2 new required libraries.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 12:34:37 +00:00
Ancuta Morarasu
deb28cb0af Merged HEAD (5.1) to 5.1.N (5.1.1) 
114401 jphuynh: ACE-4446: Fixed duplicated error messages around port binding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 15:19:31 +00:00
Ancuta Morarasu
8a50fd3d15 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114354 jphuynh: ACE-4447: Added detailed description for Solr and Solr4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 15:19:14 +00:00
Ancuta Morarasu
a3ff9257b6 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114339 jphuynh: ACE-4447: Added changes in Installer messages after review from DOCS-1356


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 15:18:45 +00:00
Ancuta Morarasu
2b4d4de705 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114247 jphuynh: ACE-4406: Fixed typo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:23:07 +00:00
Ancuta Morarasu
e96745f49d Merged HEAD (5.1) to 5.1.N (5.1.1) 
114203 jphuynh: ACE-4406: Updated alf-en.po for localisation.
   - Removed unused project.po file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:20:25 +00:00
Ana Bozianu
3701cac4e1 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114038 jphuynh: ACE-4230: Ported Jamal’s verify-hostname flag to the correct file we use.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-09 12:06:15 +00:00
Ana Bozianu
44fdbc8e40 Merged HEAD (5.1) to 5.1.N (5.1.1) 
113844 jphuynh: ACE-4406: Updated the Share installer with comments from DOCS-1316 review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-09 11:55:27 +00:00
Alan Davis
ba2dbb9a4f Merged HEAD (5.1) to 5.1.N (5.1.1) 
112997 jphuynh: ACE-4229: Moved the copy and the configuration of keystore, server.xml and tomcat-users.xml from Solr(4) to the common component.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-27 17:16:11 +00:00
Alan Davis
6a3cfce91a Merged HEAD (5.1) to 5.1.N (5.1.1) 
112963 slanglois: ACE-4275 Replace Platform URL in Share config
    - re-apply commit r110291 in project.xml for RA-558, lost by mistake in r110748
    - also, resurrect piece of common.xml, so that folder common is not created on Windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-27 17:16:03 +00:00
Samuel Langlois
a7d7e3e1da Create branch 5.1.N from HEAD r111853 identified as 5.1.1-SNAPSHOT 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-10 13:30:19 +00:00
Jean-Pierre Huynh
dc5f6b3aa9 BDE-402: Integrated LibreOffice fix for Linux from Bitrock 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111158 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-08-31 10:49:19 +00:00