merge of '45aca387e14de293ad62e303a3c8c06620805e6c'
and '9cbe6e6f1780024d4dcb37d4ce3de593f9c91828' Monotone-Parent: 45aca387e14de293ad62e303a3c8c06620805e6c Monotone-Parent: 9cbe6e6f1780024d4dcb37d4ce3de593f9c91828 Monotone-Revision: 81b84aa1dccb31c15c94976cc8ed486e6a1efd9a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-08-17T21:33:55 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
commit
e99cb37de3
46
Apache/SOGo-debian.conf
Normal file
46
Apache/SOGo-debian.conf
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
Alias /sogo.woa/WebServerResources/ \
|
||||
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||
Alias /SOGo.woa/WebServerResources/ \
|
||||
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||
Alias /SOGO.woa/WebServerResources/ \
|
||||
/usr/lib/GNUstep/SOGo/WebServerResources/
|
||||
|
||||
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg">
|
||||
SetHandler default-handler
|
||||
</LocationMatch>
|
||||
|
||||
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
|
||||
SetHandler default-handler
|
||||
</LocationMatch>
|
||||
|
||||
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
|
||||
SetHandler default-handler
|
||||
</LocationMatch>
|
||||
|
||||
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
|
||||
SetHandler default-handler
|
||||
</LocationMatch>
|
||||
|
||||
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
|
||||
SetHandler default-handler
|
||||
</LocationMatch>
|
||||
|
||||
AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
|
||||
/usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2
|
||||
|
||||
<Proxy balancer://sogocluster>
|
||||
BalancerMember http://127.0.0.1:20000 retry=1 max=1 timeout=120
|
||||
# If you enable those, don't forget the enable the spawning of multiple SOGo
|
||||
# processes. With Redhat-based distributions, this is done by setting the
|
||||
# "PREFORK" variable in /etc/sysconfig/sogo to the amount of processes as
|
||||
# value.
|
||||
# BalancerMember http://127.0.0.1:20001 retry=1 max=1 timeout=120
|
||||
# BalancerMember http://127.0.0.1:20002 retry=1 max=1 timeout=120
|
||||
ProxySet lbmethod=byrequests maxattempts=1
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Proxy>
|
||||
|
||||
SetEnv proxy-nokeepalive 1
|
||||
ProxyRequests Off
|
||||
ProxyPass /SOGo balancer://sogocluster/SOGo
|
||||
|
|
@ -1,3 +1,8 @@
|
|||
2009-08-17 Cyril Robert <crobert@inverse.ca>
|
||||
|
||||
* UI/Scheduler/UIxCalListingActions.m: Added support for new user default:
|
||||
ShowCompletedTasks.
|
||||
|
||||
2009-08-17 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/LDAPSource.m
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -27,6 +27,7 @@
|
|||
#import <Foundation/NSString.h>
|
||||
#import <Foundation/NSTimeZone.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
|
||||
#import <NGObjWeb/WOContext.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
|
|
@ -967,9 +968,10 @@ _computeBlocksPosition (NSArray *blocks)
|
|||
|
||||
- (WOResponse *) tasksListAction
|
||||
{
|
||||
NSUserDefaults *ud;
|
||||
NSEnumerator *tasks;
|
||||
NSMutableArray *filteredTasks, *filteredTask;
|
||||
BOOL showCompleted;
|
||||
BOOL showCompleted, setUserDefault;
|
||||
NSArray *task;
|
||||
int statusCode;
|
||||
unsigned int endDateStamp;
|
||||
|
|
@ -982,6 +984,15 @@ _computeBlocksPosition (NSArray *blocks)
|
|||
tasks = [[self _fetchFields: tasksFields
|
||||
forComponentOfType: @"vtodo"] objectEnumerator];
|
||||
showCompleted = [[request formValueForKey: @"show-completed"] intValue];
|
||||
setUserDefault = [[request formValueForKey: @"setud"] intValue];
|
||||
if (setUserDefault)
|
||||
{
|
||||
ud = [[context activeUser] userDefaults];
|
||||
[ud setObject: [NSNumber numberWithInt: showCompleted]
|
||||
forKey: @"ShowCompletedTasks"];
|
||||
[ud synchronize];
|
||||
}
|
||||
|
||||
|
||||
while (task = [tasks nextObject])
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1037,9 +1037,17 @@ function onDocumentKeydown(event) {
|
|||
}
|
||||
}
|
||||
|
||||
function fixSearchFieldPosition () {
|
||||
var panel = $("filterPanel");
|
||||
panel.style.position = "relative";
|
||||
panel.style.top = "3px";
|
||||
}
|
||||
|
||||
function initContacts(event) {
|
||||
if ($(document.body).hasClassName("popup"))
|
||||
if ($(document.body).hasClassName("popup")) {
|
||||
configureSelectionButtons();
|
||||
fixSearchFieldPosition ();
|
||||
}
|
||||
else if (Prototype.Browser.Gecko)
|
||||
Event.observe(document, "keypress", onDocumentKeydown); // for FF2
|
||||
else
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ var listFilter = 'view_today';
|
|||
var listOfSelection = null;
|
||||
var selectedCalendarCell;
|
||||
|
||||
var showCompletedTasks = 0;
|
||||
var showCompletedTasks;;
|
||||
|
||||
var currentDay = '';
|
||||
|
||||
|
|
@ -1354,9 +1354,12 @@ function refreshEvents() {
|
|||
+ "&filterpopup=" + listFilter);
|
||||
}
|
||||
|
||||
function refreshTasks() {
|
||||
function refreshTasks(setUserDefault) {
|
||||
var url = "taskslist?show-completed=" + showCompletedTasks;
|
||||
if (setUserDefault == 1)
|
||||
url += "&setud=1";
|
||||
refreshAlarms();
|
||||
return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks);
|
||||
return _loadTasksHref(url);
|
||||
}
|
||||
|
||||
function refreshEventsAndDisplay() {
|
||||
|
|
@ -1560,7 +1563,7 @@ function changeMonthCalendarDisplayOfSelectedDay(node) {
|
|||
function onShowCompletedTasks(event) {
|
||||
showCompletedTasks = (this.checked ? 1 : 0);
|
||||
|
||||
return refreshTasks();
|
||||
return refreshTasks(1);
|
||||
}
|
||||
|
||||
function updateTaskStatus(event) {
|
||||
|
|
@ -2039,6 +2042,8 @@ function configureLists() {
|
|||
|
||||
var input = $("showHideCompletedTasks");
|
||||
input.observe("click", onShowCompletedTasks);
|
||||
if (showCompletedTasks)
|
||||
input.checked = true;
|
||||
|
||||
list = $("eventsList");
|
||||
list.multiselect = true;
|
||||
|
|
@ -2123,6 +2128,7 @@ function drawNowLine () {
|
|||
function initCalendars() {
|
||||
sorting["attribute"] = "start";
|
||||
sorting["ascending"] = true;
|
||||
showCompletedTasks = UserDefaults['ShowCompletedTasks'];
|
||||
|
||||
if (!$(document.body).hasClassName("popup")) {
|
||||
var node = $("filterpopup");
|
||||
|
|
|
|||
2
debian/control
vendored
2
debian/control
vendored
|
|
@ -8,7 +8,7 @@ Standards-Version: 3.8.2
|
|||
Package: sogo
|
||||
Section: web
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, apache2
|
||||
Suggests: nginx
|
||||
Description: a modern and scalable groupware
|
||||
SOGo is a groupware server built around OpenGroupware.org (OGo) and
|
||||
|
|
|
|||
1
debian/rules
vendored
1
debian/rules
vendored
|
|
@ -49,6 +49,7 @@ install-arch: build-arch
|
|||
cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper
|
||||
mkdir -p debian/tmp/usr/share/lintian/overrides
|
||||
cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
|
||||
cp Apache/SOGo-debian.conf /etc/apache2/conf.d/SOGo.conf
|
||||
|
||||
binary-indep: build-indep install-indep
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue