Subversion Commits

Subversion Commits

Select version:
Repository Revision Date User Message
svn #33409 Tue Aug 24 18:18:21 CEST 2010 wassek JAHIA-4944, QA-684: Problème redirection avec paramètre sous IE
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/javascript/jahia.js
Repository Revision Date User Message
svn #33130 Mon Aug 09 09:16:41 CEST 2010 wassek AND-HOT-548 JAHIA-4945: java.lang.NullPointerException Blog rights
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/impl/jahia/JahiaAclNodeImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/impl/jahia/NodeImpl.java
Repository Revision Date User Message
svn #32208 Fri Jun 11 09:57:44 CEST 2010 wassek AND-HOT-491 JAHIA-4938: "Page Setting" engine is opened in a wrong language when languageInURLForMappingAllowed is set to true
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/params/ProcessingContext.java
Repository Revision Date User Message
svn #31773 Thu May 20 08:55:53 CEST 2010 wassek AND-HOT-469 JAHIA-4936: vanity url is overwritten when you use the same vanity url on the same page for another
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/pages/PageProperties_Engine.java
Repository Revision Date User Message
svn #31745 Wed May 19 13:04:25 CEST 2010 wassek AND-HOT-455 JAHIA-4935: Page must be marked as changed
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/pages/PageProperties_Engine.java
Repository Revision Date User Message
svn #31453 Tue May 04 14:36:54 CEST 2010 tdraier JAHIA-4928 : Avoid npe in page url mapping
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/params/ProcessingContext.java
Repository Revision Date User Message
svn #31017 Wed Apr 07 10:34:29 CEST 2010 wassek JAHIA-4916
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/patches/sql/postgresql/jahia_urlmapping_creation.sql
Repository Revision Date User Message
svn #30730 Tue Mar 23 16:34:08 CET 2010 wassek JAHIA-4910
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/pages/pageproperties.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/shared/page_field.jsp
Repository Revision Date User Message
svn #30716 Tue Mar 23 10:46:01 CET 2010 wassek JAHIA-4908: SearchIndexer call BigTextField with null context
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/fields/JahiaBigTextField.java
Repository Revision Date User Message
svn #30617 Thu Mar 18 12:01:33 CET 2010 wassek JAHIA-4902, mappingoperation was null
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/pages/PageProperties_Engine.java
Repository Revision Date User Message
svn #28762 Mon Nov 09 12:45:57 CET 2009 sshyrkov JAHIA-4864: Jahia6.0, configuration wizard , some times clicking on the 'next step' button of the step7 leads to an http 404 page

http://jira.jahia.org/browse/JAHIA-4864

Resolution:
1) Do not copy the jahia.war folder at the end of the installation wizard, but rather move it
2) update the version from 6.0-SNAPSHOT to 6.0.1
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/prepackagedSites/testSite/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/templates/test-templates/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/server/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/war/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/core/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/bridges/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/templates/core-templates/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/war/src/main/java/org/jahia/bin/JahiaConfigurationWizard.java
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/qa-1/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/qa-2/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/qa-3/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-windows-package/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/qa-4/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-qa-package/qa-5/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/portlets/shared-map-RW/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/war/src/main/java/org/jahia/admin/database/DatabaseScripts.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/ear/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/patches/concurrent/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/public-api/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/core/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/portlets/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-jboss-package/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/portlets/shared-map-ext-R/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/war/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/prepackagedSites/webtemplates/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/bin/Jahia.java
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/package/jahia-tgz-package/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/ear/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/prepackagedSites/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/patches/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/templates/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/patches/compass/pom.xml
MODIFY /branches/JAHIA-6-0-BRANCH/test/pom.xml
Repository Revision Date User Message
svn #28570 Wed Oct 21 12:02:03 CEST 2009 sshyrkov JAHIA-4837: If you have a filter, pagination is displayed always
http://jira.jahia.org/browse/JAHIA-4837
http://10.8.37.247/fisheye/cru/AND-HOT-211
Problems:
1) When having <query:/> tags in the container list the top pagination is not working (the correct list size is not initialized yet)
2) The default pagination links are not working correctly in case sorting and filtering is used with the form

Resolution:
1) fix top pagination (moved from doStartTag to doAfterBody)
2) provide a new attribute for the <template:containerList/> tag and related: useFormForPagination.
         If set to true, pagination links will use JavaScript to update the current scrolling value
         and submit the enclosing form element (in this case the parent &lt;template:jahiaPageForm/&gt; is required).
         This is the case, when there sorting or filtering parameters in the HTML form, which should be
         considered for pagination.
         The default value is false, i.e. the pagination links use URLs with pagination parameters.
Files Changed
MODIFY /trunk/taglib/src/main/resources/META-INF/template.tld
MODIFY /trunk/taglib/src/main/java/org/jahia/taglibs/template/containerlist/ContainerListTag.java
Repository Revision Date User Message
svn #28567 Wed Oct 21 11:50:14 CEST 2009 sshyrkov JAHIA-4837: If you have a filter, pagination is displayed always
http://jira.jahia.org/browse/JAHIA-4837
http://10.8.37.247/fisheye/cru/AND-HOT-211
Problems:
1) When having <query:/> tags in the container list the top pagination is not working (the correct list size is not initialized yet)
2) The default pagination links are not working correctly in case sorting and filtering is used with the form

