inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
8364f184fc6645503f0b23e97ac3bf782180e2ee
alfresco-community-repo/source/java/org/alfresco/repo
History
Ray Gauss 8364f184fc Merged BRANCHES/DEV/HEAD-QA to HEAD: 
49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
        49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX:
             49111: - Revert of r47645
                    - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD
                    - Relates to ALF-5051 and MNT-8599 / ALF-18726
        49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984
   49979: ALF-18726: Alfresco could not start with WCMQS applied
        - Updated RenditionServiceIntegrationTest with new imgpreview values


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-05-13 13:44:30 +00:00
..
action
Merged DEV to HEAD
2013-04-05 10:57:33 +00:00
activities
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
admin
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-19 14:16:01 +00:00
attributes
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
audit
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
avm
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
batch
Merged V3.4-BUG-FIX to HEAD
2011-04-11 15:57:26 +00:00
blog
Merged V4.1-BUG-FIX to HEAD
2012-10-25 16:38:22 +00:00
bulkimport
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
cache
Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121
2013-03-12 11:11:08 +00:00
calendar
Merged V4.1-BUG-FIX to HEAD
2013-03-01 12:32:11 +00:00
clt
…
cluster
Fix some merge errors: removing clustering references not valid in community.
2013-03-25 17:54:01 +00:00
coci
Merged V4.1-BUG-FIX to HEAD
2012-12-21 10:34:39 +00:00
config
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
configuration
…
content
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
copy
Merged V4.1-BUG-FIX to HEAD
2013-03-05 12:14:18 +00:00
deploy
BDE-73 BDE-78 Add more tests to compute coverage + fetch application context from classpath rather than file system
2012-07-18 08:46:03 +00:00
descriptor
Merged V4.1-BUG-FIX to HEAD
2012-08-28 13:37:05 +00:00
dictionary
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
discussion
Merged V4.1-BUG-FIX to HEAD
2013-03-01 12:32:11 +00:00
domain
Fix NodeDAO.getStore to do what the JavaDoc says it does
2013-03-27 16:40:21 +00:00
download
Merged V4.1-BUG-FIX to HEAD
2012-12-13 14:16:40 +00:00
exporter
Merged V4.1-BUG-FIX to HEAD
2012-12-13 14:16:40 +00:00
forms
Merged V4.1-BUG-FIX to HEAD
2013-02-27 12:34:34 +00:00
forum
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
googledocs
Merged V4.1-BUG-FIX to HEAD
2012-10-21 18:11:58 +00:00
i18n
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:23:29 +00:00
imap
Merged V4.1-BUG-FIX to HEAD
2013-02-27 11:56:13 +00:00
importer
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
invitation
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
jscript
Disambiguate new People.getPeople overload by giving it a new name
2013-03-28 07:18:33 +00:00
links
Another build fix. This one fixes LinksServiceImplTest.linksListingPermissionsChecking()
2013-03-08 10:08:18 +00:00
lock
Merged V4.1-BUG-FIX to HEAD
2013-02-27 11:56:13 +00:00
mail
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
management
Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE2 - Admin Console 46775:47636
2013-03-07 11:36:01 +00:00
model
ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files
2013-04-10 13:41:48 +00:00
module
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
node
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
nodelocator
Merged DEV/SWIFT to HEAD
2011-06-09 12:08:12 +00:00
notification
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
oauth1
JDK7: Fix order in which test methods are executed, to make test pass
2012-09-26 15:15:40 +00:00
oauth2
Collapsed test methods to avoid ordering issues
2012-09-26 09:29:05 +00:00
ownable/impl
Merged V3.4-BUG-FIX to HEAD
2011-09-26 18:24:09 +00:00
policy
Merged V4.1-BUG-FIX to HEAD
2012-10-21 18:11:58 +00:00
preference
Fix public api tests
2013-04-09 15:38:37 +00:00
processor
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
publishing
Merged V4.1-BUG-FIX to HEAD
2012-12-21 10:34:39 +00:00
query
Merged V4.1-BUG-FIX to HEAD
2012-08-10 11:20:15 +00:00
quickshare
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
rating
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-19 14:16:01 +00:00
remote
Merged V4.1-BUG-FIX to HEAD
2012-08-22 09:27:02 +00:00
remoteconnector
Merged V4.1-BUG-FIX to HEAD
2012-12-15 10:12:46 +00:00
remotecredentials
Fix tests to clean up container after method execution
2012-09-26 09:57:33 +00:00
remoteticket
Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:
2012-10-01 12:17:53 +00:00
rendition
Merged BRANCHES/DEV/HEAD-QA to HEAD:
2013-05-13 13:44:30 +00:00
replication
Fix for ALF-11931
2011-12-20 11:57:22 +00:00
rule
Merged V4.1-BUG-FIX to HEAD
2013-02-27 11:56:13 +00:00
scheduler
…
search
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-19 14:16:01 +00:00
security
Merged DEV to HEAD
2013-04-05 10:30:37 +00:00
service
ALF-10967 Webdav content link is not usable in IMAP
2011-10-31 17:37:06 +00:00
shutdown
…
site
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
solr
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
subscriptions
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
tagging
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-19 14:16:01 +00:00
template
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +00:00
tenant
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
thumbnail
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
transaction
Merged V4.1-BUG-FIX to HEAD
2013-02-27 11:56:13 +00:00
transfer
Merged V4.1-BUG-FIX to HEAD
2013-03-03 12:36:29 +00:00
urlshortening
Publishing:
2011-07-15 15:47:26 +00:00
usage
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:23:29 +00:00
version
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +00:00
webdav
Fix some merge errors: removing clustering references not valid in community.
2013-03-25 17:54:01 +00:00
wiki
Yet another build fix. This one fixes WikiServiceImplTest.pagesListingPermissionsChecking()
2013-03-08 10:13:39 +00:00
workflow
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00