[commits] Horde branch imp-mobile-readwrite created. ec4db46ad743dacf080b182f1c65d0145ded5192

Jan Schneider jan at horde.org
Fri Oct 14 09:52:32 UTC 2011


The branch "imp-mobile-readwrite" has been created.
        at  ec4db46ad743dacf080b182f1c65d0145ded5192 (commit)

-----------------------------------------------------------------------
commit ec4db46ad743dacf080b182f1c65d0145ded5192
Merge: ea2d52d90b5a624fc8207e9f9bd14aadc6662f38 4e89a2c09d926e9f4a9a3bb6d198e113a24e7040
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 13 11:34:57 2011 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	horde/js/map/OpenLayers-debug.js
    	horde/js/map/OpenLayers.js
    	horde/js/map/google.js
    	horde/js/map/horde.js
    	horde/js/map/yahoo.js
    	horde/lib/Application.php
    	horde/package.xml
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/package.xml
    	kronolith/lib/Application.php
    	kronolith/package.xml
    	mnemo/package.xml
    	nag/package.xml
    	turba/docs/CHANGES
    	turba/lib/Application.php
    	turba/package.xml

commit ea2d52d90b5a624fc8207e9f9bd14aadc6662f38
Merge: 6ac9db77c32b09c1ed70f9ee6de87cca7ea5e2ba 6443ba4a7a4fc12d821c1c3bf1936faf0dd78e23
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 15:52:54 2011 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/package.xml

commit 6ac9db77c32b09c1ed70f9ee6de87cca7ea5e2ba
Merge: 9a7416d51b1fc991dda083752e9ced954590967b 49c02e64b89fcf72cce97246fd76b274ffc2c31b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 3 01:57:49 2011 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	horde/docs/CHANGES
    	horde/lib/Application.php
    	horde/package.xml
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/lib/Application.php
    	ingo/package.xml
    	kronolith/docs/CHANGES
    	kronolith/lib/Application.php
    	kronolith/package.xml
    	mnemo/package.xml
    	nag/package.xml
    	turba/lib/Application.php
    	turba/package.xml

commit 9a7416d51b1fc991dda083752e9ced954590967b
Merge: 874dc7b0894bb8c6dcb9fde72a493c89565511ac 83630af683ba06f9ba914387f355e6ed3a7d5952
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 29 13:59:42 2011 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	horde/js/map/horde.js
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/package.xml
    	kronolith/package.xml
    	turba/lib/Application.php
    	turba/package.xml

commit 874dc7b0894bb8c6dcb9fde72a493c89565511ac
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 13:08:29 2011 -0400

    Add support for GML layers

commit c03fc947ad72ea3048f1af4a158ba0b12b527af8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 13:05:40 2011 -0400

    add the geo namespace and output in addition to georss

commit 50f29027e7981b7a79bab6df2eb0f557d43e0834
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 13:04:56 2011 -0400

    Use a GML layer and a custom createFeatureFromItem method for GeoRSS layers

commit 76ee7c6ba259c58f728d03da028ee533aab95e93
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 11:12:46 2011 -0400

    Add GeoRSS layer support.
    
    It's somewhat limited in that you are restricted to same-origin policy
    unless you setup a local proxy (which you can tell OL to use).

commit 5f7504d11c1e60f61f697abe3f4ea3be8a9cad44
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 11:12:01 2011 -0400

    Some OL layers have the path to the marker hard coded. Add it to the OL directory too.

commit b3871907cbeb28d4c0d05b6026e35fbddf58cee5
Merge: 75984d3b7c4bb9fad0ad607eb5ad8538fdecc2bb da56bf9e71521b5cb898402efa182da8d4388fa2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 02:01:25 2011 -0400

    Merge branch 'master' into develop

commit da56bf9e71521b5cb898402efa182da8d4388fa2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Aug 16 01:59:53 2011 -0400

    These settings should be per map, not per page.
    
    Add some BC checks until Horde 5 to accept the old parameters as well

commit 75984d3b7c4bb9fad0ad607eb5ad8538fdecc2bb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 17:01:48 2011 -0400

    Revert "Merge resolution?"
    
    This reverts commit e9638e7b64d8f07086ed3991b2da0d6ea9d81568.