Resolution:
1) fix top pagination (moved from doStartTag to doAfterBody)
2) provide a new attribute for the <template:containerList/> tag and related: useFormForPagination.
         If set to true, pagination links will use JavaScript to update the current scrolling value
         and submit the enclosing form element (in this case the parent &lt;template:jahiaPageForm/&gt; is required).
         This is the case, when there sorting or filtering parameters in the HTML form, which should be
         considered for pagination.
         The default value is false, i.e. the pagination links use URLs with pagination parameters.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/template.tld
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/containerlist/ContainerListTag.java
Repository Revision Date User Message
svn #28247 Tue Sep 22 09:10:17 CEST 2009 sshyrkov JAHIA-4838: Error when loading feeds in Jahia 6 using RSS mashup
http://jira.jahia.org/browse/JAHIA-4838
http://10.8.37.247/fisheye/cru/AND-HOT-210

Cause: weird issue
1) the feed http://www.jahia.org/forum/rss.php?mode=topics includes <content:encoded/> elements in it
2) thus the list of content entries is not empty in the object GWTJahiaRSSEntry (GWTJahiaRSSFeed.getEntries(), which is used as a GWT transfer object for JahiaService.loadRssFeed)
3) but the GWTJahiaRSSContent class is not automatically detected by the GWT compiler and is not included into the serialization policy file.
Either this is a bug of GWT 1.5.3 or GXT 1.2.4 or the combination of both. There is no such problem in Crazy Jane branch.

Resolution: force GWT serialization for RSS feed related classes
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/data/rss/GWTJahiaRSSEntry.java
Repository Revision Date User Message
svn #27954 Tue Aug 25 14:03:04 CEST 2009 sshyrkov DEVLAVAL-10, JAHIA-951: Handle ActiveDirectory limits in loading group members for large groups
http://support.jahia.com/browse/DEVLAVAL-10
http://jira.jahia.org/browse/JAHIA-951
Resolution: implemented handling for Active Directory range queries
Files Changed
MODIFY /trunk/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
Repository Revision Date User Message
svn #27802 Mon Aug 17 11:53:05 CEST 2009 sshyrkov JAHIA-4780: ERROR while deploying Jahia 6 r-27015 on JBOSS Missing users.properties file
http://jira.jahia.org/browse/JAHIA-4780
http://10.8.37.247/fisheye/cru/AND-HOT-154
Cause: bug in Jackrabbit 1.5
Resolution: prefer local login configuration over JAAS.
Workaround for a bug in Jackrabbit 1.5: https://issues.apache.org/jira/browse/JCR-1977 which is fixed in v1.6 (http://svn.apache.org/viewvc?view=rev&revision=785981).

The problem with JBoss JAAS is that it always has a default login module ("other") and thus the JAAS is used instead of the local configuration.
Files Changed
MODIFY /branches/JAHIA-6-0-SP1-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaSecurityManager.java
ADD /branches/JAHIA-6-0-SP1-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java (from /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java)
Repository Revision Date User Message
svn #27801 Mon Aug 17 11:46:36 CEST 2009 sshyrkov JAHIA-4780: ERROR while deploying Jahia 6 r-27015 on JBOSS Missing users.properties file
http://jira.jahia.org/browse/JAHIA-4780
http://10.8.37.247/fisheye/cru/AND-HOT-154
Cause: bug in Jackrabbit 1.5
Resolution: prefer local login configuration over JAAS.
Workaround for a bug in Jackrabbit 1.5: https://issues.apache.org/jira/browse/JCR-1977 which is fixed in v1.6 (http://svn.apache.org/viewvc?view=rev&revision=785981).

The problem with JBoss JAAS is that it always has a default login module ("other") and thus the JAAS is used instead of the local configuration.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaSecurityManager.java
ADD /branches/JAHIA-6-0-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java (from /trunk/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java)
Repository Revision Date User Message
svn #27505 Tue Jul 14 10:40:07 CEST 2009 sshyrkov JAHIA-4780: ERROR while deploying Jahia 6 r-27015 on JBOSS Missing users.properties file
http://jira.jahia.org/browse/JAHIA-4780
Cause: bug in Jackrabbit 1.5
Resolution: prefer local login configuration over JAAS.
Workaround for a bug in Jackrabbit 1.5: https://issues.apache.org/jira/browse/JCR-1977 which is fixed in v1.6 (http://svn.apache.org/viewvc?view=rev&revision=785981).

The problem with JBoss JAAS is that it always has a default login module ("other") and thus the JAAS is used instead of the local configuration.
Files Changed
MODIFY /branches/JAHIA-6-1-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaSecurityManager.java
ADD /branches/JAHIA-6-1-BRANCH/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java (from /trunk/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java)
Repository Revision Date User Message
svn #27412 Wed Jul 08 09:16:47 CEST 2009 sshyrkov JAHIA-4780: ERROR while deploying Jahia 6 r-27015 on JBOSS Missing users.properties file
http://jira.jahia.org/browse/JAHIA-4780
Cause: bug in Jackrabbit 1.5
Resolution: prefer local login configuration over JAAS.
Workaround for a bug in Jackrabbit 1.5: https://issues.apache.org/jira/browse/JCR-1977 which is fixed in v1.6 (http://svn.apache.org/viewvc?view=rev&revision=785981).

