12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added Edit and Delete actions for AVM files and Delete action for AVM folders
- Available on the Modified Items list for a user and also in the website sandbox browse screens
- Edit is working using the inline editors for plain text and HTML files - XML form content editing to be integrated shortly!
- Edit for non-inline editable files is working (i.e. download file), but no "Update" action available at present for saving updates
- Delete will delete files/folders structures from the current sandbox, deleted files in a layer are shown in My Modified Files (see below)
- User sandbox My Modified Files now shows deleted files as differences (as ghosted out rows)
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- responsible for creating content in the AVM store rather than usual SpacesStore
- removed XML specific handling from Create Content Wizard (now only present in Create Web Content Wizard)
- Create Content action added to sandbox view - NOTE: does not yet create content in the AVM world!
- Added "jsp" filetype as plain text format mimetype (to allow inline-edit for JSP files as website content)
- Open/closed state of My Modified Files panel is remembered between screen refreshes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
partially removed need for sample instance xml - i'm doing a bunch of hacks at the moment to get around it - basically using xmlbeans to generate the sample xml, and then cleaning it up. ended up not needing to do insane things in javascript with this approach. emailed joern at chiba to see if he has suggestions for how others deal with this issue.
serializing the template configuration using object serialization for now. it'll work good for the demo and we'll do something more robust/human readable post demo. this required a bunch of refactoring and springifying the TemplateService, but we're now reading back xsds and xsls from the repository which is sorta a nice thing i think.
remove the preview form wizard step from create xml content type flow.
tried getting rid of a temporary file in generating the xform but failed. need to find a way to get an url to a noderef that the xform can use to reference the xsd. emailed london people about that. but still did some refactoring along those lines.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
