Derek Hulley
|
4ea83f7f2b
|
Merged V2.0 to HEAD
5448: (From V1.4)
5281 (V1.4): Patches not executed in read-only mode
5284 (V1.4): Integrity messages
5308 (V1.4): Category selector performance
5331 (V1.4): Category performance
5402 (V1.4): AR-1315
5410 (V1.4):
5417 (V1.4): Upgrade script performance
5435 (V1.4): Lucene test text encoding
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2007-04-11 23:24:00 +00:00 |
|
Derek Hulley
|
529c4840e9
|
Merged V2.0 to HEAD
5297: PostgreSQL upgrade support
5347: (From 1.4) EHCache configuration fixes and sample
5380, 5381: AWC-1143
5398: AWC-966
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2007-04-11 19:05:40 +00:00 |
|
Derek Hulley
|
f17fd30824
|
Merge V2.0 to HEAD
5234: LicenseService shutdown
5256: AR-1273 workaround
5289: AWC-1142
5294: WCM-360
5296: Potential NPE in patches dao
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2007-03-07 15:14:46 +00:00 |
|
Derek Hulley
|
e7c83d8731
|
Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5093 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5094 .
- Fix AR-1024: AVM workflow submit NPE
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5188 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5189 .
- PostgreSQL sample
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5191 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5193 .
- PostgreSQL lurking JDBC driver
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2007-02-20 11:23:11 +00:00 |
|
Derek Hulley
|
b4e48157f5
|
Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5154 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5155 .
- Installer script cleanup
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5156 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5157 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5162 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5163 .
svn rm --force root\projects\repository\config\alfresco\dbscripts\create\1.4\org.hibernate.dialect.Dialect\post-create-indexes.sql
svn rm --force root\projects\repository\config\alfresco\dbscripts\create\1.4\org.hibernate.dialect.MySQLInnoDBDialect\post-create-indexes.sql
- Fix AR-1225: Upgrade and install indexes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2007-02-16 16:10:44 +00:00 |
|
Britt Park
|
b2f9df29d1
|
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-11-08 05:17:40 +00:00 |
|
Britt Park
|
820da6ecab
|
Merge from HEAD to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-09-02 18:19:00 +00:00 |
|