commit 277efe25cd72450352040f804c7e7b2c0a001fb4
Merge: 9530efda6f2092c26778424d56971a7b3582f194 52d3dccd41ac6ed409ab8ea58f6fc8c680448edc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:54:38 2011 -0400

    Merge branch 'master' into develop

commit 9530efda6f2092c26778424d56971a7b3582f194
Merge: fceb49b9f577a3fda2f888ebc4389b296ed7b576 3f4967a2fccfb26aeb5ab8d0e1ce2b1ea446251b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:37:05 2011 -0400

    Merge branch 'openlayers2_11' into develop

commit fceb49b9f577a3fda2f888ebc4389b296ed7b576
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:29:54 2011 -0400

    Add mytopo mapping layer to hordemap

commit 2d3f53f21ead749ca1654cc4fc2cad1612133b25
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:27:57 2011 -0400

    Add field for Mytopo maps api key

commit e9638e7b64d8f07086ed3991b2da0d6ea9d81568
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:25:59 2011 -0400

    Merge resolution?

commit 670f030fb3696557130ee8369213295822e0b4c7
Merge: f7296e12ab4b76a5c36ce762f21a5d66803b87c5 46b568b161bc9e29a669a208d05b6f18e0aee5ed
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:20:01 2011 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/package.xml

commit f7296e12ab4b76a5c36ce762f21a5d66803b87c5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Aug 15 16:18:04 2011 -0400

    fix case on my filesystem

commit 3f4967a2fccfb26aeb5ab8d0e1ce2b1ea446251b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Aug 14 22:00:57 2011 -0400

    Start upgrade to OL 2.11
    
    Mostly a non-event, but the Google layer now uses the
    Google Maps V3 API. Still need to update the language files.

commit 4eb65d23a115892ca0f4bf18fb70efa9416408b9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Aug 14 21:50:38 2011 -0400

    Don't attempt to zoomToFit() until we have a marker.
    
    zoomToFit(), but definition, requires at least one feature/marker on the map.

commit e472c155204fbec7adfe7f231d6ceb912cf5018b
Merge: 1d12186aa4600a8af7a7b559613a8aaf99ede861 db7201650e1ae78e75eba30306bb38c22e713940
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Aug 13 21:33:02 2011 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	horde/lib/Application.php
    	horde/package.xml
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/lib/Application.php
    	ingo/package.xml
    	kronolith/lib/Application.php
    	kronolith/package.xml
    	mnemo/lib/Application.php
    	mnemo/package.xml
    	nag/lib/Application.php
    	nag/package.xml
    	turba/lib/Application.php
    	turba/package.xml

commit 1d12186aa4600a8af7a7b559613a8aaf99ede861
Merge: 57cec8e2e981d81b4f96ced9e2a9417ffb72d26e 526e8a5ff22b6bc661eae3b677c01c8b4dfa0b98
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 20 19:24:28 2011 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	horde/lib/Application.php
    	horde/package.xml
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/lib/Application.php
    	ingo/package.xml
    	kronolith/lib/Application.php
    	kronolith/package.xml
    	mnemo/lib/Application.php
    	mnemo/package.xml
    	nag/lib/Application.php
    	nag/package.xml
    	turba/lib/Application.php
    	turba/package.xml

commit 57cec8e2e981d81b4f96ced9e2a9417ffb72d26e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri May 6 00:45:09 2011 -0400

    parse error

commit 5e30f7127d31f1efcdc484310a334cf5bbbe391e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri May 6 00:43:15 2011 -0400

    fix method signature

commit 9cfabd72dadcedf5a0db62fd0072f88b7c7f4331
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Apr 21 14:44:33 2011 -0400

    Add ability to immediatley save the change when calling Horde_Share_Object#set
    
    Implemented in the sql drivers, but was unsure how to implment this in kolab.
    For now, it just calls _save() there.

commit dc03419d7d329bbc1a5b598155af7b355cd37ddb
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 21 19:00:49 2011 +0200

    Bump API versions too.

commit 206ff72dbee119a1f1f473d83627357fdb9d7f6d
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 21 18:55:21 2011 +0200

    Bump versions.




More information about the commits mailing list