The problem with JBoss JAAS is that it always has a default login module ("other") and thus the JAAS is used instead of the local configuration.
Files Changed
MODIFY /trunk/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaSecurityManager.java
ADD /trunk/jackrabbit-ext/core/src/main/java/org/apache/jackrabbit/core/security/JahiaAuthContextProvider.java
Repository Revision Date User Message
svn #27168 Wed Jun 10 12:22:57 CEST 2009 sshyrkov QA-157: Wrong value is exported for page links of type external URL
http://jira.jahia.org/browse/QA-157
http://10.8.37.247/fisheye/cru/AND-HOT-122

Related to the http://jira.jahia.org/browse/JAHIA-583 (One "Link to external website" per language).
Discovered in http://support.jahia.com/browse/PEUREFIN-11

Resolution: export correct value for the pages of type '2' depending on the language (external URL).
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/importexport/JahiaLegacyExporter.java
Repository Revision Date User Message
svn #27162 Wed Jun 10 11:12:25 CEST 2009 sshyrkov JAHIA-4654: Big text field: WAI checks: resize the incorrect images automatically
http://jira.jahia.org/browse/JAHIA-4654
http://10.8.37.247/fisheye/cru/AND-HOT-116
Resolution:
1) Improve image size detection:
 a) try height/width attributes of the <img/> element first
 b) try height/width values of the <img/>'s style attribute
 c) surround the image with a div wrapper 100 x 100 px with hidden overflow if the image size cannot be detected
2) Do not enlarge images to 100 x 100 px if they are smaller
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/htmlparser/WAIValidator.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/css/andromeda.css
Repository Revision Date User Message
svn #27137 Fri Jun 05 14:42:48 CEST 2009 sshyrkov QA-157: Wrong value is exported for page links of type external URL
http://jira.jahia.org/browse/QA-157
Related to the http://jira.jahia.org/browse/JAHIA-583 (One "Link to external website" per language).
Discovered in http://support.jahia.com/browse/PEUREFIN-11

Resolution: export correct value for the pages of type '2' depending on the language (external URL).
Files Changed
MODIFY /trunk/core/src/main/java/org/jahia/services/importexport/JahiaLegacyExporter.java
Repository Revision Date User Message
svn #27048 Mon May 25 15:01:03 CEST 2009 sshyrkov JAHIA-4654: Big text field: WAI checks: resize the incorrect images automatically
http://jira.jahia.org/browse/JAHIA-4654
Resolution:
1) Improve image size detection:
 a) try height/width attributes of the <img/> element first
 b) try height/width values of the <img/>'s style attribute
 c) surround the image with a div wrapper 100 x 100 px with hidden overflow if the image size cannot be detected
2) Do not enlarge images to 100 x 100 px if they are smaller
Files Changed
MODIFY /trunk/war/src/main/webapp/css/andromeda.css
Repository Revision Date User Message
svn #27047 Mon May 25 14:46:24 CEST 2009 sshyrkov JAHIA-4654: Big text field: WAI checks: resize the incorrect images automatically
http://jira.jahia.org/browse/JAHIA-4654
Resolution:
1) Improve image size detection:
 a) try height/width attributes of the <img/> element first
 b) try height/width values of the <img/>'s style attribute
 c) surround the image with a div wrapper 100 x 100 px with hidden overflow if the image size cannot be detected
