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
bcfc1999e2fc7ccab54e79ce36c6de9d6d3446f0
alfresco-community-repo/source/java/org/alfresco/repo
History
Matt Ward 2f551e5e7d Fix some merge errors: removing clustering references not valid in community. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-25 17:54:01 +00:00
..
action
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +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
…
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
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-19 14:16:01 +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
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-18 09:52:08 +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
Merged CONV_HEAD to HEAD
2013-03-25 09:37:19 +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
…
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
…
policy
Merged V4.1-BUG-FIX to HEAD
2012-10-21 18:11:58 +00:00
preference
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
2013-03-20 11:11:55 +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 CONV_HEAD to HEAD
2013-03-25 09:37:19 +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 CONV_HEAD to HEAD
2013-03-25 09:37:19 +00:00
service
…
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
…
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