Commit Graph

2478 Commits

Author SHA1 Message Date
Jean Raby a4bd966cc0 Revisit option handling
Really fix #2166
The previous fix (46b53b3) was wrong since SOPE was able to override
the 'final' config with its defaults.

This now uses a new approach using a volatile domain and a reordering
of the search list :
  *   NSArgumentDomain (command line arguments)
  *   sogodRuntimeDomain (config from all config files)
  *   GSPrimaryDomain
  *   NSGlobalDomain
  *   GSConfigDomain
  *   (languages)
  *   NSRegistrationDomain (SOPE loads its defaults in this one)
2013-02-01 16:26:01 -05:00
jraby 547dfa0d90 Merge pull request #9 from inverse-inc/fix/2066_options-precedence
Fix/2066 options precedence
2013-01-31 18:42:09 -08:00
Francis Lachapelle 0408415c61 Remove control characters before returning JSON 2013-01-30 15:47:20 -05:00
Ludovic Marcotte c066136a06 Reverted code that was causing issues with groups (#2090) 2013-01-28 08:34:40 -05:00
Ludovic Marcotte 8f33197c59 Fix for bug #1991. 2013-01-25 10:21:28 -05:00
Jean Raby 46b53b31fd Fix order of precedence for options
Fixes #2066 and #2166
Enforce the following order of precedence for options, first match wins:
  1. Command line arguments
  2. .GNUstepDefaults
  3. /etc/sogo/{debconf,sogo}.conf
  4. SOGoDefaults.plist
2013-01-24 22:43:38 -05:00
Jean Raby 6093c4dd2e Axe handling of sogo 0.9 gnustep domain migration 2013-01-24 20:37:30 -05:00
Jean Raby 61ded01171 whitespace - tabkill 2013-01-24 20:35:03 -05:00
Jean Raby 9e38c5060a Plug ldap fd leak in login checks 2013-01-22 18:42:00 -05:00
Francis Lachapelle 5bbb5df2a8 Fix exceptions of recurring all-day events 2013-01-21 14:11:38 -05:00
Francis Lachapelle 58dc0343bb Merge remote-tracking branch 'origin/master' 2013-01-18 09:38:27 -05:00
Ludovic Marcotte 814e2c0556 Fix for bug #2129 2013-01-18 09:18:10 -05:00
Francis Lachapelle e279db6431 Update Finnish translation 2013-01-17 10:12:26 -05:00
Francis Lachapelle 775a8421d5 Initial Finnish translation 2013-01-16 10:54:16 -05:00
Ludovic Marcotte 4f2183ec07 Merge branch 'master' of https://github.com/inverse-inc/sogo 2013-01-15 13:34:13 -05:00
Ludovic Marcotte 2370ecb089 We now ignore default roles for "public" accesses. 2013-01-15 13:33:45 -05:00
Francis Lachapelle 0216658674 Update translations
- Catalan
- Czech
- Dutch
- Hungarian
- Polish
- Slovak
- SpanishArgentina
- SpanishSpain
2013-01-15 11:11:50 -05:00
Ludovic Marcotte d26df456e5 Fix for bug #2123. 2013-01-14 14:24:06 -05:00
Ludovic Marcotte 9d4f4c3a9c Proper fix for #2163. 2013-01-11 09:55:10 -05:00
Ludovic Marcotte c7fbcb0fc4 Fixed bug #1850 2013-01-09 14:08:37 -05:00
Francis Lachapelle 5667bb1b11 Fix CardDAV collections for OS X
Restored the previous behavior: only the personal addressbook is
returned and only the first source directory is returned (now sorted by
id so you can control which of your addressbook sources you want to
return).
2013-01-09 11:39:29 -05:00
Francis Lachapelle 39632239f9 Fix partstat of attendee in his calendar
Fixes #2155
2013-01-03 10:15:25 -05:00
Jean Raby 1382fe25fc put back SOGo_VERSION
wasn't unused after all...
2012-12-22 11:24:18 -05:00
Jean Raby ea26e0cc0a Use string version number where applicable
The goal is to be able to use 'letter' releases such as '2.0.3a'
in the Version file.
SoObjects/Mailer/GNUmakefile.preamble: UIX_MAILER_*_VERSION are now strings
  Can't use SOGoVersion since the etag uses an 'underscore' notation (2_0_3a)
SoObjects/Mailer/*.m: updated format for UIX_MAILER_*_VERSION
SoObjects/SOGo/GNUmakefile: zap SOGo_VERSION, unsused
SoObjects/SOGo/GNUmakefile.preamble: fix defines
UI/MainUI/SOGoRootPage.m: use SOGoVersion
2012-12-21 13:55:03 -05:00
Jean Raby 7d24ece7d6 Log ldap exception details + catch tls exceptions
Make sure to catch exceptions raised by _setupEncryption
Reindent due to NS_DURING
Log ldap exceptions details
2012-12-19 18:37:36 -05:00
Jean Raby e253a7429c Fix whitespace - remove tabs 2012-12-19 18:02:32 -05:00
Francis Lachapelle 8db5e6d224 Fix usage of browser's language for the login page 2012-12-13 08:53:50 -05:00
Jean Raby d7d6a31837 use fileAttributesAtPath
attributesOfItemAtPath is not available in older GNUstep releases.
Broke build on squeeze and lucid.
2012-12-11 09:34:06 -05:00
Jean Raby a0aef043a8 Don't abort if sogo.conf exists and is empty
This will permit patterns like:
  sogo-tool dump-defaults >/etc/sogo/sogo.conf

Without this, sogo-tool would abort as the shell first creates the file
then executes sogo-tool.
2012-12-10 14:05:11 -05:00
Francis Lachapelle 026ffd8888 Update translations 2012-12-06 10:31:15 -05:00
Ludovic Marcotte a7722755b7 Fixed length call. 2012-12-06 09:03:17 -05:00
Ludovic Marcotte 347434dbff We now fallback properly on the IMAP server if the Sieve server is undefined. 2012-12-05 15:52:50 -05:00
Ludovic Marcotte 988e91a638 We also remove the RSVP in the user's calendar during a PUT. 2012-12-05 08:31:35 -05:00
Ludovic Marcotte f6b5fdacb9 Remaining patches for bug #1866. 2012-12-03 16:49:20 -05:00
Ludovic Marcotte aa7aa6a973 Initial patch from #1866 to fix c_sievehostname. 2012-12-03 16:42:56 -05:00
Ludovic Marcotte d64fd65ea8 Lowercase some value to avoid broken comparaisons. 2012-12-03 16:33:14 -05:00
Francis Lachapelle 5500f99312 Remove conditions on RSVP
Fixes #1850
2012-11-30 15:11:03 -05:00
Ludovic Marcotte eed17fd95a Fix for bug #1850 and removed dead code/comments. 2012-11-30 13:57:55 -05:00
Ludovic Marcotte 47a9a22bc0 Fix for bug #2082. 2012-11-30 10:11:05 -05:00
Ludovic Marcotte f0f206b8bb Merge branch 'master' of https://github.com/inverse-inc/sogo 2012-11-29 15:50:07 -05:00
Ludovic Marcotte 73ff981d4f Fixed the method that returns the current-user-principal. 2012-11-29 15:49:32 -05:00
Francis Lachapelle ce36e80d6b Initial Slovak translation 2012-11-29 14:40:46 -05:00
Ludovic Marcotte 7c250fad8f Fix for bug #1061. 2012-11-26 13:13:06 -05:00
Ludovic Marcotte 1bf2509d1e Fix for bug #2115. 2012-11-21 11:56:24 -05:00
Ludovic Marcotte 28f66c6fd9 We correctly use <br/> instead of \n when handling the signature.
This happens when using HTML composition, instead of plain/text.
2012-11-20 20:29:27 -05:00
Ludovic Marcotte a1d092cab0 Fix for #2093. 2012-11-19 14:20:13 -05:00
Ludovic Marcotte 2606787dd7 Make sure we handle arrays, and not single-value string objects. 2012-11-19 09:45:48 -05:00
Ludovic Marcotte 0979bd13ae Fix for bug #2006. 2012-11-17 17:16:00 -05:00
Ludovic Marcotte 40d6ce66d0 Small fix over previous commit. 2012-11-17 16:43:49 -05:00
Ludovic Marcotte 3f8d374d63 Fix for bug #2035 2012-11-17 15:38:29 -05:00