2) Do not enlarge images to 100 x 100 px if they are smaller
Files Changed
MODIFY /trunk/core/src/main/java/org/jahia/services/htmlparser/WAIValidator.java
Repository Revision Date User Message
svn #27012 Wed May 20 00:01:36 CEST 2009 sshyrkov JAHIA-4383:
http://jira.jahia.org/browse/JAHIA-4383
http://10.8.37.247/fisheye/cru/AND-WROOM-112
Resolution: translation for resource bundle messages into German provided
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_en.properties
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/node/FolderTree.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_de.properties
Repository Revision Date User Message
svn #27011 Tue May 19 13:55:03 CEST 2009 ktlili [JAHIA-4748] avoid npe
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/layoutmanager/server/LayoutmanagerServiceImpl.java
Repository Revision Date User Message
svn #27004 Mon May 18 18:37:35 CEST 2009 dgriffon JAHIA-4738 : fixed (reviewed by cedric)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/mediaGallery.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/areas/mediaGallery.jsp
Repository Revision Date User Message
svn #27002 Mon May 18 17:37:01 CEST 2009 tdraier do not import preference node (JAHIA-4742)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/prepackagedSites/testSite/src/main/shared/repository.xml
Repository Revision Date User Message
svn #26989 Fri May 15 16:47:16 CEST 2009 ktlili [JAHIA-4642] and [JAHIA-686]
- toolbar + categories picker
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/data/category/GWTJahiaCategoryNode.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTree.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/provider/ToobarsJahiaToolItemProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/HorizontalJahiaToolbar.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/toolbar/toolbar.xml
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/PickedCategoriesGrid.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/ToolbarManager.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/ToolbarConstants.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/provider/InfoJahiaItemProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/categoriespicker.tag
Repository Revision Date User Message
svn #26981 Fri May 15 13:41:49 CEST 2009 bpapez [JAHIA-4734] Remove accents for wildcard and fuzzy search
- we need to convert the accent characters also on wildcard and fuzzy queries as accent characters are not stored in the index and so nothing would be found. I don't know why accents are only already removed in getPrefixQuery (=wildcard at the end) and not in getWildcardQuery and getFuzzyQuery, so I think we should put it there anyway.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/lucene/JahiaLuceneQueryParser.java
Repository Revision Date User Message
svn #26974 Fri May 15 09:52:36 CEST 2009 cmailleux Fix issue JAHIA-4441 due to some truncating even in compare mode
In comapre mode we must no ttruncate string as otherwise we cannot compare
Issue also in banner.jsp when using field value inside div style without setting that we do not want the diff between two values to be shown
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/field/DisplayLinkTag.java
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/banner.jsp
Repository Revision Date User Message
svn #26972 Thu May 14 18:34:01 CEST 2009 rfelden JAHIA-4383 : added french resources
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_fr.properties
Repository Revision Date User Message
svn #26971 Thu May 14 18:32:53 CEST 2009 rmora JAHIA-4730 CSS bug - home page Teasers
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/theme/default/css/ie6.css
Repository Revision Date User Message
svn #26970 Thu May 14 17:58:47 CEST 2009 rfelden AND-WROOM-98 / JAHIA-4190 : only return actual pages when searching in the page picker
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/rpc/JahiaContentServiceImpl.java
Repository Revision Date User Message
svn #26969 Thu May 14 17:49:43 CEST 2009 ktlili [N Crucibal] [JAHIA-4642]
- remove useless '?'
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/category/CategoriesManagerActions.java
Repository Revision Date User Message
svn #26967 Thu May 14 17:43:34 CEST 2009 tdraier fixed oracle / hssql sequence initialization ( JAHIA-4735 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/hibernate/dao/IDGeneratorDAO.java
Repository Revision Date User Message
svn #26966 Thu May 14 17:34:28 CEST 2009 tdraier do not use casts for hsql ( JAHIA-4731 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java
Repository Revision Date User Message
svn #26965 Thu May 14 17:26:28 CEST 2009 tdraier do not use wildcarded search as it's not stemmed/analyzed ( JAHIA-4734 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/rpc/JahiaContentServiceImpl.java
Repository Revision Date User Message
svn #26964 Thu May 14 17:25:06 CEST 2009 sshyrkov JAHIA-4672: Edit super administrator properties - OK redirects to Site Settings
http://jira.jahia.org/browse/JAHIA-4672
http://10.8.37.247/fisheye/cru/AND-WROOM-85
Resolution: redirect to the server settings menu after editing super admin properties (consider it in the menu.jsp)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/admin/users/ManageUsers.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/menu.jsp
Repository Revision Date User Message
svn #26963 Thu May 14 17:17:10 CEST 2009 rfelden AND-WROOM-91 / JAHIA-4546 : category picker refactoring
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTree.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerLeftComponent.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoryField.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/shared/Category_Field.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerPanel.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/module/categorypicker/client/CategoryPickerEntryPoint.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/PickedCategoriesGrid.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/categoriespicker.tag
Repository Revision Date User Message
svn #26961 Thu May 14 16:54:39 CEST 2009 rmora JAHIA-4729 Problem with dropdown list for login form
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/login/loginForm.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/theme/default/css/01web.css
Repository Revision Date User Message
svn #26955 Thu May 14 10:39:45 CEST 2009 tdraier fixed column size of jahia_sites_grp and jahia_sites_users for foreign keys in oracle/mssql ( JAHIA-4714 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/hibernate-resources/org/jahia/hibernate/model/JahiaSitesUser.hbm.xml
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/hibernate-resources/org/jahia/hibernate/model/JahiaSitesGrp.hbm.xml
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/derby/jahia-schema.sql
Repository Revision Date User Message
svn #26953 Thu May 14 00:28:15 CEST 2009 sshyrkov JAHIA-4653: Big text field: exception with a broken image (which should not be possible BTW) and WAI checks
http://jira.jahia.org/browse/JAHIA-4653
http://10.8.37.247/fisheye/cru/AND-WROOM-80
Cause: for example umlaut characters (öäüß) were not properly encoded/decoded during BigText manipulation in the FieldReferenceListener and JCR special characters (',[ and ]) were not decoded

Resolution: properly encode/decode the path
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/FieldReferenceListener.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/CacheListener.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/fields/JahiaBigTextField.java
Repository Revision Date User Message
svn #26952 Wed May 13 18:02:44 CEST 2009 ktlili JAHIA-4722
- fix delete categories root
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_en.properties
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/category/CategoriesManagerActions.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/categoriesmanager.tag
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/application/application.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_fr.properties
Repository Revision Date User Message
svn #26951 Wed May 13 17:13:36 CEST 2009 tdraier removed category filter ( JAHIA-4646 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerLeftComponent.java
Repository Revision Date User Message
svn #26944 Wed May 13 14:33:54 CEST 2009 tdraier fixed npe when page is validated in one single language ( definitions can be different for each language ...? ) ( JAHIA-4717 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/importexport/JahiaLegacyExporter.java
Repository Revision Date User Message
svn #26943 Wed May 13 14:27:09 CEST 2009 ktlili [PRODUCT-JIRA][JAHIA-4645]
- fix cut/paste bug
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/categoriesmanager.tag
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
Repository Revision Date User Message
svn #26930 Tue May 12 10:36:00 CEST 2009 rfelden JAHIA-4691 / AND-WROOM-54
Refactored category picker
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/category/CategoryServiceAsync.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/data/category/GWTJahiaCategoryNode.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTree.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/category/CategoryService.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerLeftComponent.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/PickedCategoriesGrid.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
Repository Revision Date User Message
svn #26929 Tue May 12 09:43:46 CEST 2009 sshyrkov JAHIA-3994: Jahia Ltd or Jahia Solutions Group SA?
http://jira.jahia.org/browse/JAHIA-3994
http://10.8.37.247/fisheye/cru/AND-WROOM-56
Resolution: 1) replaced "Jahia Ltd." with "Jahia Solutions Group SA" and jahia.org with jahia.com in JahiaConsole, Jahia and JahiaConfigurationWizard
2) Remove old license header from several files
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/impl/alfresco/AlfrescoFileNodeWrapper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/utils/JahiaConsole.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/impl/alfresco/AlfrescoStoreProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/viewhelper/sitemap/SiteMapEventListener.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/core/JahiaGWTParameters.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/toolbar/resolver/impl/AdvancedEditModeSettingsResolver.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/events/JahiaEventListenerInterface.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/bin/Jahia.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/bin/JahiaValidatorPlugIn.java
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/war/src/main/java/org/jahia/bin/JahiaConfigurationWizard.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/preferences/user/UserPreferencesHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/viewhelper/sitemap/FlatSiteMapViewHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/viewhelper/sitemap/SiteMapComparator.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/viewhelper/sitemap/SiteMapViewHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/viewhelper/sitemap/PageSiteMap.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/impl/alfresco/AlfrescoFileContent.java
Repository Revision Date User Message
svn #26927 Mon May 11 19:08:28 CEST 2009 sshyrkov JAHIA-4693: RB broken again in ACL pickers of admin/site permision, admin/server permision and html parameters
http://jira.jahia.org/browse/JAHIA-4693
http://10.8.37.247/fisheye/cru/AND-WROOM-42
Resolution: created a custom tag to include ACL name editor GWT control, including corresponding resource bundle messages
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/views/administration/htmlsettings/toolbars.jspf
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/permissions/site_permissions.jsp
ADD /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/aclNameEditor.tag
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/internal.tld
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/permissions/server_permissions.jsp
Repository Revision Date User Message
svn #26925 Mon May 11 18:52:09 CEST 2009 bpapez http://jira.jahia.org/browse/JAHIA-4632: Home page redirects: what's the goal of this feature if not present in the login boxlet?

