Commit Graph

16 Commits

Author SHA1 Message Date
Britt Park
99486032e1 Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
f6355ea108 Merge from HEAD into WCM-DEV2. Also fixes build breakage in
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-24 18:27:41 +00:00
Britt Park
1dd2a7b72b Daily merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-12 20:22:46 +00:00
Derek Hulley
c88e18b6b7 svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root
svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-12 14:58:21 +00:00
Kevin Roast
b29006fbca . Fix for AWC-589 (Error searching for "+ test")
- Fixed to ignore empty terms after stripping operators from search text

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-31 15:07:29 +00:00
Kevin Roast
89de41d208 . Fix for AWC-501
- Single word term using an operator now processed correctly e.g. just searching for
	+biscuit
is the same as
	biscuit
. Changed generated PageTag link in web-client footer area from www.alfrescosoftware.com to www.alfresco.com
. Fix to Logout link for error page - no longer worked as the External Access Servlet no longer forces a login…!
 - added new outcome case for External Access Servlet - logout

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-08 17:20:12 +00:00
Kevin Roast
4181030fac . Fix for AWC-498
- Searching for results in a Location (e.g. PATH) and category are now ANDed together rather than ORed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-07 17:50:11 +00:00
Kevin Roast
93046ae638 . Fix for AWC-498
- Searching for results in a Location (e.g. PATH) and category are now ANDed together rather than ORed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-06 11:13:55 +00:00
Kevin Roast
4732ebc744 Improvements to Simple and Advanced Search to add basic operator support
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 13:36:18 +00:00
Kevin Roast
e7ce03d4cf . Saved Searches UI improvements as suggested by Linton
. Fix to quoted term search to allow quoted string of a single word only e.g. "baboon" (not very useful, but should at least work…!)
. Checkpoint of the Templating language enhancements ready for the addition of saved search support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 11:57:32 +00:00
Kevin Roast
9dc865548d . Serialized saved searches now include the generated lucene string as part of the XML
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2112 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 17:10:34 +00:00
Kevin Roast
56eb3d75b9 . Advanced Search improvements
. Fix to Lucene Indexer (from Andy) to correct the bug where if content was not indexed (e.g. JPEG) then it's mimetype/size values did not get added to the index.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 13:21:29 +00:00
Kevin Roast
2652d33f08 . First pass of the Saved Searches functionality for the web-client
. Saved Searches bootstrap folder
. Document details and Space details page now show a copy-and-paste NodeRef link 
. Minor bug fixes to Breadcrumb and ActionLink components

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-12 13:40:20 +00:00
Kevin Roast
acd5d24c62 Multiple category search added to Advanced Search screen
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-06 14:48:24 +00:00
David Caruana
758bef62c2 - JCR L2 Document View Import
- Move ISO9705 to util

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-09 18:02:03 +00:00
Derek Hulley
d051d1153c Moving to root below branch label
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00