Merge branch 'master' of git://github.com/pdonelan/webgui into filepump

This commit is contained in:
Colin Kuskie 2009-05-16 14:44:27 -07:00
commit 8e3891a7bd
44 changed files with 5516 additions and 80 deletions

View file

@ -526,6 +526,13 @@
"isContainer" : 1,
"category" : "community"
},
"WebGUI::Asset::Wobject::StoryArchive" : {
"isContainer" : 1,
"category" : "community"
},
"WebGUI::Asset::Wobject::StoryTopic" : {
"category" : "community"
},
"WebGUI::Asset::Wobject::StockData" : {
"category" : "intranet"
},
@ -812,6 +819,7 @@
"workflowActivities" : {
"None" : [
"WebGUI::Workflow::Activity::ArchiveOldStories",
"WebGUI::Workflow::Activity::ArchiveOldThreads",
"WebGUI::Workflow::Activity::CalendarUpdateFeeds",
"WebGUI::Workflow::Activity::CleanDatabaseCache",