Created a new tag and handle the redirection case in the LoginEngineAuthValveImpl.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/params/valves/LoginEngineAuthValveImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/login/Login_Engine.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/login/loginRedirectChoice.tag
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/login/loginForm.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/uiComponents.tld
Repository Revision Date User Message
svn #26923 Mon May 11 17:47:59 CEST 2009 ktlili [AND-WROOM-50] [JAHIA-4699] fix select/unselect node in categories tree
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTreeTable.java
Repository Revision Date User Message
svn #26922 Mon May 11 17:36:12 CEST 2009 ktlili [AND-WROOM-48][JAHIA-4692]
Handle case when a parent category is not selected for Paste action
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/category/CategoryServiceAsync.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/category/CategoryService.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/category/CategoriesManagerActions.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
Repository Revision Date User Message
svn #26919 Mon May 11 16:08:32 CEST 2009 ktlili [JAHIA-4692]
- replace Copy by Cut
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/ajax/categoriesmanager.tag
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/layoutmanager/LayoutManagerAreaTag.java
Repository Revision Date User Message
svn #26904 Fri May 08 17:41:30 CEST 2009 bpapez http://jira.jahia.org/browse/JAHIA-4632> Home page redirects: what's the goal of this feature if not present in the login boxlet?
Files Changed
ADD /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/tags/login/loginRedirectChoice.tag
Repository Revision Date User Message
svn #26903 Fri May 08 16:55:28 CEST 2009 ktlili [Product-Jira]
- fix JAHIA-4686
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
Repository Revision Date User Message
svn #26900 Fri May 08 15:52:07 CEST 2009 rfelden JAHIA-4633 : don't display the same error several times
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/ReportGrid.java
Repository Revision Date User Message
svn #26896 Fri May 08 11:40:57 CEST 2009 rfelden JAHIA-4203 : disable linked copies edition (inline editing)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/field/FieldTag.java
Repository Revision Date User Message
svn #26890 Fri May 08 01:43:05 CEST 2009 sshyrkov JAHIA-4622: Admin Center : Mix Language
http://jira.jahia.org/browse/JAHIA-4622
Resolution: use resource bundle messages in the AclNameEditor
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/acleditor/AclNameEditor.java
Repository Revision Date User Message
svn #26889 Fri May 08 01:26:53 CEST 2009 sshyrkov JAHIA-4658: Bad displaying of apostrophe in bix text under IE6
http://jira.jahia.org/browse/JAHIA-4658
Resolution: replaced FormDataManager.formEncode() with <c:out/> (XML escaping)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/htmleditors/fckeditor/fckeditor_htmleditor.jsp
Repository Revision Date User Message
svn #26888 Fri May 08 01:09:12 CEST 2009 sshyrkov JAHIA-4630: Workflow Email Notification: who receive emails by default?
http://jira.jahia.org/browse/JAHIA-4630
Resolution: added condition into the workflow notification rule to ignore "quick correction" action
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/jahia-rules.drl
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/rules.dsl
Repository Revision Date User Message
svn #26886 Thu May 07 19:40:25 CEST 2009 tdraier always display key + name if available ( JAHIA-4645 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/categories/server/CategoryServiceImpl.java
Repository Revision Date User Message
svn #26885 Thu May 07 19:28:00 CEST 2009 tdraier simplified right panel, improved sort ( JAHIA-4648 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTree.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/PickedCategoriesGrid.java
Repository Revision Date User Message
svn #26882 Thu May 07 18:08:46 CEST 2009 tdraier set autoselect parent to false ( JAHIA-4649 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/nodetypes/02-jahiacore-nodetypes.cnd
Repository Revision Date User Message
svn #26875 Thu May 07 17:21:05 CEST 2009 cmailleux Fix issue JAHIA-4681

