From a808449d2e0b3b84100d9ade7d68c129e6a4e237 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 18 Mar 2013 09:52:08 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20BRANCHES/DEV/CONV=5FHEAD=20to=20HEAD:?= =?UTF-8?q?=20=20=20=2048055:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20B?= =?UTF-8?q?RANCHES/DEV/CONV=5FHEAD:=20=20=20=20=20=20=20=20=20=2046833:=20?= =?UTF-8?q?Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/TH?= =?UTF-8?q?OR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2030799:=20THOR-172:=20Switch=20Tenant=20via?= =?UTF-8?q?=20public=20API=20=20=20=20=20=20=20=20=20=2046836:=20Merged=20?= =?UTF-8?q?BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/THOR1=20to?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2030853:=20Initial=20implementation=20of=20THOR-209.?= =?UTF-8?q?=20Webscript=20to=20get=20invitation/invitee=20status.=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2030855:=20More=20on=20?= =?UTF-8?q?THOR-209.=20Added=20siteTenantTitle=20to=20the=20webscript=20re?= =?UTF-8?q?sponse.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030858?= =?UTF-8?q?:=20Apply=20generated=20cloud=20license=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2030859:=20Miscellaneous=20tidy-ups=20?= =?UTF-8?q?and=20refactorings,=20additional=20documentation=20and=20some?= =?UTF-8?q?=20webscript=20JSON=20additions.=20All=20as=20part=20of=20THOR-?= =?UTF-8?q?209.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030860:?= =?UTF-8?q?=20Miscellaneous=20doc=20improvements=20around=20the=20MT/Activ?= =?UTF-8?q?iti=20workarounds.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2030861:=20Removing=20unnecessary=20TenantUtil.runas=20in?= =?UTF-8?q?=20test=20code.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2030863:=20THOR-204.=20Dev=20mode=20option=20to=20send=20invit?= =?UTF-8?q?e/sign-up=20emails=20to=20spring-injected=20address.=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2030865:=20Temporarily?= =?UTF-8?q?=20disable=20subscriptions=20(followers)=20-=20pending=20ALF-99?= =?UTF-8?q?57=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030866:=20T?= =?UTF-8?q?HOR-175:=20Set=20and=20enforce=20file=20space=20quota=20for=20t?= =?UTF-8?q?enant=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030868:?= =?UTF-8?q?=20Deleted=20obsolete/empty=20dir=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2030869:=20THOR-210:=20disable=20jobs=20that?= =?UTF-8?q?=20are=20not=20used/required=20(eg.=20AVM=20orphan=20reaper)=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030870:=20THOR-2?= =?UTF-8?q?09.=20Have=20fixed=20up=20issue=20with=20getting=20properties?= =?UTF-8?q?=20from=20completed=20workflow=20instances.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Changed=20invitati?= =?UTF-8?q?on=20to=20use=20pathInstanceId=20instead=20of=20taskId=20as=20t?= =?UTF-8?q?he=20'id'=20for=20these=20workflows.=20Now=20consistent=20with?= =?UTF-8?q?=20signup.=20Commented=20in=20the=20test=20that=20calls=20invit?= =?UTF-8?q?ee-status.get=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2030871:=20THOR-209.=20Adding=20the=20inviteeIsActivated=20val?= =?UTF-8?q?ue=20to=20the=20webscript=20response.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2030872:=20THOR-204.=20When=20emails?= =?UTF-8?q?=20are=20sent=20to=20the=20dev-only,=20spring-injected=20email?= =?UTF-8?q?=20address,=20the=20subject=20is=20now=20prefixed=20with=20the?= =?UTF-8?q?=20orig=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030879?= =?UTF-8?q?:=20THOR-209.=20Making=20sure=20inviteeIsActivated=20is=20prese?= =?UTF-8?q?nt=20for=20both=20in-flight=20and=20completed=20workflows.=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030883:=20Resolv?= =?UTF-8?q?e=20THOR-212=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?30895:=20THOR-172:=20Switch=20Tenant=20via=20public=20API=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030896:=20THOR-209.?= =?UTF-8?q?=20Renaming=20some=20files=20so=20that=20they=20refer=20to=20in?= =?UTF-8?q?vitation=20status=20rather=20than=20invitee=20status.=20Also=20?= =?UTF-8?q?added=20some=20documentation=20to=20make=20this=20dicstinction?= =?UTF-8?q?=20clearer.=20This=20is=20not=20a=20general=20purpose=20script?= =?UTF-8?q?=20to=20get=20the=20status=20of=20an=20invitee=20to=20a=20site.?= =?UTF-8?q?=20It=20is=20only=20for=20checking=20if=20a=20particular=20invi?= =?UTF-8?q?tation=20workflow=20is=20complete=20and=20then=20getting=20some?= =?UTF-8?q?=20additional=20state=20data.=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2030897:=20THOR-175:=20Set=20and=20enforce=20fi?= =?UTF-8?q?le=20space=20quota=20for=20tenant=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2030900:=20Changing=20invitation-status=20we?= =?UTF-8?q?bscript=20to=20auth=3Dnone;=20runas=3DAdmin=20to=20support=20in?= =?UTF-8?q?vitation=20flow=20of=20exteernal=20users.=20Part=20of=20THOR-20?= =?UTF-8?q?9.=20=20=20=20=20=20=20=20=2046845:=20Merged=20BRANCHES/DEV/CLO?= =?UTF-8?q?UD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLO?= =?UTF-8?q?UD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030967:?= =?UTF-8?q?=20Invite=20&=20signup=20improvemengts=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2030969:=20Share=20Activities=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2030976:=20Remove=20unr?= =?UTF-8?q?eliable=20hosts=20from=20isReachableDomain=20test=20=20=20=2048?= =?UTF-8?q?066:=20Merged=20DEV/CONV=5FV413=20to=20DEV/CONV=5FHEAD=20(RECOR?= =?UTF-8?q?D=20ONLY)=20=20=20=20=20=20=20=20=2046857:=20Merged=20from=20BR?= =?UTF-8?q?ANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2035731:=20Merged=20BRANCHES/DEV/THOR1=20?= =?UTF-8?q?to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031149:=20Initial=20Commit=20of=20Analytics=20Service?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031150:=20Second=20?= =?UTF-8?q?draft=20of=20Analytics=20Service=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031151:=20First=20cut=20of=20forms=20runtime=20su?= =?UTF-8?q?pporting=20balloons=20on=20"blur"=20event=20as=20requested=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031163:=20FORMS=20RUNT?= =?UTF-8?q?IME=20CHECKPOINT=20-=20before=20making=20the=20yellow=20mandato?= =?UTF-8?q?ry=20only=20being=20displayed=20"on=20load=20and=20until=20focu?= =?UTF-8?q?sed"=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031168:=20Refac?= =?UTF-8?q?tored=20Analytics=20Service=20to=20be=20static=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031170:=20Forms=20runtime=20as=20a?= =?UTF-8?q?greed=20in=20meeting=20=20=20=2048067:=20Merged=20DEV/CONV=5FV4?= =?UTF-8?q?13=20to=20DEV/CONV=5FHEAD=20(RECORD=20ONLY)=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2046861:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BR?= =?UTF-8?q?ANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20=20=20=20=20=2035752?= =?UTF-8?q?:=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031220:=20THOR-49.=20I?= =?UTF-8?q?mplementation=20of=20Reset=20Forgotten=20Password=20workflow.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031227:=20(RECORD?= =?UTF-8?q?=20ONLY)=20Fix=20merge=20error=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031237:=20Add=20email=20validation=20to=20registrati?= =?UTF-8?q?on=20and=20invite=20services:=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031239:=20THOR-219:=20Merge=20fix=20(re-disable=20Re?= =?UTF-8?q?po<->SOLR=20ssl=20config)=20=20=20=2048069:=20Merged=20DEV/CONV?= =?UTF-8?q?=5FV413=20to=20DEV/CONV=5FHEAD=20(RECORD=20ONLY)=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2046864:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to?= =?UTF-8?q?=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?35754:=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1?= =?UTF-8?q?:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031240:=20MultiSel?= =?UTF-8?q?ectAutoComplete=20now=20has=20configurable=20validation=20(&=20?= =?UTF-8?q?tooltips)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031241:=20?= =?UTF-8?q?Tenant=20site=20count=20usage/quota=20-=20exposed=20via=20Accou?= =?UTF-8?q?nt=20API=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031250:=20M?= =?UTF-8?q?ade=20events=20enumerations=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031251:=20Forgot=20to=20add=20AnalyticsEvent=20class=20?= =?UTF-8?q?to=20previous=20commit=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031271:=20Attempt=20at=20fixing=20test=20dependencies=20an?= =?UTF-8?q?d=20remove=20intermittent=20test=20=20=20=2048070:=20Merged=20D?= =?UTF-8?q?EV/CONV=5FV413=20to=20DEV/CONV=5FHEAD=20(NOTE!=20Added=20Tenant?= =?UTF-8?q?Xxxx=20classes=20and=20change=20in=20FormUIGet=20Will=20be=20re?= =?UTF-8?q?moved=20in=20later=20revisions)=20=20=20=20=20=20=20=20=2046911?= =?UTF-8?q?:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CON?= =?UTF-8?q?V=5FV413=20=20=20=20=20=20=20=20=20=20=20=2035757:=20Merged=20B?= =?UTF-8?q?RANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031367:=20Merged=20BRANCHES/DEV/THOR1?= =?UTF-8?q?SURF=20to=20BRANCHES/DEV/THOR1:=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2030971:=20(RECORD=20ONLY)=20Creati?= =?UTF-8?q?ng=20SURF=20update=20branch=20for=20THOR1=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2030979:=20Commit=20initia?= =?UTF-8?q?l=20Surf=20lib=20changes,=20Cloud=20classes=20and=20config=20ov?= =?UTF-8?q?errides=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2030980:=20Add=20custom=20Cloud=20Surf=20authenticator,=20c?= =?UTF-8?q?onnector,=20remote=20store,=20user=20and=20user=20factory=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031015:=20?= =?UTF-8?q?Renamed=20classes=20and=20references=20from=20Cloud=20to=20Tena?= =?UTF-8?q?nt,=20custom=20page=20view,=20page=20view=20resolvers,=20URLMod?= =?UTF-8?q?el=20+=20factory,=20URLHelper=20+=20factory=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031076:=20Successful?= =?UTF-8?q?=20signup=20and=20page=20redirection=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031091:=20Correct=20redirects?= =?UTF-8?q?=20from=20=20and=20/=20URLs=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031098:=20Updated=20Surf=20libs=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031132:=20Ten?= =?UTF-8?q?ant=20specific=20implementation=20of=20PathStoreObjectPersister?= =?UTF-8?q?=20-=20Surf=20modelobject=20cache=20is=20now=20partitioned=20by?= =?UTF-8?q?=20the=20tenant=20name.=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031133:=20Updated=20Surf=20libs=20and=20Jav?= =?UTF-8?q?aDoc=20updates=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031155:=20Initial=20code=20to=20handle=20attempted?= =?UTF-8?q?=20access=20to=20unauthorised=20tenants,=20secondary=20tenants?= =?UTF-8?q?=20added=20to=20TenantUser=20and=20page/activations=20filter=20?= =?UTF-8?q?rule=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031210:=20Fixed=20401=20&=20409=20errors=20on=20remote=20GET/?= =?UTF-8?q?POST=20calls.=20Logout=20redirection=20support.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031229:=20Signup=20?= =?UTF-8?q?and=20invitiation=20completion=20updates=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031242:=20Fixed=20up=20in?= =?UTF-8?q?vitation,=20signup=20and=20tenant=20switching=20problems=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031270:=20?= =?UTF-8?q?Fixed=20forms=20issue=20(can=20now=20create=20folders=20in=20do?= =?UTF-8?q?c=20lib)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031277:=20THOR-207.=20Invitation=20workflows=20now=20run?= =?UTF-8?q?=20in=20the=20inviter's=20tenant=20rather=20than=20the=20defaul?= =?UTF-8?q?t=20tenant.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20This=20is=20checked=20in=20on=20a=20side-b?= =?UTF-8?q?ranch=20because=20the=20invitation=20email's=20accept/reject=20?= =?UTF-8?q?links=20include=20the=20tenantId=20and=20this=20tenant-aware=20?= =?UTF-8?q?Share=20URL=20is=20not=20yet=20supported=20on=20the=20THOR1=20b?= =?UTF-8?q?ranch.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20I=20removed=20various=20TenantUtil.runAsWork=20c?= =?UTF-8?q?alls=20which=20were=20causing=20the=20workflow=20to=20run=20on?= =?UTF-8?q?=20the=20default=20tenant=20rather=20then=20the=20current=20ten?= =?UTF-8?q?ant.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20SendCloudInvitationEmailDelegate.createInvitatio?= =?UTF-8?q?nUrl=20now=20includes=20the=20tenantId=20in=20the=20Share=20URL?= =?UTF-8?q?=20it=20generates.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20Added=20new=20test=20cases=20at=20th?= =?UTF-8?q?e=20Java=20API=20level.=20(Was=20formerly=20just=20at=20REST=20?= =?UTF-8?q?API=20level).=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031286:=20(RECORD=20ONLY)=20Reset=20solrcore.propert?= =?UTF-8?q?ies=20files=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031297:=20Fixed=20FlashUpload=20problem=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031298:=20Fixed=20a?= =?UTF-8?q?pplication=20context=20only=20login=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031302:=20Fixed=20no=20user=20p?= =?UTF-8?q?rofile=20image=20url=20issue=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031306:=20Updates=20to=20TenantUserFa?= =?UTF-8?q?ctory=20to=20defensively=20handle=20missing=20tenant=20data=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031326:?= =?UTF-8?q?=20Repo=20switch=20tenant=20fixes:=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031356:=20Resolve=20switch=20te?= =?UTF-8?q?nant=20niggles,=20with=20assistance=20from=20Erik:=20=20=20=204?= =?UTF-8?q?8072:=20Merged=20DEV/CONV=5FV413=20to=20DEV/CONV=5FHEAD=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2046934:=20Merged=20from=20BRANCHES/DEV/CLOU?= =?UTF-8?q?D2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2046930:=20Adding=20extension=20point=20to=20forms=20run?= =?UTF-8?q?time's=20FormUIGet=20for=20modifying=20submission=20url=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2046937:=20Merged=20from=20BRANCHES/DEV/CLOU?= =?UTF-8?q?D2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2035762:=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHES/D?= =?UTF-8?q?EV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031408:?= =?UTF-8?q?=20Latest=20Spring=20Surf=20Libs=20(including=20SubComponentEva?= =?UTF-8?q?luator=20param=20tokenization=20fix=20for=20THOR)=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031409:=20Tenant=20usage/quota?= =?UTF-8?q?=20->=20person=20count=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031412:=20RM=20module=20cleanup=20&=20almost=20finsihed=20?= =?UTF-8?q?THOR-287=20&=20THOR-288=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031434:=20Fix=20Thor=20Share=20eclipse=20project=20=20=20?= =?UTF-8?q?=2048073:=20CONV:=20Fix=20slingshot=20eclipse=20.classpath=20(a?= =?UTF-8?q?dd=20freemarker=20dep)=20=20=20=2048074:=20Merged=20DEV/CONV=5F?= =?UTF-8?q?V413=20to=20DEV/CONV=5FHEAD=20=20=20=20=20=20=20=20=2046940:=20?= =?UTF-8?q?Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2035766:=20Merged=20BRANCHES/?= =?UTF-8?q?DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031450:=20Additional=20DB=20query=20s?= =?UTF-8?q?upport=20in=20Repo/Core=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031451:=20Tenant=20people=20count=20(internal=20+=20?= =?UTF-8?q?total)=20usage/quota=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031453:=20Fix=20issue=20uploading=20small=20files=20whi?= =?UTF-8?q?ch=20resulted=20in=20zero=20byte=20content=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031456:=20Fix=20paging=20and=20tot?= =?UTF-8?q?al=20count=20(1000+)=20when=20listing=20accounts=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031457:=20THOR-312.=20Additi?= =?UTF-8?q?on=20of=20NETWORK=5FADMINS=20group=20authority.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031461:=20THOR-314.=20I've?= =?UTF-8?q?=20overridden=20people.get=20with=20a=20cloud-specific=20templa?= =?UTF-8?q?te.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20This=20adds=20an=20isExternal=20JSON=20field=20to=20each=20p?= =?UTF-8?q?erson=20object.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031463:=20THOR-316=20webscript=20filter=20on=20people.get=20f?= =?UTF-8?q?or=20isInternal,=20isExternal.=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20Overridden=20people.get.desc.xml?= =?UTF-8?q?=20and=20.js=20in=20the=20cloud=20module=20in=20order=20to=20ad?= =?UTF-8?q?d=20query=20param=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20and=20add=20additional=20filtering.=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031464:=20Base=20work?= =?UTF-8?q?=20for=20THOR-178=20"F5:=20Existing=20user=20has=20forgotten=20?= =?UTF-8?q?password=20and=20needs=20to=20reset=20it"=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031468:=20THOR-321=20Create=20clou?= =?UTF-8?q?d:networkAdmin=20aspect.=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031469:=20THOR-315=20Return=20isNetworkAdmin=20in=20?= =?UTF-8?q?overridden=20people.get=20webscript.=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031470:=20THOR-275:=20Add=20simple=20cac?= =?UTF-8?q?hing=20(for=20PropertyUniqueContext=20-=20used=20via=20Attribut?= =?UTF-8?q?eService)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20314?= =?UTF-8?q?71:=20THOR-318=20people.get=20has=20new=20cloud=20query=20param?= =?UTF-8?q?eter=20'networkAdmin'=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031477:=20THOR-275:=20temp=20build=20fix=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031479:=20THOR-324=20Demote?= =?UTF-8?q?=20user=20from=20admin.=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20New=20method=20on=20RegistrationService?= =?UTF-8?q?=20to=20demote=20a=20user=20from=20NetworkAdmin=20and=20tests.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031484:=20THO?= =?UTF-8?q?R-319.=20Fixing=20maxResults=20on=20people.get=20when=20interna?= =?UTF-8?q?l/external/admin=20filtering=20is=20applied.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20This=20issue=20is?= =?UTF-8?q?=20not=20really=20resolved,=20but=20I've=20commented=20the=20co?= =?UTF-8?q?de=20to=20illuminate=20the=20issue.=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031485:=20THOR-275:=20fix=20build/test?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031486:=20Wor?= =?UTF-8?q?king=20forgot=20password=20for=20THOR-178=20(problem=20accessin?= =?UTF-8?q?g=20the=20reset-password=20email=20link=20though)=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031488:=20THOR-184:=20Dis?= =?UTF-8?q?able=20user=20usages=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031495:=20F156:=20Allow=20super=20system=20admin=20to?= =?UTF-8?q?=20login=20to=20any=20tenant=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031496:=20Fix=20for=20personExists=20since=20h?= =?UTF-8?q?iding=20admin=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031500:=20THOR-178=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031501:=20THOR-329=20Add=20a=20get-reset-password=20sta?= =?UTF-8?q?tus=20webscript.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031503:=20Finished=20forgot=20password=20flow=20THOR-178?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031507:=20THO?= =?UTF-8?q?R-328:=20add=20fixed=20adjustment=20(for=20people=20usage)=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031508:=20Back?= =?UTF-8?q?=20out=20some=20of=20the=20hidden=20admin=20changes=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031509:=20Revert=20mistak?= =?UTF-8?q?en=20check=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031?= =?UTF-8?q?510:=20THOR-326=20Changes=20to=20DAO=20layer=20to=20allow=20upd?= =?UTF-8?q?ate=20of=20account=20type.=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031513:=20Cloud=20Console=20updates=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031514:=20Switch=20Networ?= =?UTF-8?q?k=20now=20uses=20tenants=20from=20the=20user=20object=20(instea?= =?UTF-8?q?d=20of=20making=20a=20remote=20call)=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031515:=20THOR-326=20Changes=20to=20the?= =?UTF-8?q?=20REST=20&=20Service=20layer=20to=20allow=20update=20of=20acco?= =?UTF-8?q?unt=20type.=20=20=20=2048075:=20Merged=20BRANCHES/DEV/CONV=5FV4?= =?UTF-8?q?13=20to=20BRANCHES/DEV/CONV=5FHEAD:=20(effectively=20record-onl?= =?UTF-8?q?y=20-=20no=20changes)=20=20=20=20=20=20=20=20=2046849:=20Merged?= =?UTF-8?q?=20PATCHES/V4.1.3=20to=20DEV/CONV=5FV413=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2046779:=20ALF-17967:=20Error=20in=20org.alf?= =?UTF-8?q?resco.repo.workflow.WorkflowServiceImpl.getPooledTasks=20on=20S?= =?UTF-8?q?tartUp.=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Improved?= =?UTF-8?q?=20fix=20that=20uses=20the=20bridge=20table=20cache=20if=20it?= =?UTF-8?q?=20is=20available=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20?= =?UTF-8?q?Groups=20queried=20for=20pooled=20tasks=20still=20limited=20to?= =?UTF-8?q?=20100=20by=20default=20but=20can=20be=20configured=20with=20sy?= =?UTF-8?q?stem.workflow.maxAuthoritiesForPooledTasks=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20-=20Overall=20number=20of=20results=20can?= =?UTF-8?q?=20be=20cut=20off=20with=20system.workflow.maxPooledTasks=20=20?= =?UTF-8?q?=20=2048076:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRANCHE?= =?UTF-8?q?S/DEV/CONV=5FHEAD:=20=20=20=20=20=20=20=20=2046855:=20Merged=20?= =?UTF-8?q?BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2035706:=20Merged=20BRANCHES/DEV?= =?UTF-8?q?/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031049:=20THOR-175:=20set=20and=20?= =?UTF-8?q?enforce=20per-tenant=20quota=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031053:=20THOR-204:=20Add=20dev=20email?= =?UTF-8?q?=20mode=20option=20=20=20=2048077:=20Merged=20DEV/CONV=5FV413?= =?UTF-8?q?=20to=20DEV/CONV=5FHEAD=20(RECORD=20ONLY)=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2046944:=20Merge=20fallout=20-=20fix=20compile=20error.=20?= =?UTF-8?q?=20=20=2048078:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRAN?= =?UTF-8?q?CHES/DEV/CONV=5FHEAD:=20(already=20fixed=20-=20no=20changes)=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2046858:=20Fix=20compile=20error=20=20=20?= =?UTF-8?q?=2048079:=20Merged=20DEV/CONV=5FV413=20to=20DEV/CONV=5FHEAD=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2046953:=20Merged=20from=20BRANCHES/DEV/C?= =?UTF-8?q?LOUD2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2035767:=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHE?= =?UTF-8?q?S/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031516?= =?UTF-8?q?:=20Hidden=20admin=20-=20attempt=202=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031517:=20THOR-326.=20Update=20to=20REST-cient?= =?UTF-8?q?=20rcq=20file=20following=2031515,=20which=20allows=20for=20acc?= =?UTF-8?q?ount=20upgrade.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20315?= =?UTF-8?q?18:=20THOR-326.=20DaveC=20asked=20me=20to=20move=20the=20paid?= =?UTF-8?q?=20business=20account=20type=20out=20of=20test=20config=20and?= =?UTF-8?q?=20into=20product=20config.=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031519:=20After=20tenant=20switch=20the=20client=20side?= =?UTF-8?q?=20resources=20are=20more=20sensitive=20(new=20requires=20/res)?= =?UTF-8?q?=20which=20it=20didn't=20before.=20This=20solves=20the=20webpre?= =?UTF-8?q?view=20bug=20and=20some=20other=20minor=20stuff.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031520:=20THOR-175:=20Set=20and=20?= =?UTF-8?q?enforce=20file=20space=20quota=20for=20tenant=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031522:=20THOR-330.=20Return=20Accoun?= =?UTF-8?q?t=20Class=20data=20in=20Account=20REST=20API.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031523:=20THOR-330.=20Added=20new=20r?= =?UTF-8?q?sp=20data=20into=20desc.xml=20sample=20response.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031524:=20THOR-322:=20refactor=20t?= =?UTF-8?q?enant=20file=20usage/quota=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031525:=20Skip=20activity=20post=20lookups=20that=20hav?= =?UTF-8?q?e=20exceptions=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203152?= =?UTF-8?q?6:=20Root=20webdav=20to=20st:sites=20for=20now=20(as=20per=20cu?= =?UTF-8?q?rrent=20beta.alfresco.com)=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031528:=20THOR-323=20&=20THOR-324=20Promotion=20and=20d?= =?UTF-8?q?emotion=20of=20users=20to/from=20NetworkAdmin.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031534:=20Account=20Summary=20now?= =?UTF-8?q?=20also=20displays=20name=20&=20summary=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031535:=20Fix=20for=20THOR-320.=20Alfresco?= =?UTF-8?q?=20logo=20image=20in=20the=20various=20Cloud=20emails=20is=20br?= =?UTF-8?q?oken.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031538:=20Acco?= =?UTF-8?q?unt=20Summary=20now=20handles=20-2=20&=20MultiSelectAutoComplet?= =?UTF-8?q?e=20=20doesn't=20bounce=20when=20selecting=20first=20item=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031540:=20Implementation?= =?UTF-8?q?=20of=20THOR-335=20webscript=20for=20account-types.get=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031541:=20Account=20Summary?= =?UTF-8?q?=20now=20displays=20date=20correctly=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031542:=20Some=20paths=20to=20client=20side=20?= =?UTF-8?q?resources=20that=20were=20missing=20"/res"=20in=20the=20path=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031547:=20Various=20la?= =?UTF-8?q?bel=20changes=20according=20to=20Kathryns=20docs=20&=20some=20n?= =?UTF-8?q?ew=20login/forgot=20password=20links=20in=20invite/signup=20for?= =?UTF-8?q?ms=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031555:=20Refacto?= =?UTF-8?q?red=20Analytics=20Service=20to=20send=20JSON=20Analytics=20prop?= =?UTF-8?q?erties=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031557:=20Som?= =?UTF-8?q?e=20changes=20to=20cloud=20email=20templates=20following=20feed?= =?UTF-8?q?back=20from=20Kathryn,=20Erik.=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031558:=20THOR-322:=20refactor=20tenant=20file=20usa?= =?UTF-8?q?ge/quota=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031559:=20T?= =?UTF-8?q?urned=20'sign=20up'=20email=20URLs=20into=20links=20rather=20th?= =?UTF-8?q?an=20text.=20Yes,=20we'll=20make=20these=20buttons=20at=20some?= =?UTF-8?q?=20point=20but=20I=20just=20want=20them=20to=20be=20clickable?= =?UTF-8?q?=20for=20now.=20=20=20=2048080:=20Merged=20DEV/CONV=5FV413=20to?= =?UTF-8?q?=20DEV/CONV=5FHEAD=20(UI=20ONLY)=20=20=20=20=20=20=20=20=204695?= =?UTF-8?q?4:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CO?= =?UTF-8?q?NV=5FV413=20=20=20=20=20=20=20=20=20=20=20=2035771:=20Merged=20?= =?UTF-8?q?BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031563:=20THOR-123:=20modules=20ar?= =?UTF-8?q?e=20no=20longer=20started=20for=20each=20tenant=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031566:=20Update=20account=20class?= =?UTF-8?q?=20display=20names:=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031567:=20THOR-123:=20temp'=20put=20back=20"applyToTenants=3D?= =?UTF-8?q?true"=20...=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031575:?= =?UTF-8?q?=20THOR-123:=20pre-req=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2031579:=20Fix=20issue=20where=20setting=20a=20preference?= =?UTF-8?q?=20meant=20that=20the=20person=20could=20no=20longer=20login:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031581:=20Addition?= =?UTF-8?q?=20of=20isNetworkAdmin,=20accountClassName=20and=20accountClass?= =?UTF-8?q?DisplayName=20to=20the=20metadata.get=20webscript,=20as=20requi?= =?UTF-8?q?red=20by=20Erik.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031?= =?UTF-8?q?582:=20Re-enabling=20RenditionServiceIntegrationTest=20which=20?= =?UTF-8?q?was=20failing.=20See=20THOR-106.=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031584:=20THOR-123:=20pre-req=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031585:=20THOR-347:=20disable=20test?= =?UTF-8?q?=20(pending=20this=20JIRA)=20-=20ChainingUserRegistrySynchroniz?= =?UTF-8?q?erTest=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031590:=20=20?= =?UTF-8?q?Account=20changes=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203?= =?UTF-8?q?1591:=20Upgrade=20accound=20button=20is=20now=20a=20mailto=20li?= =?UTF-8?q?nk=20pointing=20to=20sales@alfresco.com=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031592:=20Added=20isNetworkAdmin=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031593:=20Made=20sure=20tool?= =?UTF-8?q?tips=20are=20hidden=20when=20a=20dialog/overly=20is=20showed/hi?= =?UTF-8?q?dden=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031594:=20Disab?= =?UTF-8?q?ling=20test=20again=20pending=20proper=20fix.=20THOR-106=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031595:=20Reduce=20log=20?= =?UTF-8?q?level=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031600:=20THOR?= =?UTF-8?q?-123:=20mark=20modules=20with=20"applyToTenants=3Dfalse"=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031601:=20Tooltips=20now?= =?UTF-8?q?=20dissapear=20when=20panel/overlays=20are=20destroyed=20(not?= =?UTF-8?q?=20only=20hidden)=20=20=20=2048081:=20Merged=20DEV/CONV=5FV413?= =?UTF-8?q?=20to=20DEV/CONV=5FHEAD=20=20=20=20=20=20=20=20=2046955:=20Merg?= =?UTF-8?q?ed=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2035779:=20Merged=20BRANCHES/?= =?UTF-8?q?DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031605:=20(RECORD=20ONLY)=20THOR-336.=20Fix?= =?UTF-8?q?ing=20/res/themes=20URLs=20in=20activity=20emails.=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Fix=20/re?= =?UTF-8?q?s/themes=20URL=20in=20newly=20located=20activity=20emails.=20?= =?UTF-8?q?=20=20=2048088:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRAN?= =?UTF-8?q?CHES/DEV/CONV=5FHEAD:=20=20=20=20=20=20=20=20=2046874:=20Merged?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2035709:=20Merged=20BRANCHES/?= =?UTF-8?q?DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031054:=20Fix=20for=20email=20t?= =?UTF-8?q?emplates=20(getDirectReadableChannel=20->=20File=20does=20not?= =?UTF-8?q?=20exist)=20=20=20=20=20=20=20=20=2046875:=20Merged=20BRANCHES/?= =?UTF-8?q?DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2035711:=20Merged=20BRANCHES/DEV/THOR1=20?= =?UTF-8?q?to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031055:=20Re-enable=20activity=20feed=20not?= =?UTF-8?q?ifications=20and=20subscriptions=20(followers)=20=20=20=2048094?= =?UTF-8?q?:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRANCHES/DEV/CONV?= =?UTF-8?q?=5FHEAD:=20=20=20=20=20=20=20=20=2046894:=20Merged=20BRANCHES/D?= =?UTF-8?q?EV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2035759:=20Merged=20BRANCHES/DEV/THOR1=20to?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031386:=20Added=20some=20tenancy-awareness=20t?= =?UTF-8?q?o=20ActionService.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031388:=20Addition=20of=20accountTypeId=20to=20metad?= =?UTF-8?q?ata.get=20webscript.=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031391:=20Fix=20for=20unreported=20issue=20that?= =?UTF-8?q?=20arises=20from=20the=20invitation=20workflow=20having=20moved?= =?UTF-8?q?=20from=20the=20system=20to=20the=20inviter=20tenant.=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031392:=20Build?= =?UTF-8?q?=20fixes:=20Add=20pseudo-support=20for=20tenant=20switching=20i?= =?UTF-8?q?n=20web=20script=20test=20f/w=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031393:=20The=20final=20fix=20for=20the?= =?UTF-8?q?=20'external=20user=20invites=20other=20external=20user'=20scen?= =?UTF-8?q?ario.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203?= =?UTF-8?q?1398:=20Tenant=20usage/quota=20-=20site=20count=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031405:=20Build=20fix?= =?UTF-8?q?=20for=20failing=20ActionService=20tests.=20Compensating=20acti?= =?UTF-8?q?ons=20were=20not=20running=20on=20the=20correct=20tenant.=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031407:=20Res?= =?UTF-8?q?olve=20THOR-248:=20Extensions=20is=20not=20deployed=20as=20part?= =?UTF-8?q?=20of=20the=20build=20=20=20=2048095:=20Merged=20BRANCHES/DEV/C?= =?UTF-8?q?ONV=5FV413=20to=20BRANCHES/DEV/CONV=5FHEAD:=20(repo=20pre-merge?= =?UTF-8?q?)=20=20=20=20=20=20=20=20=2046911:=20Merged=20from=20BRANCHES/D?= =?UTF-8?q?EV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2035757:=20Merged=20BRANCHES/DEV/THOR1=20to?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031367:=20Merged=20BRANCHES/DEV/THOR1SURF=20to=20BRA?= =?UTF-8?q?NCHES/DEV/THOR1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2030971:=20(RECORD=20ONLY)=20Creating=20SURF?= =?UTF-8?q?=20update=20branch=20for=20THOR1=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2030979:=20Commit=20initial?= =?UTF-8?q?=20Surf=20lib=20changes,=20Cloud=20classes=20and=20config=20ove?= =?UTF-8?q?rrides=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2030980:=20Add=20custom=20Cloud=20Surf=20authenticator,?= =?UTF-8?q?=20connector,=20remote=20store,=20user=20and=20user=20factory?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031015:=20Renamed=20classes=20and=20references=20from=20Cloud?= =?UTF-8?q?=20to=20Tenant,=20custom=20page=20view,=20page=20view=20resolve?= =?UTF-8?q?rs,=20URLModel=20+=20factory,=20URLHelper=20+=20factory=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20310?= =?UTF-8?q?76:=20Successful=20signup=20and=20page=20redirection=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031091:?= =?UTF-8?q?=20Correct=20redirects=20from=20=20and?= =?UTF-8?q?=20/=20URLs=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031098:=20?= =?UTF-8?q?Updated=20Surf=20libs=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031132:=20Tenant=20specific=20implementa?= =?UTF-8?q?tion=20of=20PathStoreObjectPersister=20-=20Surf=20modelobject?= =?UTF-8?q?=20cache=20is=20now=20partitioned=20by=20the=20tenant=20name.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031133:=20Updated=20Surf=20libs=20and=20JavaDoc=20updates=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?31155:=20Initial=20code=20to=20handle=20attempted=20access=20to?= =?UTF-8?q?=20unauthorised=20tenants,=20secondary=20tenants=20added=20to?= =?UTF-8?q?=20TenantUser=20and=20page/activations=20filter=20rule=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031210:?= =?UTF-8?q?=20Fixed=20401=20&=20409=20errors=20on=20remote=20GET/POST=20ca?= =?UTF-8?q?lls.=20Logout=20redirection=20support.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031229:=20Signup=20and?= =?UTF-8?q?=20invitiation=20completion=20updates=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031242:=20Fixed=20up?= =?UTF-8?q?=20invitation,=20signup=20and=20tenant=20switching=20problems?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031270:=20Fixed=20forms=20issue=20(can=20now=20create=20folde?= =?UTF-8?q?rs=20in=20doc=20lib)=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031277:=20THOR-207.=20Invitation=20workf?= =?UTF-8?q?lows=20now=20run=20in=20the=20inviter's=20tenant=20rather=20tha?= =?UTF-8?q?n=20the=20default=20tenant.=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20This=20is=20checked?= =?UTF-8?q?=20in=20on=20a=20side-branch=20because=20the=20invitation=20ema?= =?UTF-8?q?il's=20accept/reject=20links=20include=20the=20tenantId=20and?= =?UTF-8?q?=20this=20tenant-aware=20Share=20URL=20is=20not=20yet=20support?= =?UTF-8?q?ed=20on=20the=20THOR1=20branch.=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20I=20removed=20v?= =?UTF-8?q?arious=20TenantUtil.runAsWork=20calls=20which=20were=20causing?= =?UTF-8?q?=20the=20workflow=20to=20run=20on=20the=20default=20tenant=20ra?= =?UTF-8?q?ther=20then=20the=20current=20tenant.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20SendCloud?= =?UTF-8?q?InvitationEmailDelegate.createInvitationUrl=20now=20includes=20?= =?UTF-8?q?the=20tenantId=20in=20the=20Share=20URL=20it=20generates.=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20Added=20new=20test=20cases=20at=20the=20Java=20API=20l?= =?UTF-8?q?evel.=20(Was=20formerly=20just=20at=20REST=20API=20level).=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?31286:=20(RECORD=20ONLY)=20Reset=20solrcore.properties=20files?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031297:=20Fixed=20FlashUpload=20problem=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031298:=20Fixed=20a?= =?UTF-8?q?pplication=20context=20only=20login=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031302:=20Fixed=20no=20us?= =?UTF-8?q?er=20profile=20image=20url=20issue=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031306:=20Updates=20to=20?= =?UTF-8?q?TenantUserFactory=20to=20defensively=20handle=20missing=20tenan?= =?UTF-8?q?t=20data=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031326:=20Repo=20switch=20tenant=20fixes:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031356:?= =?UTF-8?q?=20Resolve=20switch=20tenant=20niggles,=20with=20assistance=20f?= =?UTF-8?q?rom=20Erik:=20=20=20=2048109:=20Merged=20BRANCHES/DEV/CONV=5FV4?= =?UTF-8?q?13=20to=20BRANCHES/DEV/CONV=5FHEAD:=20=20=20=20=20=20=20=20=204?= =?UTF-8?q?6917:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV?= =?UTF-8?q?=5FV413:=20-=20pre-merge=20of=20repo=20parts=20(not=20mergeinfo?= =?UTF-8?q?/slingshot/web-framework-commons)=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2035766:=20Merged=20BRANCHES/DEV/THOR1=20to=20BRANCHE?= =?UTF-8?q?S/DEV/CLOUD1:=20=20=20=20=20=20=20=20=2046918:=20Merged=20BRANC?= =?UTF-8?q?HES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20-=20pre-merge?= =?UTF-8?q?=20of=20repo=20parts=20(not=20mergeinfo/slingshot)=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2035767:=20Merged=20BRANCHES/DEV/TH?= =?UTF-8?q?OR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=2046919?= =?UTF-8?q?:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV41?= =?UTF-8?q?3:=20=20=20=20=20=20=20=20=20=20=20=20=20=2035768:=20Fix=20comp?= =?UTF-8?q?ile=20issue=20from=20merge=20=20=20=20=20=20=20=20=2046921:=20M?= =?UTF-8?q?erge=20fallout=20-=20fix=20compile=20error.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2046949:=20Test=20fallout=20=20=20=20=20=20=20=20=204712?= =?UTF-8?q?6:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV4?= =?UTF-8?q?13:=20-=20pre-merge=20of=20repo=20parts=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2035954:=20Merged=20BRANCHES/DEV/THOR1=5FSPRINT?= =?UTF-8?q?S=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2035960:=20Merged=20BRANCHES/DEV/THOR1=5FSPRINTS=20to=20?= =?UTF-8?q?BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=203?= =?UTF-8?q?5961:=20Merged=20BRANCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/D?= =?UTF-8?q?EV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=2035962:=20Me?= =?UTF-8?q?rged=20BRANCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/DEV/CLOUD1:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2035963:=20Merged=20BRA?= =?UTF-8?q?NCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/DEV/CLOUD1:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2035964:=20Spring=20Surf=20libra?= =?UTF-8?q?ry=20refresh=20=20=20=20=20=20=20=20=20=20=20=20=20=2035995:=20?= =?UTF-8?q?Fix=20merge=20issue=20=20=20=20=20=20=20=20=20=20=20=20=20=2035?= =?UTF-8?q?999:=20Fix=20merge=20issue=20=20=20=20=20=20=20=20=2047144:=20F?= =?UTF-8?q?ix=20merge/test=20failures=20(WCMTestSuite)=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2047539:=20CLOUD-1375=20-=20fix=20WCM=20unit=20test=20fa?= =?UTF-8?q?llout:=20SandboxServiceImplTest.testDeleteSandbox=20+=20WebProj?= =?UTF-8?q?ectServiceImplTest.testDeleteWebProject=20=20=20=2048111:=20Mer?= =?UTF-8?q?ged=20BRANCHES/DEV/CONV=5FV413=20to=20BRANCHES/DEV/CONV=5FHEAD:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2046954:=20Merged=20from=20BRANCHES/DE?= =?UTF-8?q?V/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2035771:=20Merged=20BRANCHES/DEV/THOR1=20to?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031563:=20THOR-123:=20modules=20are=20no=20longer=20?= =?UTF-8?q?started=20for=20each=20tenant=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031566:=20Update=20account=20class=20display?= =?UTF-8?q?=20names:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20315?= =?UTF-8?q?67:=20THOR-123:=20temp'=20put=20back=20"applyToTenants=3Dtrue"?= =?UTF-8?q?=20...=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031575:?= =?UTF-8?q?=20THOR-123:=20pre-req=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031579:=20Fix=20issue=20where=20setting=20a=20prefer?= =?UTF-8?q?ence=20meant=20that=20the=20person=20could=20no=20longer=20logi?= =?UTF-8?q?n:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031581:=20A?= =?UTF-8?q?ddition=20of=20isNetworkAdmin,=20accountClassName=20and=20accou?= =?UTF-8?q?ntClassDisplayName=20to=20the=20metadata.get=20webscript,=20as?= =?UTF-8?q?=20required=20by=20Erik.=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031582:=20Re-enabling=20RenditionServiceIntegrationT?= =?UTF-8?q?est=20which=20was=20failing.=20See=20THOR-106.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031584:=20THOR-123:=20pre-re?= =?UTF-8?q?q=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031585:=20TH?= =?UTF-8?q?OR-347:=20disable=20test=20(pending=20this=20JIRA)=20-=20Chaini?= =?UTF-8?q?ngUserRegistrySynchronizerTest=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031590:=20=20Account=20changes=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2031591:=20Upgrade=20accound?= =?UTF-8?q?=20button=20is=20now=20a=20mailto=20link=20pointing=20to=20sale?= =?UTF-8?q?s@alfresco.com=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031592:=20Added=20isNetworkAdmin=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031593:=20Made=20sure=20tooltips=20are?= =?UTF-8?q?=20hidden=20when=20a=20dialog/overly=20is=20showed/hidden=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031594:=20Disabling?= =?UTF-8?q?=20test=20again=20pending=20proper=20fix.=20THOR-106=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031595:=20Reduce=20log?= =?UTF-8?q?=20level=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203160?= =?UTF-8?q?0:=20THOR-123:=20mark=20modules=20with=20"applyToTenants=3Dfals?= =?UTF-8?q?e"=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031601:=20T?= =?UTF-8?q?ooltips=20now=20dissapear=20when=20panel/overlays=20are=20destr?= =?UTF-8?q?oyed=20(not=20only=20hidden)=20=20=20=20=20=20=20=20=2046956:?= =?UTF-8?q?=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV?= =?UTF-8?q?=5FV413=20=20=20=20=20=20=20=20=20=20=20=20=20=2035782:=20Merge?= =?UTF-8?q?d=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031607:=20=20"Hide=20ever?= =?UTF-8?q?ything=20but=20the=20doclib"=20customizations=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Dashlets=20?= =?UTF-8?q?adjustments=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20*=20Addons=20RSS=20feed=20-=20hidden=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20*=20Site=20Calendar=20-=20hidden=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20*=20Content=20I'm?= =?UTF-8?q?=20editing=20-=20added=20<@markup>=20extension=20points=20so=20?= =?UTF-8?q?blog,=20wiki=20&=20forum=20sections=20are=20hidden=20by=20cloud?= =?UTF-8?q?=20extension=20module=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20*=20Site=20Data=20List=20-=20hidd?= =?UTF-8?q?en=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20*=20Site=20Links=20-=20hidden=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20*=20Wiki=20-?= =?UTF-8?q?=20hidden=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20*=20User=20Calendar=20-=20hidden=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20URL?= =?UTF-8?q?=20rewrites=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20*=20Forgot=20&=20reset=20password=20urls?= =?UTF-8?q?=20now=20prettyfied,=20not=20using=20"-default-/"=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Dupli?= =?UTF-8?q?cated=20slingshot=20presets=20to=20avoid=20future=20slingshot?= =?UTF-8?q?=20changes=20popping=20up=20in=20the=20cloud=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031611:=20MT:=20fix=20ability?= =?UTF-8?q?=20to=20delete=20a=20disabled=20tenant=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031612:=20THOR-339:=20Disable/enable?= =?UTF-8?q?=20logins=20for=20a=20network=20(account=20update)=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031621:=20THOR-106.=20Tak?= =?UTF-8?q?ing=20a=20failing=20test=20class=20out=20again,=20pending=20fix?= =?UTF-8?q?.=20Hmmmm.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031?= =?UTF-8?q?623:=20THOR-357=20-=20support=20shared=20CMIS=20dictionary=20?= =?UTF-8?q?=20=20=2048112:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRAN?= =?UTF-8?q?CHES/DEV/CONV=5FHEAD:=20(no=20changes)=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2046957:=20Test=20fallout=20=20=20=2048113:=20Merged=20BRANCHE?= =?UTF-8?q?S/DEV/CONV=5FV413=20to=20BRANCHES/DEV/CONV=5FHEAD:=20(no=20chan?= =?UTF-8?q?ges=20-=20already=20pre-merged)=20=20=20=20=20=20=20=20=20=2046?= =?UTF-8?q?911:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/?= =?UTF-8?q?CONV=5FV413=20=20=20=20=20=20=20=20=20=20=20=20=20=2035757:=20M?= =?UTF-8?q?erged=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031367:=20Merged=20BRA?= =?UTF-8?q?NCHES/DEV/THOR1SURF=20to=20BRANCHES/DEV/THOR1:=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2030971:=20(RE?= =?UTF-8?q?CORD=20ONLY)=20Creating=20SURF=20update=20branch=20for=20THOR1?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2030979:=20Commit=20initial=20Surf=20lib=20changes,=20Cloud=20?= =?UTF-8?q?classes=20and=20config=20overrides=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2030980:=20Add=20custom=20?= =?UTF-8?q?Cloud=20Surf=20authenticator,=20connector,=20remote=20store,=20?= =?UTF-8?q?user=20and=20user=20factory=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031015:=20Renamed=20classes=20and?= =?UTF-8?q?=20references=20from=20Cloud=20to=20Tenant,=20custom=20page=20v?= =?UTF-8?q?iew,=20page=20view=20resolvers,=20URLModel=20+=20factory,=20URL?= =?UTF-8?q?Helper=20+=20factory=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031076:=20Successful=20signup=20and=20pa?= =?UTF-8?q?ge=20redirection=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031091:=20Correct=20redirects=20from=20=20and=20/=20URLs=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031098:=20Updated=20Surf=20libs=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031132:=20Tenant?= =?UTF-8?q?=20specific=20implementation=20of=20PathStoreObjectPersister=20?= =?UTF-8?q?-=20Surf=20modelobject=20cache=20is=20now=20partitioned=20by=20?= =?UTF-8?q?the=20tenant=20name.=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031133:=20Updated=20Surf=20libs=20and=20?= =?UTF-8?q?JavaDoc=20updates=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031155:=20Initial=20code=20to=20handle=20at?= =?UTF-8?q?tempted=20access=20to=20unauthorised=20tenants,=20secondary=20t?= =?UTF-8?q?enants=20added=20to=20TenantUser=20and=20page/activations=20fil?= =?UTF-8?q?ter=20rule=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031210:=20Fixed=20401=20&=20409=20errors=20on=20r?= =?UTF-8?q?emote=20GET/POST=20calls.=20Logout=20redirection=20support.=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?31229:=20Signup=20and=20invitiation=20completion=20updates=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?31242:=20Fixed=20up=20invitation,=20signup=20and=20tenant=20swi?= =?UTF-8?q?tching=20problems=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031270:=20Fixed=20forms=20issue=20(can=20no?= =?UTF-8?q?w=20create=20folders=20in=20doc=20lib)=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2031277:=20THOR-207.=20?= =?UTF-8?q?Invitation=20workflows=20now=20run=20in=20the=20inviter's=20ten?= =?UTF-8?q?ant=20rather=20than=20the=20default=20tenant.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Thi?= =?UTF-8?q?s=20is=20checked=20in=20on=20a=20side-branch=20because=20the=20?= =?UTF-8?q?invitation=20email's=20accept/reject=20links=20include=20the=20?= =?UTF-8?q?tenantId=20and=20this=20tenant-aware=20Share=20URL=20is=20not?= =?UTF-8?q?=20yet=20supported=20on=20the=20THOR1=20branch.=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?I=20removed=20various=20TenantUtil.runAsWork=20calls=20which=20?= =?UTF-8?q?were=20causing=20the=20workflow=20to=20run=20on=20the=20default?= =?UTF-8?q?=20tenant=20rather=20then=20the=20current=20tenant.=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20SendCloudInvitationEmailDelegate.createInvitationUrl=20now?= =?UTF-8?q?=20includes=20the=20tenantId=20in=20the=20Share=20URL=20it=20ge?= =?UTF-8?q?nerates.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20Added=20new=20test=20cases=20at=20the?= =?UTF-8?q?=20Java=20API=20level.=20(Was=20formerly=20just=20at=20REST=20A?= =?UTF-8?q?PI=20level).=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031286:=20(RECORD=20ONLY)=20Reset=20solrcore.prop?= =?UTF-8?q?erties=20files=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031297:=20Fixed=20FlashUpload=20problem=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20312?= =?UTF-8?q?98:=20Fixed=20application=20context=20only=20login=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031302:=20?= =?UTF-8?q?Fixed=20no=20user=20profile=20image=20url=20issue=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031306:=20?= =?UTF-8?q?Updates=20to=20TenantUserFactory=20to=20defensively=20handle=20?= =?UTF-8?q?missing=20tenant=20data=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031326:=20Repo=20switch=20tenant=20fi?= =?UTF-8?q?xes:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031356:=20Resolve=20switch=20tenant=20niggles,=20with?= =?UTF-8?q?=20assistance=20from=20Erik:=20=20=20=2048114:=20Merged=20BRANC?= =?UTF-8?q?HES/DEV/CONV=5FV413=20to=20BRANCHES/DEV/CONV=5FHEAD:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2046962:=20Merged=20BRANCHES/DEV/CLOUD2=20to?= =?UTF-8?q?=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=2040147:=20(RECORD=20ONLY)=20French:=20Cloud=20Translation?= =?UTF-8?q?=20update=20from=20Gloria=20(based=20on=20EN=20rev38372)=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2042709:=20(RECORD=20ONLY)=20FRE?= =?UTF-8?q?NCH:=20Translation=20updates=20based=20on=20EN=20r42416=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2042871:=20(RECORD=20ONLY)=20GER?= =?UTF-8?q?MAN:=20Cloud=20Translation,=20based=20on=20r=2042416=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2042879:=20(RECORD=20ONLY)=20SPANIS?= =?UTF-8?q?H:=20Cloud=20Translation,=20based=20on=20r=2042416=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2042890:=20(RECORD=20ONLY)=20ITALIAN:?= =?UTF-8?q?=20Cloud=20Translation,=20based=20on=20r=2042416=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2043879:=20(RECORD=20ONLY)=20FRENCH:=20Tr?= =?UTF-8?q?anslation=20updates=20based=20on=20EN=20r43703=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2043983:=20(RECORD=20ONLY)=20GERMAN:=20Tr?= =?UTF-8?q?anslation=20updates=20based=20on=20EN=20r43703=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2043984:=20(RECORD=20ONLY)=20SPANISH:=20T?= =?UTF-8?q?ranslation=20updates=20based=20on=20EN=20r43703=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2043985:=20(RECORD=20ONLY)=20FRENCH:=20Tr?= =?UTF-8?q?anslation=20updates=20based=20on=20EN=20r43703,=20includes=20fi?= =?UTF-8?q?le=20missing=20from=20previous=20commit.=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2043986:=20(RECORD=20ONLY)=20ITALIAN:=20Transla?= =?UTF-8?q?tion=20updates=20based=20on=20EN=20r43703.=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2043987:=20(RECORD=20ONLY)=20JAPANESE:=20Transl?= =?UTF-8?q?ation=20updates=20based=20on=20EN=20r43703.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2044031:=20(RECORD=20ONLY)=20JAPANESE:=20Tra?= =?UTF-8?q?nslation=20updates=20based=20on=20EN=20r43703.=20Corrects=20fil?= =?UTF-8?q?e=20missed=20from=20previous=20commit.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2044032:=20(RECORD=20ONLY)=20GERMAN:=20Translation?= =?UTF-8?q?=20updates=20based=20on=20EN=20r43703.=20Corrects=20missing=20l?= =?UTF-8?q?ine=20break.=20=20=20=20=20=20=20=20=20=20=20=20=2045329:=20(RE?= =?UTF-8?q?CORD=20ONLY)=20FRENCH:=20Cloud=20translation=20updates=20based?= =?UTF-8?q?=20on=20EN=20r45266=20=20=20=20=20=20=20=20=20=20=20=20=2045330?= =?UTF-8?q?:=20(RECORD=20ONLY)=20GERMAN:=20Cloud=20translation=20updates?= =?UTF-8?q?=20based=20on=20EN=20r45266=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2045332:=20(RECORD=20ONLY)=20SPANISH:=20Cloud=20translation=20?= =?UTF-8?q?updates=20based=20on=20EN=20r45266=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2045333:=20(RECORD=20ONLY)=20JAPANESE:=20Cloud=20tran?= =?UTF-8?q?slation=20updates=20based=20on=20EN=20r45266=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2045427:=20(RECORD=20ONLY)=20SPANISH:=20Clou?= =?UTF-8?q?d=201=20translation=20updates=20based=20on=20EN=20r45266=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2045718:=20(RECORD=20ONLY)=20ITA?= =?UTF-8?q?LIAN:=20Translation=20updates=20based=20on=20EN=20r45266=20(mis?= =?UTF-8?q?sed=20from=20previous=20bundle=20import)=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2045838:=20(RECORD=20ONLY)=20FRENCH:=20Cloud=20?= =?UTF-8?q?Translation=20update=20based=20on=20EN=20r45266=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2045966:=20(RECORD=20ONLY)=20Translation?= =?UTF-8?q?=20update=20to=20fix=20CLOUD-1270=20in=20FR=20and=20ES=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2046365:=20(RECORD=20ONLY)=20ALL=20?= =?UTF-8?q?LANG:=20Translation=20updates=20based=20on=20EN=20r46289=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2046366:=20(RECORD=20ONLY)=20ALL?= =?UTF-8?q?=20LANG:=20Updates=20copyright=20year=20to=202013=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2046377:=20(RECORD=20ONLY)=20ALL=20LAN?= =?UTF-8?q?G:=20Adds=20strings=20missing=20from=20previous=20commit.=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2047192:=20Merged=20BRANCHES/DEV/CLOUD2?= =?UTF-8?q?=20to=20BRANCHES/DEV/CONV=5FV413:=20(record-only=20-=20WebDAV?= =?UTF-8?q?=20mostly=20resolved=20as=20part=20of=2036117=20merge)=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2036408:=20(RECORD=20ONLY)=20Merged?= =?UTF-8?q?=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2036404:=20Merged=20BRA?= =?UTF-8?q?NCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/DEV/THOR1:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20360?= =?UTF-8?q?60:=20THOR-1373:=20Proxied=20WebDAV=20must=20generate=20correct?= =?UTF-8?q?=20URLs=20when=20URL-rewriting=20is=20used.=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2036083:=20THO?= =?UTF-8?q?R-1373:=20Proxied=20WebDAV=20must=20generate=20correct=20URLs?= =?UTF-8?q?=20when=20URL-rewriting=20is=20used.=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2047369:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CO?= =?UTF-8?q?NV=5FV413:=20=20=20=20=20=20=20=20=20=20=20=20=2041180:=20(RECO?= =?UTF-8?q?RD=20ONLY)=20Merged=20BRANCHES/DEV/FEATURES/CLOUD1=5FCLOUDSYNC?= =?UTF-8?q?=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2040482:=20ALF-13998:=20'No=20items'=20error?= =?UTF-8?q?=20is=20highlighted=20in=20red,=20even=20that=20is=20not=20seve?= =?UTF-8?q?r=20error.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20-=20ALF-15453:=20Incorrect=20manage=20permissions?= =?UTF-8?q?=20working=20for=20a=20file/folder=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/FEATURES/CLOUD?= =?UTF-8?q?1=5FCLOUDSYNC=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2040486:=20ALF-15453:?= =?UTF-8?q?=20Incorrect=20manage=20permissions=20working=20for=20a=20file/?= =?UTF-8?q?folder=20=20=20=20=20=20=20=20=20=2047377:=20Merged=20BRANCHES/?= =?UTF-8?q?DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2041048:=20(RECORD=20ONLY)=20Merged=20DEV/V4?= =?UTF-8?q?.1-BUG-FIX=20to=20DEV/CLOUD1=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2040382:=20Fix=20for=20ALF-15491=20SOLR?= =?UTF-8?q?=20is=20generating=20queries=20for=20lucene=20style=20cross-lan?= =?UTF-8?q?guage=20support=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2040632:=20Fix=20for=20ALF-15487=20Search=20not=20workin?= =?UTF-8?q?g=20for=20queries=20containing=203-digit=20versions=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20Fix=20for=20ALF-15356=20SOLR=20doesn't=20support=20searching?= =?UTF-8?q?=20by=20cm:name=20of=20file=20with=20underscore=20and=20dots=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2040662:=20?= =?UTF-8?q?Eclipse=20classpath=20fixes=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2041032:=20Fix=20for=20ALF-15753=20=20=20=20?= =?UTF-8?q?=20=20=20Infinite=20loop=20during=20Solr=20ACL=20indexing=20whe?= =?UTF-8?q?n=20ACL=20Changeset=20batch=20is=20empty=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2047393:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/?= =?UTF-8?q?DEV/CONV=5FV413:=20=20=20=20=20=20=20=20=20=20=20=20=20=20Merge?= =?UTF-8?q?d=20DEV/CLOUD1-BUG-FIX=20into=20DEV/CLOUD1:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2041674:=20ALF-15967:=20Using?= =?UTF-8?q?=20START=5FUSER=5FID=5F=20instead=20of=20"initiator"=20property?= =?UTF-8?q?=20to=20query=20process=20instances=20started=20by=20user=20X?= =?UTF-8?q?=20to=20prevent=20extra=20joins=20+=20removed=20unused=20consta?= =?UTF-8?q?nts=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2041650:?= =?UTF-8?q?=20Fixed=20CLOUD-667:=20Merged=20fix=20for=20ALF-14438=20into?= =?UTF-8?q?=20CLOUD1-BUG-FIX=20+=20using=20START=5FUSER=5FID=5F=20instead?= =?UTF-8?q?=20of=20custom=20"initiator"=20property=20to=20query=20initiato?= =?UTF-8?q?r=20to=20boost=20performance=20even=20more=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2047412:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/?= =?UTF-8?q?DEV/CONV=5FV413:=20=20=20=20=20=20=20=20=20=20=20=20=2042252:?= =?UTF-8?q?=20(RECORD=20ONLY)=20Merged=20BRANCHES/DEV/V4.1-BUG-FIX=20to=20?= =?UTF-8?q?BRANCHES/DEV/CLOUD1=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2042233:=20Fix=20for=20ALF-16164=20Cloud=20monitor?= =?UTF-8?q?ing=20of=20SOLR=20is=20CPU=20intensive=20due=20to=20its=20repea?= =?UTF-8?q?ted=20use=20of=20the=20SOLR=20stats=20page=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20and=20?= =?UTF-8?q?related=20CLOUD-760=20Cloud=20monitoring=20of=20SOLR=20is=20CPU?= =?UTF-8?q?=20intensive=20due=20to=20its=20repeated=20use=20of=20the=20SOL?= =?UTF-8?q?R=20stats=20page=20=20=20=20=20=20=20=20=20=2047429:=20Merged?= =?UTF-8?q?=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2042200:=20Merged=20DEV/CLOUD1-B?= =?UTF-8?q?UG-FIX=20into=20DEV/CLOUD1:=20Record-only=20(r41650=20and=20r41?= =?UTF-8?q?674)=20=20=20=20=20=20=20=20=20=2047433:=20Merged=20BRANCHES/DE?= =?UTF-8?q?V/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20CLOUD-808:=20Fix=20for=20timer=20deploying?= =?UTF-8?q?=20MT-process=20when=20shared=20is=20required=20caused=20test?= =?UTF-8?q?=20to=20fail=20=20=20=20=20=20=20=20=20=2047435:=20Merged=20BRA?= =?UTF-8?q?NCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/CLOUD1=5FCO?= =?UTF-8?q?RS=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2043100:=20Update=20the=20salesforce=20amp?= =?UTF-8?q?=20to=20include=20the=20CORS=20Filter=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2043101:=20Update=20web.xml=20to=20?= =?UTF-8?q?enable=20to=20the=20CORS=20Filter=20with=20filter-mapping=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2043117:=20Add=20?= =?UTF-8?q?updated=20amp=20with=20removed=20CORS=20Filter.=20=20CORS=20Fil?= =?UTF-8?q?ter=20is=20now=20available=20in=203rd-party=20libs=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2043118:=20[CLOUD-724]?= =?UTF-8?q?=20Add=20CORS=20Filter=20jar=20to=203rd-party=20libs=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2043119:=20[CLOUD-72?= =?UTF-8?q?4]=20Add=20missing=20jar=20java-property-utils-1.6.jar=20to=203?= =?UTF-8?q?rd-party=20libs=20=20=20=20=20=20=20=20=20=2047485:=20Merged=20?= =?UTF-8?q?BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2044203:=20(RECORD=20ONLY)=20Merged?= =?UTF-8?q?=20BRANCHES/V4.1=20to=20BRANCHES/DEV/CLOUD1=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2044200:=20Probable=20fix?= =?UTF-8?q?=20for=20=20=20=20=20ALF-16895=20SOLR:=20Cannot=20find=20files?= =?UTF-8?q?=20after=20restart=20and=20reindex=20solr=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2044276:=20(RECORD=20ONLY)=20Merged=20BRANCHES/?= =?UTF-8?q?V4.1=20to=20BRANCHES/DEV/CLOUD1=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2044275:=20Part=202=20for=20ALF-16895?= =?UTF-8?q?=20SOLR:=20Cannot=20find=20files=20after=20restart=20and=20rein?= =?UTF-8?q?dex=20solr=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20fix=20initial=20cache=20state=20?= =?UTF-8?q?to=20cope=20with=20duplicate=20leaf/aux=20doc=20entries.=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2044314:=20(RECORD=20ONLY)=20Mer?= =?UTF-8?q?ged=20BRANCHES/V4.1=20to=20BRANCHES/DEV/CLOUD1=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2044312:=20Part?= =?UTF-8?q?=203=20for=20ALF-16895=20SOLR:=20Cannot=20find=20files=20after?= =?UTF-8?q?=20restart=20and=20reindex=20solr=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20fix?= =?UTF-8?q?=20incremental=20cache=20state=20to=20cope=20with=20duplicate?= =?UTF-8?q?=20leaf/aux=20doc=20entries.=20=20=20=20=20=20=20=20=20=2047523?= =?UTF-8?q?:=20Merged=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV41?= =?UTF-8?q?3:=20=20=20=20=20=20=20=20=20=20=20=20=2044573:=20(RECORD=20ONL?= =?UTF-8?q?Y)=20Merged=20BRANCHES/DEV/CLOUD1=5FSP=20to=20BRANCHES/DEV/CLOU?= =?UTF-8?q?D1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2044572:?= =?UTF-8?q?=20Clean=20up=20of=20unused=20files.=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2044576:=20(RECORD=20ONLY)=20Merged=20BRANCHES/DEV/CL?= =?UTF-8?q?OUD1=5FCORS=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2044518:=20[CLOUD-955]=20Change=20C?= =?UTF-8?q?ORS=20filter-mapping=20to=20use=20servelet=20instead=20of=20url?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2044691:=20(RECORD=20ONLY)?= =?UTF-8?q?=20Merged=20BRANCHES/DEV/CLOUD1=5FCORS=20to=20BRANCHES/DEV/CLOU?= =?UTF-8?q?D1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2044688:?= =?UTF-8?q?=20(RECORD=20ONLY)=20Rebase=20CLOUD1=5FCORS=20with=20CLOUD1=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2044689:=20[CL?= =?UTF-8?q?OUD-1072]=20Add=20public=20api=20url=20to=20CORS=20filter=20map?= =?UTF-8?q?ping.=20=20Move=20CORS=20filter=20mapping=20to=20live=20above?= =?UTF-8?q?=20the=20publicapi=20filter=20mappings.=20=20OPTIONS=20calls=20?= =?UTF-8?q?made=20to=20the=20CORS=20filter=20should=20be=20evaluated=20bef?= =?UTF-8?q?ore=20Layer7=20authentication.=20=20=20=20=20=20=20=20=20=20475?= =?UTF-8?q?48:=20Merged=20DEV/CLOUD2=20to=20DEV/CONV=5FV413=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2046931:=20Overriding=20form=20runtime's?= =?UTF-8?q?=20submissionUrl=20using=20extesnion=20point=20in=20FormUIGet?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2046984:=20Overriding=20en?= =?UTF-8?q?tire=20sent-invites.js=20(instead=20of=20modifying=20the=20core?= =?UTF-8?q?=20slingshot=20code)=20with=20a=20copy=20of=20the=20core=20code?= =?UTF-8?q?=20modified=20to=20work=20with=20the=20cloud=20invite=20apis.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2046986:=20Overriding=20he?= =?UTF-8?q?lp=20pages=20config=20in=20cloud-config.xml=20(rather=20than=20?= =?UTF-8?q?modifying=20the=20core=20files!)=20=20=20=20=20=20=20=20=20=204?= =?UTF-8?q?7553:=20Merged=20DEV/CLOUD2=20to=20DEV/CONV=5FV413=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2047421:=20Overriding=20entire=20sent-?= =?UTF-8?q?invites.get=20ftl=20&=20properties=20(instead=20of=20modifying?= =?UTF-8?q?=20the=20core=20slingshot=20code)=20with=20a=20copy=20of=20the?= =?UTF-8?q?=20core=20code=20modified=20to=20fit=20the=20cloud=20requiremen?= =?UTF-8?q?ts.=20=20=20=20=20=20=20=20=20=20=20=20=2047442:=20Add=20web=20?= =?UTF-8?q?overlay=20for=20share=20+=20tune=20embedded=20librairies=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2047455:=20Add=20dependency=20on?= =?UTF-8?q?=20jetty-webapp=20to=20compile=20the=20tests=20=20=20=2048115:?= =?UTF-8?q?=20CONV:=20Fix=20cache=20defs=20(propertyUniqueContextCache=20&?= =?UTF-8?q?=20siteNodeRefCache)=20=20=20=2048117:=20Merged=20DEV/CONV=5FV4?= =?UTF-8?q?13=20to=20DEV/CONV=5FHEAD=20=20=20=20=20=20=20=20=2046959:=20Me?= =?UTF-8?q?rged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV4?= =?UTF-8?q?13=20=20=20=20=20=20=20=20=20=20=20=2035790:=20Merged=20BRANCHE?= =?UTF-8?q?S/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031624:=20Resolve=20THOR-302:=20transformat?= =?UTF-8?q?ion-client-1.0.0-SNAPSHOT.jar=20not=20in=20alfresco/WEB-INF/lib?= =?UTF-8?q?:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031632:=20More=20r?= =?UTF-8?q?eliable=20test,=20hopefully=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031644:=20Fix=20unreported=20issue=20in=20aws-context.x?= =?UTF-8?q?ml.sample=20(not=20well-formed=20XML)=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031645:=20Customized=20invite=20links=20to?= =?UTF-8?q?=20use=20"cloud=20dialog"=20instead=20of=20"invite=20page"=20fo?= =?UTF-8?q?r=20the=20following=20components:=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031662:=20New=20Analytics=20events=20and=20tests?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031663:=20New=20Ana?= =?UTF-8?q?lytics=20events=20and=20tests=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031678:=20Addition=20of=20isExternal=20data=20to=20s?= =?UTF-8?q?ite=20membership=20webscripts.=20=20=20=2048118:=20Merged=20DEV?= =?UTF-8?q?/CONV=5FV413=20to=20DEV/CONV=5FHEAD=20=20=20=20=20=20=20=20=204?= =?UTF-8?q?6960:=20Merged=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV?= =?UTF-8?q?/CONV=5FV413=20=20=20=20=20=20=20=20=20=20=20=2035791:=20Merged?= =?UTF-8?q?=20BRANCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031684:=20THOR-367=20-=20#1=20W?= =?UTF-8?q?ithin=20Site=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20-=20Remove=20all=20page=20components=20other=20than=20?= =?UTF-8?q?site=20dashboard,=20document=20library=20and=20members=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Remove?= =?UTF-8?q?=20customize=20site=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031685:=20New=20lightweight=20webscript=20to=20retrieve=20use?= =?UTF-8?q?r/network=20metadata=20about=20the=20currently=20authenticated?= =?UTF-8?q?=20user=20in=20the=20current=20tenant.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031693:=20THOR-365:=20Private=20site=20cann?= =?UTF-8?q?ot=20be=20access=20(since=20surf-config=20is=20not=20imported)?= =?UTF-8?q?=20-=20causes:=20Could=20not=20resolve=20view=20with=20name=20.?= =?UTF-8?q?..=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031695:=20THOR-36?= =?UTF-8?q?7=20-=20#2=20Document=20Library=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20-=20remove=20Create=20Content.?= =?UTF-8?q?..=20menu=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20-=20remove=20actions:=20manage=20aspects,=20change=20t?= =?UTF-8?q?ype,=20publish,=20manage=20rules=20(for=20folders)=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20document?= =?UTF-8?q?-details=20page:=20remove=20publishing=20history=20panel=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031697:=20For=20reference?= =?UTF-8?q?=20only:=20update=20description=20of=20cmis/test=20webscript=20?= =?UTF-8?q?=20=20=2048119:=20Merged=20BRANCHES/DEV/CONV=5FV413=20to=20BRAN?= =?UTF-8?q?CHES/DEV/CONV=5FHEAD:=20=20=20=20=20=20=20=20=2046972:=20Fix=20?= =?UTF-8?q?test=20fallout=20(re:=20THOR-293)=20=20=20=2048120:=20Merged=20?= =?UTF-8?q?BRANCHES/DEV/CONV=5FV413=20to=20BRANCHES/DEV/CONV=5FHEAD:=20(re?= =?UTF-8?q?po=20pre-merge)=C2=A7=20=20=20=20=20=20=20=20=2047001:=20Merged?= =?UTF-8?q?=20from=20BRANCHES/DEV/CLOUD2=20to=20BRANCHES/DEV/CONV=5FV413?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2035798:=20Merged=20BRA?= =?UTF-8?q?NCHES/DEV/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2031805:=20Adding=20utility=20me?= =?UTF-8?q?thod=20to=20our=20CollectionUtils=20class=20that=20I=20need=20a?= =?UTF-8?q?s=20part=20of=20pending=20invitations=20work=20(THOR-373).=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031809:=20Parame?= =?UTF-8?q?terized=20signup=20url=20&=20email=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031812:=20THOR-373=20Pending=20invitatio?= =?UTF-8?q?ns.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031814:=20?= =?UTF-8?q?Made=20changes=20to=20way=20aid=20is=20captured=20ready=20for?= =?UTF-8?q?=20allowing=20events=20to=20override=20aid=20if=20needed=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031820:=20Mapping?= =?UTF-8?q?=20of=20network=20admin=20to=20system=20admin=20part=201:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2035801:Merged=20BRANCHES/DEV?= =?UTF-8?q?/THOR1=20to=20BRANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=2031829:=20Fixed=20THOR-352=20"Incorrect?= =?UTF-8?q?=20validation=20of=20emails=20on=20"Forgot=20Password"=20page"?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031830:=20(RE?= =?UTF-8?q?CORD=20ONLY)=20Exclude=20ExportDbTest;=20issues=20with=20MySQL?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031831:=20(RE?= =?UTF-8?q?CORD=20ONLY)=20Merged=20HEAD=20to=20BRANCHES/DEV/THOR1:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20317?= =?UTF-8?q?84:=20Fix=20up=20unit=20test.=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031833:=20Email=20validation=20now=20allows=20?= =?UTF-8?q?7=20character=20long=20top=20level=20domain=20(so=20we=20can=20?= =?UTF-8?q?do=20tests=20with=20example)=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031834:=20New=20form=20colors=20for=20invalid?= =?UTF-8?q?=20&=20mandatory=20fields=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031837:=20THOR-327=20-=20remove=20bootstrapped=20?= =?UTF-8?q?guest=20/=20guest@=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031838:=20THOR-327=20-=20remove=20bootstrapped=20?= =?UTF-8?q?guest=20/=20guest@=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031844:=20Added=20missing=20headers=20to=20Java?= =?UTF-8?q?=20files.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20318?= =?UTF-8?q?45:=20Mapping=20of=20network=20admin=20to=20system=20admin=20pa?= =?UTF-8?q?rt=202:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031846?= =?UTF-8?q?:=20Addition=20of=20very=20basic=20test=20script=20for=20the=20?= =?UTF-8?q?Script=20API=20of=20AnalyticsService.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2035803:=20Merged=20BRANCHES/DEV/THOR1=20to=20B?= =?UTF-8?q?RANCHES/DEV/CLOUD1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=2031853:=20Forms=20refactor=20first=20cut=20-=20for=20re?= =?UTF-8?q?view=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031855:?= =?UTF-8?q?=20THOR-387.=20Analytics=20event=20for=20user=20activation=20is?= =?UTF-8?q?=20sent.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203185?= =?UTF-8?q?8:=20THOR-387.=20Fixing=20a=20corner-case=20bug=20in=20SendAnal?= =?UTF-8?q?yticsRequest.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031863:=20(RECORD=20ONLY)=20Merged=20HEAD=20to=20BRANCHES/DEV?= =?UTF-8?q?/THOR1:=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=2031841:=20Build=20Fix=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2031868:=20THOR-361:=20Fix=20/service/index?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031881:=20THO?= =?UTF-8?q?R-387.=20Adding=20analytics=20event=20for=20site=20invitation.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031882:=20THO?= =?UTF-8?q?R-387.=20Fixing=20analytics=20event=20for=20site=20invitation.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031883:=20THO?= =?UTF-8?q?R-66:=20disable=20some=20of=20the=20/alfresco=20(web.xml)=20ser?= =?UTF-8?q?vlet=20mappings=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2031884:=20THOR-387.=20Analytic=20event=20callouts=20for=20sit?= =?UTF-8?q?e=20invitation=20response.=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031899:=20Revert=20solrcore.properties=20checkin?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031900:=20THO?= =?UTF-8?q?R-249:=20override=20edition=20interceptor=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031901:=20Fix=20for=20THOR-396.=20?= =?UTF-8?q?Spelling=20mistake=20on=20signup=20screen.=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2031902:=20Resolve=20THOR-251:=20Up?= =?UTF-8?q?date=20the=20Help=20URLs=20for=20Cloud=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2031904:=20Resolve=20THOR-403:=20-syst?= =?UTF-8?q?em-=20tenant=20not=20found=20logged=20from=20server=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2031918:=20Create=20site?= =?UTF-8?q?=20form=20tweak=20(manual=20form.validate()=20call=20required?= =?UTF-8?q?=20since=20javascript=20is=20changing=20a=20another=20fields=20?= =?UTF-8?q?value)=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031919:?= =?UTF-8?q?=20Logout=20page=20refactoring=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=2031925:=20Create=20site=20now=20resets=20form?= =?UTF-8?q?=20before=20show=20using=20forms-runtime's=20new=20"reset"=20me?= =?UTF-8?q?thod=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2031926:?= =?UTF-8?q?=20Disable=20flash=20upload=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=2031927:=20THOR-363:=20increase=20initial=20file?= =?UTF-8?q?=20quota=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=203193?= =?UTF-8?q?0:=20Updated=20SimpleDB=20service=20so=20you=20can=20set=20the?= =?UTF-8?q?=20SimpleDB=20domain=20to=20record=20events=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31933: THOR-387. Analytics. Added analytic call for account registration (the initial signup, not the activation, which was added previously). This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters. The same parameter is now mandatory on the RegistrationService. Impacts on test code. Changed the rest-client .rcq file to show new required parameter. Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null. Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup. 31939: THOR-404: disable JBPM 31943: THOR-387. Analytics. I've overridden upload.post.js to add analytics data for file uploads. 31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme" 31947: Fixed THOR-308 "Invite user drop-down works incorrectly" 31948: Resolve THOR-384: It is impossible to create user administrator@'domain': 31949: Follow-up fix for case sensitive user names 31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked: 31959: Removing change-password override since user shall be able to change his password 31961: Fix tests after recent username/email address changes 31966: Grey Theme 31979: Dropping Analytics logging level down to 'warn' from 'debug'. 31982: Fixed THOR-419 "UI edits required" 31983: Fixed THOR-419 "UI edits required" part 2 32003: THOR-422. Spurious error logging during signup/registration (not activation). This was because the analytics event action code assumed the user exists, which they don't do at registration, of course. 32004: Resolve undefined undefined seen in invite signup dialog 32006: Restricted tentant component now displays dialog instead of gray page 32007: THOR-300: fix AWS config 32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page" 32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error" 32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed) 48122: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47007: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35817: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32250: (RECORD ONLY) Merged /HEAD to BRANCHES/DEV/THOR1: (ok'ed with DC/DG) 31750: Solr: Fix owner Id cache 31751: Fix for ALF-11104: add authenticated user to authorisations list in PermissionService + fix inconsistency in AuthorityService 31760: Correct Fix for SOLR owner ID cache 32172: Fixes for: ALF-11521 Protect SOLR running against the wrong Alfresco DB ALF-11602 Solr Core Tracker - does not need to re-init CMIS dictionary (when there are no model changes) ALF-11621 SOLR old versions of tracked models are not getting deleted when models are updated 32234: Fix for ALF-11568 SOLR indexing is ignoring properties that are indexed but not tokenised and not stored - was WCMQS navigation is broken 32256: THOR-488. Tidy up account types. 32258: Login analytics event. 32260: Reduce logging on startup for enabled tenants (see also THOR-475 / THOR-81) 32262: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 32139: Fix for ALF-11599 - Section ''Others are Editing'' shows documents that should not be present 48123: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge) 47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32019: Merged rev 32016 from THORSURF1 32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx) 32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads" 32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck 32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin) 32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants) 32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share 47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32041: Label changes according to Kathryn's "UI Text_scenario 5.docx" 32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled) 32058: Removed unnecessary borders from profile pages 32065: Fix build issue where cloud share war was not being cleaned before build 32066: Fix those pesky solrcore properties 32071: THOR-461: fix following email notification (to contain network/tenant ctx) 32076: Fix to disable error on unit tests 32077: Added logging to NullPointerException fix 35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32103: Finally! A fix for THOR-193. :) 32119: Fix for setting theme as network admin 32120: Improved text on upgrade account page 32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded. 32130: Fix for THOR-457. Already have an account email template needs updating/fixing. 32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants" 32140: Apply Beta logos and adjust about dialog for cloud 35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI) 32147: THOR-475 - improvement(s) to trim time to create tenant 32148: THOR-475 - improvement(s) to trim time to create tenant 32154: GreyTheme updates 32157: THOR-430: Forgot password dialog: UI text not what was suggested 32159: GreyTheme updates 32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search 32176: Signup page now cloud.alfresco.com 32179: THOR-475 - improvement(s) to trim time to create tenant 32184: Remove jargon from workflow names and descriptions 32185: Pesky solrcore.properties 35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL 32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users. Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running. Returning this flag through the Java API & REST API Tweaks to the Share JS so that it renders a for invitees who are not members and an for those who are. 32198: Replace workflow text with task related text 32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds 32204: Build fix 32238: THOR-290: Configurable google-analytics tracking code script insertion 32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite. 32241: THOR-471: Added GetSatisfaction feedback widget 35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32266: Addition of createSite analytics recording. 32268: THOR-505: Disable (turnoff autostart) of unused subsystems 32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again) 32272: Resolve THOR-354: (None) displayed for network administrators 32273: THOR-499: New Relic monitoring updates 32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators" 48125: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (repo pre-merge) 47053: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers) 32378: CollectionUtils method for collection intersection. Should be merged to HEAD. 32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage) 32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports" 32389: Fix for THOR-567 "userprofile broken" 32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant) 32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others 32414: Theme updates from linton 32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload" 32424: THOR-81: support for signup/activate scaling tests 48126: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47058: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons/3rd-party) 35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35830: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 48129: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47067: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35844: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 47069: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml). 35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project) 33022: THOR-662: Email templates should load/resolve (initially) from classpath 47071: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33090: ALF-10826: hidden aspect 33091: THOR-416: fix surf-config folder (appears where it shouldn't) 33093: Sweep through email templates. 47072: Fix merge error (FeedCleaner) 47073: Fix merge error (WorkflowTestSuite) 47074: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33104: Tweak to invitation email template 33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS. Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco. Set the limit to the empty string in core Alfresco, which means 'no limit'. Applied the limit always. Set the limit to 25Mb in Thor/alfresco-global.properties Fixed a minor bug in error reporting due to previous exception renaming. 47076: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript 33135: Missing WebScripts sources JAR from r33134 33153: Resolve THOR-551: Password Hashes Need Review 33154: Update to latest email blacklist 33155: Fixed THOR-534 "Login Box shows scroll bars" 33156: Build fix for tests failing due to recent password changes 33157: Build fix for updated email blacklist 33172: THOR-776: Re-implement Share override as guided by Erik 33173: THOR-831: Text in Someone 35886: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33174: Latest SpringSurf libs - improved RemoteClient reused of connections per request thread. 33176: THOR-833: Search: clicking on All Sites returns no results 48131: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47098: (RECORD ONLY) Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35895: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 34105: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 33267: (RECORD ONLY) Created branch THOR1_SPRINTS (from THOR1 r33255) 33269: Snapshot of simple redeploy shell script (for AWS mini-dev/test env) 33272: JMeter test script 34106: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 33313: THOR-928: Added caching for i18n bundles provided by extensibility modules (latest Surf libs, r980) 48133: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47097: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 47099: Fix merge/compile error. 47103: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47111: Fix merge error 47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48135: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46977: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35792: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31724: Can't compare pages using page.url.uri anymore since that doesn't include the tentant, now skips that part of the url and uses page.id instead. 31733: Add account info to user network web script 31736: Refactored RegistrationServiceImpl.promote... so that it uses the presence of cloud:personExternal aspect to prevent promotion of external users rather than account-based data. 35794: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31744: Account relates to url & various Share features now hidden in cloud 31746: 1/5 for THOR-341 "F147: Share features are disabled for external network member" 35796:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31756: THOR-265: Currently the first user to sign up to a dmain becomes the domain admin, and can view the full admin console. Is this going to change? 31771: Added stub for SimpleDBAnalytics Service 31772: Final interfaces and integration with SimpleDB for Analytics 31774: Modified landing_time key for MixPanel 31776: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" 31777: Resolve test classpath since introduction of new thor libs 31779: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" part 2 31781: Resolve issue getting access to account settings when network admin of paid business account 31783: Implemented #2 for THOR-341 "F147: Share features are disabled for external network member" 31794: Minor changes after review with DavidC and NeilM 31797: Collaboration title improvement: Now hiding the html elements used to build the menu until the menu is created so ui doesn't bump and look ugly. 31799: Part #6 of THOR-367 "F60: Remove Share features not required for Cloud" - 6) Document Selectors - root is Sites folder 31801: Removed ugly "extra" borders around some of the input fields in the user profile form 31802: Fixed part #7 of THOR-367 "F60: Remove Share features not required for Cloud" - 7) Edit Profile - remove edit email from edit profile form 31804: Fixed part #5 of THOR-367 "F60: Remove Share features not required for Cloud" - 5) Move... / Copy... dialog - remove repository - remove my user home 48136: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373). 31809: Parameterized signup url & email 31812: THOR-373 Pending invitations. 31814: Made changes to way aid is captured ready for allowing events to override aid if needed 31820: Mapping of network admin to system admin part 1: 35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page" 31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL 31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31784: Fix up unit test. 31833: Email validation now allows 7 character long top level domain (so we can do tests with example) 31834: New form colors for invalid & mandatory fields 31837: THOR-327 - remove bootstrapped guest / guest@ 31838: THOR-327 - remove bootstrapped guest / guest@ 31844: Added missing headers to Java files. 31845: Mapping of network admin to system admin part 2: 31846: Addition of very basic test script for the Script API of AnalyticsService. 35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31853: Forms refactor first cut - for review 31855: THOR-387. Analytics event for user activation is sent. 31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest. 31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31841: Build Fix 31868: THOR-361: Fix /service/index 31881: THOR-387. Adding analytics event for site invitation. 31882: THOR-387. Fixing analytics event for site invitation. 31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings 31884: THOR-387. Analytic event callouts for site invitation response. 31899: Revert solrcore.properties checkin 31900: THOR-249: override edition interceptor 31901: Fix for THOR-396. Spelling mistake on signup screen. 31902: Resolve THOR-251: Update the Help URLs for Cloud 31904: Resolve THOR-403: -system- tenant not found logged from server 31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value) 31919: Logout page refactoring 31925: Create site now resets form before show using forms-runtime's new "reset" method 31926: Disable flash upload 31927: THOR-363: increase initial file quota 31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too 48137: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31933: THOR-387. Analytics. Added analytic call for account registration (the initial signup, not the activation, which was added previously). This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters. The same parameter is now mandatory on the RegistrationService. Impacts on test code. Changed the rest-client .rcq file to show new required parameter. Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null. Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup. 31939: THOR-404: disable JBPM 31943: THOR-387. Analytics. I've overridden upload.post.js to add analytics data for file uploads. 31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme" 31947: Fixed THOR-308 "Invite user drop-down works incorrectly" 31948: Resolve THOR-384: It is impossible to create user administrator@'domain': 31949: Follow-up fix for case sensitive user names 31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked: 31959: Removing change-password override since user shall be able to change his password 31961: Fix tests after recent username/email address changes 31966: Grey Theme 31979: Dropping Analytics logging level down to 'warn' from 'debug'. 31982: Fixed THOR-419 "UI edits required" 31983: Fixed THOR-419 "UI edits required" part 2 32003: THOR-422. Spurious error logging during signup/registration (not activation). This was because the analytics event action code assumed the user exists, which they don't do at registration, of course. 32004: Resolve undefined undefined seen in invite signup dialog 32006: Restricted tentant component now displays dialog instead of gray page 32007: THOR-300: fix AWS config 32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page" 32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error" 32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed) 48147: CONV: fix merge issue - remove duplicate prop def (contentLimitProvider) 48148: Merged DEV/CONV_V413 to DEV/CONV_HEAD merge fix for r48072 48149: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47111: Fix merge error 47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48150: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively RECORD ONLY - no changes) 47173: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 36232: MT - fix pop of tenant ctx (to match push) 48154: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32019: Merged rev 32016 from THORSURF1 32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx) 32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads" 32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck 32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin) 32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants) 32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share 47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32041: Label changes according to Kathryn's "UI Text_scenario 5.docx" 32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled) 32058: Removed unnecessary borders from profile pages 32065: Fix build issue where cloud share war was not being cleaned before build 32066: Fix those pesky solrcore properties 32071: THOR-461: fix following email notification (to contain network/tenant ctx) 32076: Fix to disable error on unit tests 32077: Added logging to NullPointerException fix 35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32103: Finally! A fix for THOR-193. :) 32119: Fix for setting theme as network admin 32120: Improved text on upgrade account page 32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded. 32130: Fix for THOR-457. Already have an account email template needs updating/fixing. 32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants" 32140: Apply Beta logos and adjust about dialog for cloud 35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI) 32147: THOR-475 - improvement(s) to trim time to create tenant 32148: THOR-475 - improvement(s) to trim time to create tenant 32154: GreyTheme updates 32157: THOR-430: Forgot password dialog: UI text not what was suggested 32159: GreyTheme updates 32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search 32176: Signup page now cloud.alfresco.com 32179: THOR-475 - improvement(s) to trim time to create tenant 32184: Remove jargon from workflow names and descriptions 32185: Pesky solrcore.properties 35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL 32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users. Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running. Returning this flag through the Java API & REST API Tweaks to the Share JS so that it renders a for invitees who are not members and an for those who are. 32198: Replace workflow text with task related text 32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds 32204: Build fix 32238: THOR-290: Configurable google-analytics tracking code script insertion 32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite. 32241: THOR-471: Added GetSatisfaction feedback widget 35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32266: Addition of createSite analytics recording. 32268: THOR-505: Disable (turnoff autostart) of unused subsystems 32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again) 32272: Resolve THOR-354: (None) displayed for network administrators 32273: THOR-499: New Relic monitoring updates 32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators" 47053: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers) 32378: CollectionUtils method for collection intersection. Should be merged to HEAD. 32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage) 32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports" 32389: Fix for THOR-567 "userprofile broken" 32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant) 32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others 32414: Theme updates from linton 32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload" 32424: THOR-81: support for signup/activate scaling tests 48157: Merged DEV/CONV_V413 to DEV/CONV_HEAD Fixing merge issue from r48135 48158: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 47046: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32281: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 (ok'd with DC): 32242: ALF-11664 Moderated sites should use site.public.group (from SysAdminParams) for setting the group with general access, as Public sites already do, rather than hard coding the EVERYONE group 32283: Added "guest" to the list of blocked usernames, thereby showing failure to register guest@tenant.com, rather than allowing it and failing to activate the account later. 32285: THOR-505: Disable (turnoff autostart) of unused subsystems 32286: Fix NPE in AnalyticsProperties when empty json provided 32287: THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32289: Miscellaneous changes to account types & classes. 32290: Change "recent activities" email notification interval from hourly to daily 32292: Resolve THOR-516: Check all email template URLs point to cloud.alfresco.com not www.alfresco.me 32293: THOR-517. Insert Signup Analytics Event into Site Invite process. 32305: Fixed THOR-306 "Invite user autocomplete not working correctly" 32308: THOR-529: Red "No items" in doc lib when adding 1st document into a x-network site (WebDAV error in log) 32309: Fixed THOR-306 "Invite user autocomplete not working correctly" 32314: THOR-520: Change workflow in tooltip text to task 32318: THOR-532: Improve auto-generate of home site shortname (in case of clash) 32339: Updated analytics events to include parameter 32342: Additional debug logging as part of THOR-544. 32376: THOR-574: Accept invite while logged in displays 'you've declined...' message 48163: Merge CONV_V413 to CONV_HEAD 46713: Set Maven version in POM files to 4.1.3-CONV-SNAPSHOT 46741: Deploy SPP jar file (aka VTI) into Maven repository as well 47440 RECORD ONLY: Declare dependency on Surf 1.2.0-SNAPSHOT in Maven poms 47450 RECORD ONLY: Bring Chemistry OpenCMIS libs back into the wars 47579 RECORD ONLY: Switch Chemistry OpenCMIS version to a custom 0.8.0-20120706 47646: POM dependency: use 4.2-min version of netcdf rather than 4.2, which embeds an old commons-codec 47683: Create a jar holding the sharepoint config, for use with CLOUD2 47740 RECORD ONLY: Merge V4.1-BUG-FIX to CONV_V413 46360: ALF-17697: Create proper source jars, to deploy to Maven repository 47964: Filter servlet-api from dependencies 48166: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47064: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32446: Fixed THOR-658 "File Upload Limits" 32455: Tweak logging (S3 exists check -> debug) 32462: Move tenant enabled check from low level services to web script entry point: 32467: THOR-666: Improve startTenants - do not need to re-update enable/disable flag on startup 32474: JMeter test script updates (#3) 32485: Fix to ensure the HTML upload POSTed response can return html content type. 32486: JMeter test script updates (#4) 47084: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32491: Fix account signup since change to tenant authentication (which is now slightly stricter: 32518: Fix for mixed cased usernames login problems 32523: Add db pool validate query 32546: Minor - remove unecessary call to getObjectDetails (to avoid calling twice for non-existent object) 32556: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins 32560: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins - part 2 35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32571: Resolve THOR-653: Uploads consume disk space in /var/cache/tomcat6/ 32572: Fixed THOR-563 "UI: CSS / layout issue on profile page" 35830:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32577: THOR-682: refactor Tenant/S3 routing content store (it is now self-routing based on S3 content url) 32580: Added missing init-method attributes to key CachingContentStore components. 32583: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 32321: ALF-11700: Possible to generate feed entries with malformed NodeRefs 32593: THOR-688 Analytics to support various URLs not just "website". Addition of optional sourceUrl paramater to account-signup analytics. 32603: Added file size limitation and hooked in html upload to the form validations w backgrounds and tooltips. 32629: THOR-199: Fix create user (activate) sometimes has to retry - due to: "Deadlock ... alfresco.permissions.insert_AclMember-Inline" 32654: THOR-692: Disable (auto) home folder creation 35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32661: Latest SpringSurf libs: 35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32666: Build: add cloud/cloud-share to ant clean-modules/clean 32672: Ensure that application context is available for TenantAlfrescoAuthenticator in TenantUserFactory 32675: THOR-536: Added TenantPageTypeViewResolver 32686: JMeter test script updates (#5) 32700: THOR-689: DevTest: 2 uploads failed (out of 10000) - missing retry ? 35844:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32702: JMeter test script update 32718: THOR-691: Feed Notifier sends emails on startup of Server 32756: Fixed THOR-556 "Can't view members in a public Site" 35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (+ resolved conflicts w/ 4.0.1) 32032: THOR-370: Add tenant-switching to /cmisatom (OpenCMIS-based v4.x impl => AlfrescoCmisService) 35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32759: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 32757: Fix for ALF-9365 32761: Changed restricted tenant to appear as page not found 32763: THOR-792: Ensure that failed login returns to login page 32769: Updated networks icon 32770: Authentication updates: Unauthenticated requests to inaccessible tenants (either that don't exist or not authorized to access) will be prompted for authentication and if credentials are valid the "Page Not Found" page will be shown, but authentication will have completed and user can return to their home dashboard via link provided 32785: Fix for THOR-798 32789: THOR-796: reduce startup time (1000s of tenants) 35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32790: THOR-480: Spring Surf lib updates - ensure that i18n properties extensions degrade the specificity of the locale to ensure that no message keys are shown (unless the message genuinely doesn't exist) 32798: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (fix for THOR-721) 32245: Unit tests for ALF-10343, with the problematic parts commented out pending a fix 32251: ALF-11664 site.public.group (via SysAdminParams.SitePublicGroup) should be used when updating site visibilities, as it is for creating sites 35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32805: Latest SpringSurf libs: 47085: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32807: Fixed invalid network switching URLs 32808: Updated Spring Surf libs to that revert invalid changes to relativeUri determining method 32837: Set Alfresco connector reconnect timeout to zero 32856: Fix for THOR-801. Trying to access the archive as 'admin' gives error. 35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32858: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (pull in some pre-reqs for cleaner merge of ALF-10826) 31864: ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS 31934: Update stale File State Cache. 32068: ALF-10941 - CIFS Open file from excel 32097: build fix. 32131: ALF-10902 - No friendly notification occurs when Editor or Collaborator tries to delete content 32132: Open read-only for attributes only. 32182: ALF-10963 Cannot overwrite files on CIFS share with Notepad++ 32876: THOR-784: Fix 'Accounts API loading is very slow' (get page of accounts) 32939: THOR-480: Latest Spring Surf libs - fix i18n extensibility problems. 32948: THOR-859: Performance: Disable rules service 32953: THOR-863: Performance: loadUserByUsername -> isAdminAuthority 32959: (RECORD ONLY) Merged HEAD to DEV/THOR1 32958: (record-only) Merged Dev/THOR1 to HEAD 32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results 35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33024: Fixed THOR-670 "Incorrect window title for 'Task History' page" 33027: Missing merge info for r32694 35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33033: Latest SpringSurf libs: 35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33038: Minor: do not bootstrap web script readme x2 into Data Dictionary (when creating tenant) 33039: Resolve THOR-839: Following webscripts doesn't set Content-Type response header 33040: Fixed THOR-817 "Issues with "invite user" email autocomplete field" 33041: Fixed THOR-789 "Mix of languages" 33042: Resolved THOR-849: Upload issue ? - Failed to get content ... (No such file or directory) ... x22 48169: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47176: (RECORD ONLY) Fix Eclipse .classpath to match Spring Surf libs 48170: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 48168: CONV: Fix NPE in get people CQ 48183: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47184: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35989: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed 34183: Part one of THOR-1129. 34185: Part two of THOR-1129. The Thor-specific parts. 34199: Fix for THOR-106 a failing test case that was switched off. 34202: THOR-106 addendum. Editing build.xml to put the test class back in to the build. 34211: BM: sync ThorTest (additional coverage) 34308: Merged HEAD to THOR1_SPRINTS 34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default" 34540: Share UI - copyright should be 2012 (related to THOR-1015) 35286: Resolve THOR-1242: Update Beta Logo 48187: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47086: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml). 35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project) 33022: THOR-662: Email templates should load/resolve (initially) from classpath 35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33090: ALF-10826: hidden aspect 33091: THOR-416: fix surf-config folder (appears where it shouldn't) 33093: Sweep through email templates. 35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33104: Tweak to invitation email template 33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS. Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco. Set the limit to the empty string in core Alfresco, which means 'no limit'. Applied the limit always. Set the limit to 25Mb in Thor/alfresco-global.properties Fixed a minor bug in error reporting due to previous exception renaming. 35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript 33135: Missing WebScripts sources JAR from r33134 33153: Resolve THOR-551: Password Hashes Need Review 33154: Update to latest email blacklist 33155: Fixed THOR-534 "Login Box shows scroll bars" 33156: Build fix for tests failing due to recent password changes 33157: Build fix for updated email blacklist 33172: THOR-776: Re-implement Share override as guided by Erik 33173: THOR-831: Text in Someone 47096: Fix merge compile issue 47100: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33054: THOR-796: slow startup time (on QA env with ~ 10k tenants) 33055: Implementation of THOR-694. File size upload limit within ContentStore. 35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33213: THOR-833: wip 33214: Allow for workflows which may have a reference to a repo based email template 33228: Added extension points for links in user profile toolbar 33230: Added extension points for links in user profile toolbar part 2 33232: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" 33233: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 2 33234: Extension points in members bar now ft the pattern of user profile toolbar. 33236: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 3 33241: THOR-908 - wip 33243: THOR-908 / THOR-64 - wip 33253: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 4 33255: Fixed THOR-907 Remove Share functionality which allows access to people profiles outside of your site memberships part 5 47169: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33410: Merged form THOR1_SHARE_PERFORMANCE to THOR1_SPRINTS 33111 Branch for testing out new Spring Surf client side resource improvements 33291 Share client side resource handling to avoid stale client side cache part 1 - New spring surf libs with <@script> & <@link> directives that adds the checksum of the file to avoid client cache beoming stale - Refactored most old element always being printed. 33440: Latest SpringSurf libs - performance and thread safety improvements. 33458: ThorTest-preReg (JMeter) test update 33460: Latest SpringSurf libs: 33466: THOR-1002: Updated enterprise overlay 33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler 35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33493: THOR-979: HTML5 upload support 33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page) 33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment 33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work) 33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image 33551: THOR-1007: Fixed upload hang on FireFox when uploading folders 35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS: 33386: Branch for Invitation enhancements 33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements. 33475: THOR-1006. Documentation on the desc.xml. 33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects. Still to do: get the authentication check working and ensure no unexpected side-effects. 33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'. Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA. 33511: Fix for THOR-1017. 33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response. 33529: Fixed THOR-980 & THOR-1024 & THOR-1025 33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account" 33571: Fixed HTML5 uploader to work with profile avatar image upload 33585: Thor JMeter test script tweaks 33596: THOR-1035: Enabled HTML5 uploader for application logo upload 33598: THOR-1031: Reduced HTML5 checks for uploader to ensure that it works for Safari on Mac 33603: THOR-1039: Updated UX for HTML5 upload when 0kb files are selected 33606: THOR-1037: Updated variable titles for HTML5/DND upload dialog to support update 35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33615: Latest SpringSurf libs - performance and concurrency improvements 33690: Resolve THOR-1003: Forgotten Password email is case sensitive 33692: Merged BRANCHES/DEV/THOR1_PRIVACY to BRANCHES/DEV/THOR1_SPRINTS: 33488: Reversed merge revisions related to THOR-907 - 33232, 33233, 33236 - hand tweaks related to 33253, 33255. 33492: Removed unused import of com.sun... class 33497: Fixes and improvements to user profile page loading - reducing remote calls required and refactoring link build code. Fixed a issue with displaying the Following link on other users profile page. 33506: THOR-1020: people visibility 33509: Reduced remote calls required to build user profile page. 33519: THOR-985, THOR-986 33542: THOR-989 - Added extensibility hooks to People Finder component 33558: THOR-1014: Profile visibility -1st cut for THOR-993 (/api/people) 33564: THOR-1014: Profile visibility - THOR-992 (/webframework/content/metadata?user=) 33569: Implemented THOR-985, THOR-986, THOR-989 33572: Performance improvement to remove the need for a share->repo call for each page or ajax request to resolve account class name. 33579: THOR-1020: cloud people API (re: visibility) 33599: Share Thor performance improvements - removed the need to call /internal/cloud/current-user inside various common components - now using cached data in user object. 33608: THOR-1014: Profile visibility - fix PeopleRestApiTest 33625: THOR-1020: people visibility 33632: THOR-984 - Hide Account Settings screen from External Users. 33636: THOR-1014: profile visibility 33670: THOR-1020/THOR-1014: people/profile visibility 33674: THOR-1047: Privacy REST - subscriptions (follower) API 33688: THOR-1047: Privacy REST - subscriptions (follower) API 33696: Fix for THOR-785 "F272: API call to get the number of accounts" 33698: THOR-1033: Fixed free accounts showing console settings (updated Spring Surf libs) 33700: Committed other Surf updates missing from r33698 (WebScript JARs) to ensure that manifest meta-data isn't misleading 33705: THOR-1052: VersionService: ensureVersioningEnabled 33706: Merged BRANCHES/DEV/THOR1_UPLOADLIMITS to BRANCHES/DEV/THOR1_SPRINTS: 33510: (RECORD ONLY) File Upload Limit enhancements 33656: Account Quotas / File Upload limit pt1 33686: Modified dnd-upload and html-upload WebScripts to retrieve maximum upload size from internal service (and refactored core WebScripts to support override) 33710: THOR-1020: Privacy (People REST API) 33713: THOR-1020: Privacy (People REST API) 33718: THOR-1020: Privacy (People REST API) 33722: Thor JMeter test script 33742: Latest SpringSurf libs - performance improvements and concurrency fixes 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33764: THOR-1021: F287: Account Types can define file size upload limits for the Account which are set when the account is upgraded/downgraded between Account types 33767: Tweaked HTML5 upload dialog so that error messages are handled gracefully 33785: Resolve THOR-457: Already have an account email template needs updating/fixing 33786: Fix to issue spotted by DaveC where switching networks would not correctly refresh user metadata. Also fixed minor encoding issues in related Networks WebScripts. 33792: Merged BRANCHES/DEV/THOR1_PUBLIC_EMAIL to BRANCHES/DEV/THOR1_SPRINTS: 33490: Initial feature branch 33535: Fix to unreported issue whereby DirectoryService.getDefaultAccount returns the home account. 33547: THOR-176. Invite new user (public domain email address) into site. Part 1. 33592: Further work for THOR-176. user metadata REST API now does not return homeTenant if the user is from a public email domain. This conditional removal of the 'homeTenant' JSON property is needed by Share. 33593: THOR-176. Refactor of UserTenant to use AccountClass to check isPublicEmailDomain. 33620: Fix for NPE in UserTenant.isPublicDomainUser(). The admin user has no account-type. 33627: Share updates for public e-mail 33797: THOR-176: consolidate public domain check 33802: Remove temporary option to use double @ login (as per THOR-156) - no longer required 33804: Removed locale from the cachekey used for tenant page view cache. 33810: Merged BRANCHES/DEV/THOR1_BLACKLIST to BRANCHES/DEV/THOR1_SPRINTS: 33709: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 1 - DAO layer) 33711: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 2 - Foundation Service layer) 33747: THOR-974, THOR-975, THOR-976, THOR-977 and THOR-978. REST API for CRUD of blacklisted email domains. 33809: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 Adding REST-client rcq files for blacklist CRUD. 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33814: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS: 33411: (RECORD ONLY) Thor account settings branch from Thor1_Sprints. 33607: Initial checkin for THOR-972, THOR-971, THOR-410 33621: THOR-972, THOR-971, THOR-410 - added missing files 33639: THOR-971, THOR-972, THOR-410: - add paging properties to the list people web script - default network admin to true and internal to null 33641: Second cut of THOR-964 "F173: Network admin can list users of network (with paging support)" 33642: THOR-972, THOR-971, THOR-410 - changed paging properties in list users 33652: Implemented THOR-964,THOR-965,THOR-965,THOR-966,THOR-967,THOR-968,THOR-969 33653: User action click event now stopped so it doesn't modify the url 33671: THOR-971: webscript implementation 33687: Making premote/demote available for network-admins and not only for admins. check for network admin role already exists in the service code. 33694: THOR-971: - Added analytics handling - Fixed invite share url to include tenant 33699: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33702: THOR-971: - changed the bulk create url - changed the activate email template 33703: Make sure Java-based network admin scripts set the response status to 401 if the authenticated user is not a network admin 33737: THOR-410: - more unit tests - tidy up 33744: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_USER_MANAGEMENT to BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS: 33417: Thor JMeter test script tweaks 33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node) 33434: The <#if> statement & element always being printed. 33440: Latest SpringSurf libs - performance and thread safety improvements. 33458: ThorTest-preReg (JMeter) test update 33460: Latest SpringSurf libs: 33466: THOR-1002: Updated enterprise overlay 33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler 33493: THOR-979: HTML5 upload support 33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page) 33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment 33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work) 33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image 33551: THOR-1007: Fixed upload hang on FireFox when uploading folders 33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS: 33386: Branch for Invitation enhancements 33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements. 33475: THOR-1006. Documentation on the desc.xml. 33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects. Still to do: get the authentication check working and ensure no unexpected side-effects. 33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'. Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA. 33511: Fix for THOR-1017. 33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response. 33529: Fixed THOR-980 & THOR-1024 & THOR-1025 33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account" 33559: Initial feature branch 33669: First cut of THOR-994 and THOR-995 - remove internal and external user from network. 33685: Making remove-external-user.delete.desc.xml accept a domainName templateArg as well as the existing accountId. 33716: THOR-994 and THOR-995. Remove user from network. Addressing some review comments from DaveC. Refactoring mostly. Also added protection on RegistrationService.deleteUser() to prevent deletion of last NetworkAdmin in network. 33745: Adding NetworkdAdmin protection to the remove-external-user.delete webscript. 33752: Additional fixes for THOR-966 & THOR-969 * Improved messages/dialogs: demoting yourself, demoting last admin, removing last admin * New User Button align layout fix as requested by Imran 33754: Documentation for the remove-external-user.delete webscript. 33756: THOR-410: - unit test tidy 33766: Fix for signup link when already logged in as another user 33769: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant. 33774: Added padding on top of name for the Manage Users screen as requested by ux 33790: Promote/demote icons from Imran 33815: Fix issue with removal of public email user from last invited network 33817: THOR-1060: Activities Feed - perf tweak to halve the number of generated feed entries 33819: THOR-1060: fix ActivitiesFeed subsystem (re-)name 33820: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS: 33756: THOR-410: - unit test tidy 33766: Fix for signup link when already logged in as another user 33769: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant. 33774: Added padding on top of name for the Manage Users screen as requested by ux 33790: Promote/demote icons from Imran 33825: People REST API 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33850: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 33843: Fix for ALF-12775 33866: Fix for THOR-1071 33878: Fix the build 33881: THOR-1069: Ensure that invitations can be accepted when a user is already logged in 33882: Resolve THOR-1082: Possible to register email address with invalid domain (according to our tenant id rules) 33883: Resolve THOR-1070: External user's avatar not displayed on the People Finder page. 33884: Fix solrcore.properties 33899: Resolve THOR-1077: Incorrect free space displayed when uploading files which exceeds quota 33922: Resolve THOR-1079: Incorrect behavior of the button "Save and close" to "Send Document (s) For Review" tasks. 33933: Resolve THOR-1088: Hide Account Id from Account Summary Screen 33934: Resolve THOR-1089: Review Account Quota text on Account Summary Screen 33942: Fix for THOR-1094. InvalidDomains FTL couldn't handle NULL notes field. This shouldn't arise in the field as we don't put NULL-valued notes in the DB, but it might matter in some test envs. 33949: Resolve THOR-1093: Incorrect notification title displayed when trying to invite user from another network from Manage Users page 33953: Fix for THOR issue where public users should not be able to see Following and Following Me tabs in their own profile. 35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34140: THOR-1098: Prevent resources being requested twice (latest Surf libs) 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed 35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34224: Fix for THOR-789 - Mix of languages. The original bug was not never actually completely fixed, added some additional handling in SpringSurf WebScripts View to not override the locale from the original request parameters if it has already been set elsewhere. 34301: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) 34343: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix 34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix 34388: THOR-953/SYS-294: add db.pool.evict.num.tests option (=> numTestsPerEvictionRun) 34729: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31400: ALF-10764: PDF vs 1.5 cause crash jvm - PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version 32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release. Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0 34731: THOR-1261: repo cluster fix (propertyUniqueContextCache) 34734: THOR-1261: repo cluster fix (propertyUniqueContextCache) 34435: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode) 35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34558: THOR-1216: tenant context mismatch (Solr tracking) 34606: THOR-1216: tenant context mismatch 34441: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component) 34489: Fix to remove hazelcast subdir from build.xml for -exploded build - Thor specific merge issue. 34722: Added hazelcast-cloud jar to allow AWS Hazelcast config options for Share clustering on Thor 34848: THOR - specific version of ClusterAwarePathStoreObjectPersister. 34931: Thor specific lookup of Share custom app context files to include the custom-slingshot-cloud-context and custom-slingshot-application-context only and in the order we want. Also updated Hazelcast example config to include AWS by default 35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34940: THOR-1288: Extra diagnostics for tracking leaked tenant context on thread: 34187: Updated Surf libs (down grades duplicate dependency warnings to debug info) 34410: THOR-1169: Latest Spring Surf libs to fix missing template CSS probs 34418: (RECORD ONLY) Merged BRANCHES/DEV/BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/BRANCHES/DEV/THOR1_SPRINTS 34316: Method signature change to ConfigService fixes for RepoXMLConfigService 34471: (RECORD ONLY) Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS 34468: Fix for ALF-13172 Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0 34467: Fix for ALF-13237 - Change dashboard Layout is not working correctly, original layout is still used after saving changes. 34891: Added missing jug-asl-2.0.0.jar to slingshot deps for Thor 35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35087: Minor: remove NOOP (introduced in r30776) 35123: THOR-1288: update leak logger 35124: THOR-1288: prod login failure when using cloud console for (bulk) signups 35132: THOR-1288: build/test fix 35133: THOR-1288: build/test fix 35395: Resolve THOR-1340: Alberto.Vazquez@w.illi.am cannot sign up 35964: Spring Surf library refresh 35995: Fix merge issue 35999: Fix merge issue 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 48191: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47185: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: MT - enable ability to get call context if overriding of beginCall/afterCall - eg. for cloud use-case (x-network switching) 48192: Temporarily disable generation of installers, to speed up build git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/cmis/test.post.desc.xml | 27 +++++++++++++------ .../repository/forms/pickerchildren.get.js | 14 +++++----- .../alfresco/slingshot/search/search.lib.js | 26 +++++++++++++----- pom.xml | 2 +- .../repo/web/scripts/RepositoryContainer.java | 2 +- .../web/scripts/TenantWebScriptServlet.java | 3 +++ .../web/scripts/bean/AbstractLoginBean.java | 3 +++ .../alfresco/repo/web/scripts/bean/Login.java | 5 ---- .../repo/web/scripts/bean/LoginPost.java | 7 ++--- .../workflow/ActivitiWorkflowRestApiTest.java | 4 +-- 10 files changed, 57 insertions(+), 36 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/test.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/cmis/test.post.desc.xml index f5dfa913bd..e1206194e9 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/test.post.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/test.post.desc.xml @@ -2,34 +2,45 @@ CMIS AtomPub TCK - /cmis/test?url={serviceUrl}&user={user?}&validate={validate?}&trace={trace?}&tests={tests?} + /cmis/test?chemistry.tck.serviceUrl={serviceUrl}&chemistry.tck.user={user?}&chemistry.tck.password={password?}&chemistry.tck.validate={validate?}&chemistry.tck.traceRequests={trace?}&chemistry.tck.tests={tests?} - url + chemistry.tck.serviceUrl url of the AtomPub service document of the repository to test - user - username/password for authentication (HTTP BASIC Authentication) + chemistry.tck.user + username for authentication - validate + chemistry.tck.password + password for authentication + + + chemistry.tck.validate if true, validate repository responses against CMIS XSDs false - trace + chemistry.tck.traceRequests if true, trace request and response bodies false - tests + chemistry.tck.tests names of tests to excecute (use * in test name for wildcard) * diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js index f47182bad1..bae0e1a673 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js @@ -257,22 +257,20 @@ function sortByName(a, b) return (b.properties.name.toLowerCase() > a.properties.name.toLowerCase() ? -1 : 1); } -function findUsers(searchTerm, maxResults, results) +function findUsers(filterTerm, maxResults, results) { var paging = utils.createPaging(maxResults, -1); - var searchResults = groups.searchUsers(searchTerm, paging, "lastName"); + + var personRefs = people.getPeople(filterTerm, paging, "lastName", true); // create person object for each result - for each(var user in searchResults) + for each(var personRef in personRefs) { - if (logger.isLoggingEnabled()) - logger.log("found user = " + user.userName); - // add to results results.push( { - item: createPersonResult(user.person), - selectable: true + item: createPersonResult(search.findNode(personRef)), + selectable: true }); } } diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js index 1bc3c7c930..dea3f2ceec 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js @@ -581,15 +581,29 @@ function processResults(nodes, maxResults, rootNode) * For each node we extract the site/container qname path and then * let the per-container helper function decide what to do. */ - parts = splitQNamePath(nodes[i], rootNodeDisplayPath, rootNodeQNamePath); - item = getItem(parts[0], parts[1], parts[2], nodes[i]); - if (item !== null) + try { - results.push(item); - added++; + parts = splitQNamePath(nodes[i], rootNodeDisplayPath, rootNodeQNamePath); + item = getItem(parts[0], parts[1], parts[2], nodes[i]); + if (item !== null) + { + results.push(item); + added++; + } + else + { + failed++; + } } - else + catch (e) { + // THOR-833 + if (logger.isWarnLoggingEnabled() == true) + { + logger.warn("search.lib.js: Skipping node due to exception when processing query result: " + e); + logger.warn("..." + nodes[i].nodeRef); + } + failed++; } } diff --git a/pom.xml b/pom.xml index f717963b1c..f28caf19fd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ alfresco-parent org.alfresco - 4.2.d-SNAPSHOT + HEAD-CONV-SNAPSHOT ../../pom-experimental.xml diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java index 6479067bba..1e713e8112 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java @@ -235,7 +235,7 @@ public class RepositoryContainer extends AbstractRuntimeContainer if (required == RequiredAuthentication.none) { // TODO revisit - cleared here, in-lieu of WebClient clear - AuthenticationUtil.clearCurrentSecurityContext(); + //AuthenticationUtil.clearCurrentSecurityContext(); transactionedExecuteAs(script, scriptReq, scriptRes); } diff --git a/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java b/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java index 5dce253113..9c48a1b150 100644 --- a/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java +++ b/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java @@ -24,6 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.surf.util.I18NUtil; @@ -69,6 +70,8 @@ public class TenantWebScriptServlet extends WebScriptServlet { // clear threadlocal I18NUtil.setLocale(null); + // clear authentication and tenant context + AuthenticationUtil.clearCurrentSecurityContext(); } } } diff --git a/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java b/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java index 668165f7b5..b797cdf6e9 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java @@ -67,7 +67,9 @@ import org.springframework.extensions.webscripts.WebScriptRequest; // add ticket to model for javascript and template access Map model = new HashMap(7, 1.0f); + model.put("username", username); model.put("ticket", authenticationService.getCurrentTicket()); + return model; } catch(AuthenticationException e) @@ -79,4 +81,5 @@ import org.springframework.extensions.webscripts.WebScriptRequest; AuthenticationUtil.clearCurrentSecurityContext(); } } + } \ No newline at end of file diff --git a/source/java/org/alfresco/repo/web/scripts/bean/Login.java b/source/java/org/alfresco/repo/web/scripts/bean/Login.java index 8f985961ae..9cbb0fc7d6 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/Login.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/Login.java @@ -18,19 +18,14 @@ */ package org.alfresco.repo.web.scripts.bean; -import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.alfresco.repo.security.authentication.AuthenticationException; -import org.alfresco.service.cmr.security.AuthenticationService; -import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptRequest; - /** * Login and establish a ticket * diff --git a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java index c20b98f123..0599616103 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java @@ -19,19 +19,16 @@ package org.alfresco.repo.web.scripts.bean; import java.io.IOException; -import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.alfresco.repo.security.authentication.AuthenticationException; +import org.json.JSONException; +import org.json.JSONObject; import org.springframework.extensions.surf.util.Content; import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptRequest; -import org.json.JSONException; -import org.json.JSONObject; - /** * Post based login script diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java index 060ffb63b9..31d0b681a6 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java @@ -33,8 +33,8 @@ import org.alfresco.service.namespace.QName; public class ActivitiWorkflowRestApiTest extends AbstractWorkflowRestApiTest { private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "activiti$activitiAdhoc"; - private static final String ADHOC_WORKFLOW_DEFINITION_TITLE = "Adhoc Workflow"; - private static final String ADHOC_WORKFLOW_DEFINITION_DESCRIPTION = "Assign arbitrary task to colleague using Activiti workflow engine"; + private static final String ADHOC_WORKFLOW_DEFINITION_TITLE = "New Task"; + private static final String ADHOC_WORKFLOW_DEFINITION_DESCRIPTION = "Assign a new task to yourself or a colleague"; private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "activiti$activitiReview"; private static final String REVIEW_POOLED_WORKFLOW_DEFINITION_NAME = "activiti$activitiReviewPooled";