1. 09 Mar, 2016 2 commits
    • Sebastian Kummer's avatar
      Merge pull request #171 in ZP/z-push from release/2.2 to master · a2eef6ce
      Sebastian Kummer authored
      Release 2.2.9
      
      * commit '0637fbe9': (27 commits)
        ZP-822 Bumped version.
        ZP-822 Bumped version, fixed line endings.
        Merge pull request #154 in ZP/z-push from bugfix/ZP-840-ping-loop-if-exporter-state-is-not to develop
        Merge pull request #150 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop
        Merge pull request #157 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag-revert to develop
        ZP-822 Bumped to 2.2.9beta1, fixed line endings.
        Merge pull request #147 in ZP/z-push from bugfix/ZP-833-change-zcp-default-server-location to develop
        Merge pull request #143 in ZP/z-push from bugfix/ZP-830-combined-minor-formatting-fixes to develop
        Merge pull request #144 in ZP/z-push from bugfix/ZP-831-combined-typo-in-variable-name to develop
        ZP-822 Bump to 2.2.9alpha2, fix whitespace.
        Merge pull request #140 in ZP/z-push from bugfix/ZP-826-ping-triggers-hierarchy-sync-when to develop
        ZP-822 Bumped to 2.2.9alpha1. Removed new lines at end of files.
        Merge pull request #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop
        Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop
        Merge pull request #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop
        Merge pull request #125 in ZP/z-push from bugfix/ZP-815-categories-on-emails-are-not-synchronized-updated to develop
        Merge pull request #109 in ZP/z-push from bugfix/ZP-795-typo-small-fixes to develop
        Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop
        Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop
        Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop
        ...
      a2eef6ce
    • Sebastian Kummer's avatar
      ZP-822 Bumped version. · 0637fbe9
      Sebastian Kummer authored
      Released under the Affero GNU General Public License (AGPL) version 3.
      0637fbe9
  2. 24 Feb, 2016 4 commits
    • Sebastian Kummer's avatar
      ZP-822 Bumped version, fixed line endings. · ee04fc92
      Sebastian Kummer authored
      Released under the Affero GNU General Public License (AGPL) version 3.
      ee04fc92
    • Sebastian Kummer's avatar
      Merge pull request #154 in ZP/z-push from... · b2bb1fef
      Sebastian Kummer authored
      Merge pull request #154 in ZP/z-push from bugfix/ZP-840-ping-loop-if-exporter-state-is-not to develop
      
      * commit 'a1541482':
        ZP-840 Rename exception variable.
        ZP-840 Renamed exception variable.
        ZP-840 Catch StateInvalidException when in partial mode.
        ZP-840 Do not throw StateNotFoundException as this messes up Ping. Just treat it as StateInvalid (which is true, FD indicates a state that is not available), do not catch both types in Ping as only StateInvalidException will be thrown.
      
      (cherry picked from commit abf4c77c)
      
      Conflicts:
      	src/lib/core/synccollections.php
      	src/lib/request/ping.php
      b2bb1fef
    • Sebastian Kummer's avatar
      Merge pull request #150 in ZP/z-push from... · ece2e377
      Sebastian Kummer authored
      Merge pull request #150 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop
      
      * commit '5c7a4b19':
        ZP-641 Delete file only if it exists.
        ZP-641 CleanStates() has to stop after deleting one BS file.
        ZP-641 call GetState() with the "do not clean" flag, changed CleanStates() to delete exact bs files when being calles without uuid for bs type (needs better fixing in ZP-835).
      
      (cherry picked from commit 3f1f999e)
      ece2e377
    • Sebastian Kummer's avatar
      Merge pull request #157 in ZP/z-push from... · ec4280de
      Sebastian Kummer authored
      Merge pull request #157 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag-revert to develop
      
      * commit '749e44a8':
        ZP-645 Revert "PHP 5.4+ ob_start() needs an extra flag to allow".
      
      (cherry picked from commit 52e58756)
      ec4280de
  3. 10 Feb, 2016 4 commits
  4. 05 Feb, 2016 2 commits
  5. 03 Feb, 2016 16 commits
    • Sebastian Kummer's avatar
      ZP-822 Bumped to 2.2.9alpha1. Removed new lines at end of files. · cdc411b6
      Sebastian Kummer authored
      Released under the Affero GNU General Public License (AGPL) version 3.
      cdc411b6
    • Sebastian Kummer's avatar
      Merge pull request #133 in ZP/z-push from... · 5da621f1
      Sebastian Kummer authored
      Merge pull request #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop
      
      * commit '673e1981':
        ZP-781 Use comma as decimal and dot as thousand separators, add 's' as unit for time usage.
        ZP-781 Nicer format for memory usage.
      
      (cherry picked from commit 109eb8f7)
      
      Conflicts:
      	src/lib/utils/utils.php
      5da621f1
    • Sebastian Kummer's avatar
      Merge pull request #138 in ZP/z-push from... · ff1ec4cd
      Sebastian Kummer authored
      Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop
      
      * commit 'd8718bdc':
        ZP-824 Remove local $sc as it is not needed.
        ZP-824 Invalidate all pingable flags on folders when doing a FolderSync (with changes) or FolderChange (Create, Update, Delete) operation.
      
      (cherry picked from commit 6a7a9763)
      
      Conflicts:
      	src/lib/request/folderchange.php
      	src/lib/request/foldersync.php
      ff1ec4cd
    • Sebastian Kummer's avatar
      Merge pull request #136 in ZP/z-push from... · c92e0709
      Sebastian Kummer authored
      Merge pull request #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop
      
      * commit '403f8afa':
        ZP-823 Remove empty line.
        ZP-823 Do not sync suggested contacts folder.
      
      (cherry picked from commit 7845f6c9)
      c92e0709
    • Sebastian Kummer's avatar
      Merge pull request #125 in ZP/z-push from... · 59030985
      Sebastian Kummer authored
      Merge pull request #125 in ZP/z-push from bugfix/ZP-815-categories-on-emails-are-not-synchronized-updated to develop
      
      * commit '12ea24fc':
        ZP-815 Remove categories if mobile does not submit them.
        ZP-815 Fixed StreamImporter to include categories when streaming an email update, added categories instance variable to SyncMail, added categories to MAPIProvider->GetEmailMapping(), implementing setting categories for emails.
      
      (cherry picked from commit bca74a9c)
      59030985
    • Sebastian Kummer's avatar
      Merge pull request #109 in ZP/z-push from bugfix/ZP-795-typo-small-fixes to develop · 7c5aaa32
      Sebastian Kummer authored
      * commit '2676adfb':
        ZP-795 hhvm fix: GetCutOffDate in utils.php.
        ZP-795 hhvm fix: use break instead of continue in switch.
        ZP-795 hhvm fix: {} -> [].
        ZP-795 hhvm fix: use bool instead of boolean.
        ZP-795 remove unused code.
        ZP-795 fix indentation.
        ZP-795 add parentheses to be sure of what we want.
        ZP-795 fix some bad sprintf.
        ZP-795 remove useless assignment.
      
      (cherry picked from commit 7d46686c)
      7c5aaa32
    • Sebastian Kummer's avatar
      Merge pull request #134 in ZP/z-push from... · bfd9e684
      Sebastian Kummer authored
      Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop
      
      * commit 'a973c6ff':
        ZP-808 Set appointment as private if sensitivity is private or greater.
      
      (cherry picked from commit 752e61ab)
      bfd9e684
    • Sebastian Kummer's avatar
      Merge pull request #130 in ZP/z-push from... · 77ba16b2
      Sebastian Kummer authored
      Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop
      
      * commit 'f8d7d6a3':
        ZP-793 Cache requested folderid so only the SyncCollections get changed that really had a change in flags.
      
      (cherry picked from commit 200c9f74)
      77ba16b2
    • Sebastian Kummer's avatar
      Merge pull request #135 in ZP/z-push from... · 15b1de6d
      Sebastian Kummer authored
      Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop
      
      * commit '66a7ae5d':
        ZP-817 Set task as private if sensitivity is private or greater.
      
      (cherry picked from commit 289a1b62)
      15b1de6d
    • Sebastian Kummer's avatar
      Merge pull request #131 in ZP/z-push from... · 495fc68b
      Sebastian Kummer authored
      Merge pull request #131 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop
      
      * commit '1dd2d287':
        ZP-817 Unsetting private task in Outlook is not saved on the server.
      
      (cherry picked from commit 989e8537)
      495fc68b
    • Sebastian Kummer's avatar
      Merge pull request #129 in ZP/z-push from... · 2dff8228
      Sebastian Kummer authored
      Merge pull request #129 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop
      
      * commit 'a333cd79':
        ZP-817 Sensitivity (private) of tasks is not saved on the server.
      
      (cherry picked from commit 1680807d)
      2dff8228
    • Sebastian Kummer's avatar
      Merge pull request #128 in ZP/z-push from... · ac81347e
      Sebastian Kummer authored
      Merge pull request #128 in ZP/z-push from bugfix/ZP-766-outlook-sends-autodiscover-outlook to develop
      
      * commit '289ed5cf':
        ZP-766 Accept outlook response schema on autodiscover, send XML response only for mobile response schema or empty otherwise.
      
      (cherry picked from commit 4dba2866)
      ac81347e
    • Sebastian Kummer's avatar
      Merge pull request #7 in ZP/z-push from... · bc87cd1e
      Sebastian Kummer authored
      Merge pull request #7 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop
      
      * commit 'f087cedd':
        ZP-641 Make sure CleanStates does not touch permanent backend storage files, unless we really want to delete them.
        ZP-641 Revert "For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device."
        For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device.
      
      (cherry picked from commit 0cbe61f5)
      bc87cd1e
    • Sebastian Kummer's avatar
      Merge pull request #126 in ZP/z-push from... · 6e0359d2
      Sebastian Kummer authored
      Merge pull request #126 in ZP/z-push from bugfix/ZP-791-check-if-lastmodifieddate-is-processed to develop
      
      * commit 'd1dbbb39':
        ZP-791 LastModifiedDate not set for notes when changed on the server.
      
      (cherry picked from commit bc1c1ace)
      6e0359d2
    • Sebastian Kummer's avatar
      Merge pull request #116 in ZP/z-push from... · d0d806c7
      Sebastian Kummer authored
      Merge pull request #116 in ZP/z-push from bugfix/ZP-801-allow-all-day-recurring-event-without to develop
      
      * commit 'feb9b279':
        ZP-801 allow all day reccuring events without timezone.
      
      (cherry picked from commit ec5b650b)
      d0d806c7
    • Sebastian Kummer's avatar
      Merge pull request #104 in ZP/z-push from... · 75e2f40e
      Sebastian Kummer authored
      Merge pull request #104 in ZP/z-push from bugfix/ZP-787-typo-request-getdeviceid-request-getdeviceid to develop
      
      * commit '00815c8d':
        ZP-787 fix typo Request::GetDeviceId() -> Request::GetDeviceID().
      
      (cherry picked from commit f9803a56)
      75e2f40e
  6. 27 Jan, 2016 2 commits
    • Sebastian Kummer's avatar
      Merge pull request #132 in ZP/z-push from release/2.2 to master · 208e6bbb
      Sebastian Kummer authored
      * commit '9eb68bf8':
        ZP-809 Bumped version to 2.2.8.
        ZP-809 bumped version to 2.2.8beta1.
        ZP-809 Bumped to 2.2.8alpha2.
        ZP-809 Bumped version file, removed white space.
        Merge pull request #119 in ZP/z-push from bugfix/ZP-784-sync-with-remove-fails-if-source-message to develop
        Merge pull request #114 in ZP/z-push from bugfix/ZP-799-disallow-new-new-time-proposal-is to develop
        Merge pull request #113 in ZP/z-push from bugfix/ZP-798-loopdetection-gets-stuck to develop
        Merge pull request #103 in ZP/z-push from bugfix/ZP-786-instanceof-is-lowercase to develop
        Merge pull request #100 in ZP/z-push from feature/ZP-782-log-file-and-line-in-zpushexception to develop
        Merge pull request #101 in ZP/z-push from bugfix/ZP-783-statusexception-from-phpwrapper-not to develop
        Merge pull request #99 in ZP/z-push from bugfix/ZP-780-incompatible-zcp-7.0.x-ics-importfolderchange to develop
        Merge pull request #94 in ZP/z-push from bugfix/ZP-773-autodiscover-needs-timezone-set-for to develop
        Merge pull request #98 in ZP/z-push from bugfix/ZP-776-remove-obsolete-check-and-link to develop
        Merge pull request #97 in ZP/z-push from bugfix/ZP-775-z-push-admin-a-resync-t-does-not-work to develop
        ZP-785 Fix mixed EOL.
      208e6bbb
    • Sebastian Kummer's avatar
      ZP-809 Bumped version to 2.2.8. · 9eb68bf8
      Sebastian Kummer authored
      Released under the Affero GNU General Public License (AGPL) version 3.
      9eb68bf8
  7. 13 Jan, 2016 1 commit
  8. 08 Jan, 2016 2 commits
  9. 07 Jan, 2016 7 commits