Fix encoding issues with application server using stream instead of writer like Oracle Weblogic
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/container/ContainerCacheTag.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/tags.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/include/IncludeTag.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/container/ContainerTag.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/weblogic.xml
Repository Revision Date User Message
svn #26866 Thu May 07 16:06:44 CEST 2009 sshyrkov JAHIA-4630: Workflow Email Notification: who receive emails by default?
http://jira.jahia.org/browse/JAHIA-4630
Resolution: provided missing French translations
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_fr.properties
Repository Revision Date User Message
svn #26865 Thu May 07 16:03:47 CEST 2009 sshyrkov JAHIA-4624: RB Missing traduction
http://jira.jahia.org/browse/JAHIA-4624
Resolution: provided missing French translations
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/JahiaInternalResources_fr.properties
Repository Revision Date User Message
svn #26859 Thu May 07 15:21:44 CEST 2009 dgriffon JAHIA-4397 : add event types filter
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/utility/i18n/DropDownFromBundleFileTag.java
ADD /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/eventsType_fr.properties
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/events/eventsDisplay.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates_fr.properties
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/resources/META-INF/utility.tld
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates_en.properties
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates.properties
Repository Revision Date User Message
svn #26857 Thu May 07 14:58:32 CEST 2009 ielsayed fixed JAHIA-4504
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/import_wait.jsp
Repository Revision Date User Message
svn #26854 Thu May 07 12:37:19 CEST 2009 sshyrkov JAHIA-4630: Workflow Email Notification: who receive emails by default?
http://jira.jahia.org/browse/JAHIA-4630
Resolution: e-mail templates adjusted to include appropriate message (i18n)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_de.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/email.groovy
DEL /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowLastUser
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/jahia-rules.drl
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_fr.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_en.properties
DEL /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowCurrentUser
Repository Revision Date User Message
svn #26848 Wed May 06 19:53:03 CEST 2009 tdraier more cleanup in categorypicker ( JAHIA-4643 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesManager.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTopBar.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerLeftComponent.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerPanel.java
Repository Revision Date User Message
svn #26847 Wed May 06 19:25:48 CEST 2009 tdraier fixed dual scrollbar ( JAHIA-4643 ) , moveed filter to topbar
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesTree.java
ADD /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoryFilter.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerLeftComponent.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/category/CategoriesPickerPanel.java
Repository Revision Date User Message
svn #26846 Wed May 06 18:30:53 CEST 2009 cmailleux fix issue JAHIA-4668
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/importexport/ProductionJob.java
Repository Revision Date User Message
svn #26845 Wed May 06 18:30:22 CEST 2009 tdraier fixed page theme when switching tabs in engine, removed siteid, removed template switching ( JAHIA-4667 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/shared/JahiaPageEngineTempBean.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/operations/valves/ThemeValve.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/pages/pageproperties.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/pages/PageProperties_Engine.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/theme/ThemeSelectorTag.java
Repository Revision Date User Message
svn #26841 Wed May 06 18:21:48 CEST 2009 bpapez http://jira.jahia.org/browse/JAHIA-3461: chamging the home page of a user not workingmake redirect to user's homepage work again, even if the login is not a popup window
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/login/close.jsp
Repository Revision Date User Message
svn #26836 Wed May 06 17:19:57 CEST 2009 ielsayed corrected JAHIA-4661
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/sites_management.jsp
Repository Revision Date User Message
svn #26834 Wed May 06 17:07:36 CEST 2009 tdraier fixed workflow notification for author, create new templates for content refused / approved ( JAHIA-4630 , JAHIA-4627 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.txt
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/body.html (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.html)
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/email.groovy (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/email.groovy)
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/email.groovy (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/email.groovy)
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback/body.txt (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.txt)
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/automation/Service.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.html
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowRollback
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/jahia-rules.drl
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/body.txt (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.txt)
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/rules.dsl
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowPublished/body.html (from /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.html)
Repository Revision Date User Message
svn #26833 Wed May 06 16:48:42 CEST 2009 sshyrkov JAHIA-4669: URL Integrity ckeck doesn't work
http://jira.jahia.org/browse/JAHIA-4669
Resolution: correctly enforce link integrity and WAI checks
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/helper/IntegrityHelper.java
ADD /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/validation/IntegrityChecksHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/validation/LinkIntegrityChecker.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/workflow/WorkflowService.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/fields/JahiaBigTextField.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/test/java/org/jahia/engines/shared/BigText_FieldTest.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/fields/ContentPageField.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/fields/ContentField.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/fields/ContentBigTextField.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/workflow/server/helper/ValidationHelper.java
Repository Revision Date User Message
svn #26826 Wed May 06 15:15:15 CEST 2009 tdraier share users/guests groups correctly, display correct site name in group picker selector, use site selector in server permissions picker ( JAHIA-3831 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/hibernate-resources/org/jahia/hibernate/model/JahiaGrp.hbm.xml
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/sites/JahiaSitesBaseService.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/util/acleditor/AclNameEditor.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerDBProvider.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/rpc/UserManagerServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerRoutingService.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/applications/ApplicationsManagerServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/importexport/PermissionsImportHandler.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/hibernate/dao/JahiaGroupDAO.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/permissions/server_permissions.jsp
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/importexport/UsersImportHandler.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroupManagerService.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/admin/users/ManageGroups.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/hibernate/model/JahiaGrp.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/hibernate-resources/org/jahia/hibernate/model/JahiaSitesUser.hbm.xml
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/hibernate/manager/JahiaGroupManager.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/hibernate-resources/org/jahia/hibernate/model/JahiaSitesGrp.hbm.xml
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/workflow/WorkflowService.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/UsersGroup.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/usermanager/JahiaGroup.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/derby/jahia-schema.sql
Repository Revision Date User Message
svn #26824 Wed May 06 13:51:07 CEST 2009 ielsayed corrected last point in JIRA JAHIA-4663.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/provider/AjaxActionJahiaToolItemProvider.java
Repository Revision Date User Message
svn #26821 Wed May 06 11:24:12 CEST 2009 tdraier reduced number of threads to 1 ( JAHIA-4577 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/config/quartz.properties
Repository Revision Date User Message
svn #26820 Wed May 06 11:01:42 CEST 2009 ielsayed corrected nearly all the points for JIRA JAHIA-4663 except for the calendar display. To be continued...
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/provider/AjaxActionJahiaToolItemProvider.java
Repository Revision Date User Message
svn #26814 Tue May 05 23:43:09 CEST 2009 bpapez http://jira.jahia.org/browse/JAHIA-4629: Indexing for containers entered by form and no-workflow containers is either happening too late or a concurrency problem

