Alexandre Cloutier f4d189ffc8 Erase the merging conflicts writings

2014-03-06 15:20:41 -05:00

..

AdministrationUI

Update translations

2013-11-06 21:36:09 -05:00

Common

Update translations

2014-02-24 16:49:16 -05:00

Contacts

Contact: fix display of urls

2014-02-17 11:12:09 -05:00

MailerUI

Webmail: fix encoding of subfolder name

2014-03-06 09:50:53 -05:00

MailPartViewers

Replace '/' by '-' in filenames of attachments

2014-02-07 14:00:36 -05:00

MainUI

Respect max bookings of resources in freebusy data

2014-02-03 11:56:00 -05:00

PreferencesUI

Erase the merging conflicts writings

2014-03-06 15:20:41 -05:00

Scheduler

Detect URLs in popup of events

2014-02-10 13:45:51 -05:00

SOGoElements

Load XMLHttpRequest conditionally (< IE9)

2013-12-18 22:18:08 -05:00

SOGoUI

Use the output of "gnustep-config --base-libs" to determine which libs our libraries must be linked against

2012-11-07 09:50:32 -05:00

Templates

Fix list sorting of events by calendar name

2014-03-04 22:03:28 -05:00

WebServerResources

Erase the merging conflicts writings

2014-03-06 15:20:41 -05:00

common.make

Use the output of "gnustep-config --base-libs" to determine which libs our libraries must be linked against

2012-11-07 09:50:32 -05:00

GNUmakefile

Fixed compilation ordering to avoid bug in gnustep-make

2013-07-23 08:31:38 -04:00