- fixed strange handling that prevented indexing synchronized indexing. actually there is a configured time which has to be passed for indexing the same content object again and as the asynchronous workflow event is faster than the synchronous addcontainer handling, some latest metadata changes were not indexed.
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/SearchHandler.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/lucene/AbstractLuceneSearchIndexer.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/JahiaSearchBaseService.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/lucene/fs/LuceneSearchHandlerImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/jcr/JcrSearchHandler.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/JahiaSearchListener.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/search/compass/CompassSearchHandler.java
Repository Revision Date User Message
svn #26812 Tue May 05 23:28:49 CEST 2009 sshyrkov JAHIA-4624: RB Missing traduction
http://jira.jahia.org/browse/JAHIA-4624
Resolution: 1) removed clip builder component from the license
2) use resource bundle for "unlimited"
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/admin/info/LicenseInfo.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/config/licenses/license-free.xml
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/admin/show_info.jsp
Repository Revision Date User Message
svn #26809 Tue May 05 17:49:27 CEST 2009 sshyrkov JAHIA-4628: Workflow notifications: could we put the workflow batch title in the email title and list the workflow comment within the email subject?
http://jira.jahia.org/browse/JAHIA-4628
Resolution: 1) added job title and comment to the notification message
2) support sending notification to the users, having admin rights on the object
3) disable "last notify operation user" notification until the behaviour will be clarified
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_de.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowCurrentUser/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowLastUser/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflow/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/scheduler/BackgroundJob.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/content/automation/Service.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/jahia-rules.drl
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowLastUser/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflow/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/repository/rules/rules.dsl
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflow/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowLastUser/body.html
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/engines/workflow/server/WorkflowServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowNextStepUsers/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowCurrentUser/email.groovy
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_es.properties
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/notification/templates/WorkflowMessageBuilder.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/templates/default/notifications/events/workflowCurrentUser/body.txt
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_fr.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_it.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_en.properties
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/jahiatemplates/common_pt.properties
Repository Revision Date User Message
svn #26808 Tue May 05 13:23:00 CEST 2009 sshyrkov JAHIA-4536: Date Picker: bad layer on IE6
http://jira.jahia.org/browse/JAHIA-4536
Resolution: use TableLayout to make time selector correctly rendered
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/calendar/CalendarPicker.java
Repository Revision Date User Message
svn #26805 Tue May 05 11:32:08 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4562
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/pom.xml
Repository Revision Date User Message
svn #26804 Tue May 05 11:26:48 CEST 2009 sshyrkov JAHIA-4660: Job report link in the email notification should work whatever the server name of the site is
http://jira.jahia.org/browse/JAHIA-4660
Resolution: compute the server URL based on the request information also considering site's server name and site override port (jahia.properties)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/notification/templates/MessageBuilder.java
Repository Revision Date User Message
svn #26801 Tue May 05 11:15:40 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4652. Stax lib has to be in shared/lib
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/configwizard-webapp/ear/pom.xml
Repository Revision Date User Message
svn #26788 Mon May 04 19:19:01 CEST 2009 dgriffon TEMPLATES-674 : part 1 to 4 done, see JAHIA-4397 for other points
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/modules/events/eventsDisplay.jspf
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/definitions.grp
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates_fr.properties
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates_en.properties
MODIFY /branches/JAHIA-6-0-BRANCH/templates/web-templates/src/main/webapp/resources/Web_templates.properties
Repository Revision Date User Message
svn #26782 Mon May 04 16:00:27 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4652. Stax lib has to be in shared/lib
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/ear/pom.xml
Repository Revision Date User Message
svn #26779 Mon May 04 15:28:10 CEST 2009 sshyrkov JAHIA-4631: Cleanup mbeans-descriptors.xml (SettingsBean)
http://jira.jahia.org/browse/JAHIA-4631
Resolution: remove no longer supported settings (see JAHIA-4509)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/resources/mbeans-descriptors.xml
Repository Revision Date User Message
svn #26772 Mon May 04 13:33:36 CEST 2009 sshyrkov JAHIA-4509: clean-up the jahia.properties file for the final release as there are dozen of obsolete variables in there.
http://jira.jahia.org/browse/JAHIA-4509
Resolution: gather advanced edit mode settings in the UserPreferencesHelper
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/helper/AclDiffHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/AbstractJahiaGWTServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/ActionMenuServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/struts/struts-config.xml
ADD /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/preferences/user/UserPreferencesHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/helper/ActionMenuServiceHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/EngineRenderer.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/settings/SettingsBean.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/helper/ActionMenuURIFormatter.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/rpc/JahiaServiceImpl.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/beans/ContainerBean.java
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/uicomponents/actionmenu/ActionMenuOutputter.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/preferences/JahiaPreferencesService.java
ADD /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/preferences/user
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/templates/components/actionmenus/server/helper/TimebasedPublishingHelper.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/data/beans/FieldBean.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/gui/HTMLToolBox.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/etc/config/jahia.skeleton
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/services/cache/ContainerHTMLCache.java
DEL /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/usersession
MODIFY /branches/JAHIA-6-0-BRANCH/taglib/src/main/java/org/jahia/taglibs/template/field/FieldTag.java
Repository Revision Date User Message
svn #26770 Mon May 04 11:44:07 CEST 2009 rfelden JAHIA-4190 : added search in page picker
JAHIA-4636 : added automatic search format (used in pickers)
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/JahiaContentServiceAsync.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/service/JahiaContentService.java
DEL /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/pagepicker/PageTreeTable.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/utils/JahiaGWTUtils.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/pagepicker/PagePathBar.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/pagepicker/PagePickerViewport.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/filemanagement/server/helper/FileManagerWorker.java
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/ajax/gwt/commons/server/rpc/JahiaContentServiceImpl.java
ADD /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/pagepicker/PageExplorer.java
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/pagepicker/PagePicker.java
Repository Revision Date User Message
svn #26767 Fri May 01 16:16:04 CEST 2009 ktlili [Product-JIRA]
- make start categorie available in the JSP (JAHIA-4546)
To Do: set it in the categoriesPicker
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/core/src/main/java/org/jahia/engines/shared/Category_Field.java
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/shared/category_field.jsp
Repository Revision Date User Message
svn #26766 Fri May 01 15:56:18 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4583
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/engines/containeredit/containeredit.jsp
Repository Revision Date User Message
svn #26764 Fri May 01 14:51:20 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4448
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/processing/jobreport.jsp
Repository Revision Date User Message
svn #26763 Fri May 01 14:14:12 CEST 2009 ktlili [Product-JIRA]
- fix JAHIA-4609
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/gwt/src/main/java/org/jahia/ajax/gwt/client/widget/toolbar/provider/AjaxActionJahiaToolItemProvider.java
Repository Revision Date User Message
svn #26749 Thu Apr 30 18:23:39 CEST 2009 tdraier oracle sequences ( JAHIA-4610 )
Files Changed
MODIFY /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/oracle/jackrabbit-schema.sql
Repository Revision Date User Message
svn #26748 Thu Apr 30 18:14:39 CEST 2009 tdraier jackrabbit schemas ( JAHIA-4610 )
Files Changed
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mssql/jackrabbit-schema.sql
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/derby/jackrabbit-schema.sql
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/oracle/jackrabbit-schema.sql
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/hypersonic/jackrabbit-schema.sql
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/postgresql/jackrabbit-schema.sql
ADD /branches/JAHIA-6-0-BRANCH/war/src/main/webapp/WEB-INF/var/db/sql/schema/mysql/jackrabbit-schema.sql