Sami Rämö [Wed, 9 Jun 2010 06:46:26 +0000 (09:46 +0300)]
Merge branch 'master' into pan_map
Conflicts:
src/map/mapengine.h
Sami Rämö [Wed, 9 Jun 2010 05:49:45 +0000 (08:49 +0300)]
Added documentation
lampehe-local [Tue, 8 Jun 2010 12:42:14 +0000 (15:42 +0300)]
Merge branch 'note_problem'
lampehe-local [Tue, 8 Jun 2010 12:38:34 +0000 (15:38 +0300)]
Small fix for dialog/note queues
Reviewed by: Jussi Laitinen
Sami Rämö [Tue, 8 Jun 2010 12:28:36 +0000 (15:28 +0300)]
Fixed friends collision detection with spanned items
Sami Rämö [Tue, 8 Jun 2010 12:01:34 +0000 (15:01 +0300)]
Span items also when items are moved
- span items also when friends locations, own Situare location
or GPS location are changed
- some cleaning
lampehe-local [Tue, 8 Jun 2010 11:52:36 +0000 (14:52 +0300)]
Added login conter
Sami Rämö [Tue, 8 Jun 2010 11:13:59 +0000 (14:13 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Sami Rämö [Tue, 8 Jun 2010 11:08:42 +0000 (14:08 +0300)]
Use liblocation GPS only when built with CONFIG+=armel in Scratchbox
lampehe-local [Tue, 8 Jun 2010 10:59:12 +0000 (13:59 +0300)]
Merge branch 'note_queue'
lampehe-local [Tue, 8 Jun 2010 10:56:57 +0000 (13:56 +0300)]
Implemented dialog/information box queue for normal messages and errors
Reviewed by: Marko Niemelä
Sami Rämö [Tue, 8 Jun 2010 10:30:06 +0000 (13:30 +0300)]
Span only items which are coming to view
Ville Tiensuu [Tue, 8 Jun 2010 09:37:43 +0000 (12:37 +0300)]
created functial test for message saving
reviewed By: Kaj Wallin
Sami Rämö [Tue, 8 Jun 2010 08:34:51 +0000 (11:34 +0300)]
Got spanning of items (friends, locations) working
lampehe-local [Tue, 8 Jun 2010 08:06:32 +0000 (11:06 +0300)]
Merge branch 'master' into note_queue
Conflicts:
src/src.pro
lampehe-local [Tue, 8 Jun 2010 08:02:29 +0000 (11:02 +0300)]
backup
Ville Tiensuu [Tue, 8 Jun 2010 07:55:37 +0000 (10:55 +0300)]
Merge branch 'save_message'
Conflicts:
src/src.pro
Ville Tiensuu [Tue, 8 Jun 2010 07:44:11 +0000 (10:44 +0300)]
reviewed and iterated with Marko Niemelä
Ville Tiensuu [Tue, 8 Jun 2010 06:17:44 +0000 (09:17 +0300)]
before review
Ville Tiensuu [Mon, 7 Jun 2010 13:36:37 +0000 (16:36 +0300)]
backup before review
Jussi Laitinen [Mon, 7 Jun 2010 13:14:24 +0000 (16:14 +0300)]
Fixed bug #5867.
Reviewed by: Henri Lampela.
lampehe-local [Mon, 7 Jun 2010 11:56:09 +0000 (14:56 +0300)]
backup
Jussi Laitinen [Mon, 7 Jun 2010 11:37:10 +0000 (14:37 +0300)]
Modified test case for location item click.
Jussi Laitinen [Mon, 7 Jun 2010 11:08:36 +0000 (14:08 +0300)]
Changed header text in friend list panel.
Jussi Laitinen [Mon, 7 Jun 2010 11:02:20 +0000 (14:02 +0300)]
Added friend list panel header.
Reviewed by: Kaj Wallin
Ville Tiensuu [Mon, 7 Jun 2010 10:50:41 +0000 (13:50 +0300)]
basic functionality of error handling ready
Jussi Laitinen [Mon, 7 Jun 2010 09:22:40 +0000 (12:22 +0300)]
Added test case for friend list sorting.
Jussi Laitinen [Mon, 7 Jun 2010 09:19:30 +0000 (12:19 +0300)]
Added friend list sorting by timestamp.
Reviewed by: Kaj Wallin
lampehe-local [Mon, 7 Jun 2010 09:06:51 +0000 (12:06 +0300)]
Changed implementation
Sami Rämö [Mon, 7 Jun 2010 08:40:25 +0000 (11:40 +0300)]
Some calculation fixes
- fixed half of the tiles grid vertical size rounding up
- changed mapImageReceived() to calculate when duplicate
tile should be added instead of using constant value
- spanning is now ignoring padding (reserve of tiles which
would never be shown when jumping to opposite side of
the world)
Jussi Laitinen [Mon, 7 Jun 2010 07:58:25 +0000 (10:58 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
src/src.pro
Jussi Laitinen [Mon, 7 Jun 2010 07:50:34 +0000 (10:50 +0300)]
Added comments and debug prints.
Kaj Wallin [Mon, 7 Jun 2010 07:17:30 +0000 (10:17 +0300)]
Removed obsolete image from res/images
Reviewed by: Pekka Nissinen
Sami Rämö [Mon, 7 Jun 2010 07:14:12 +0000 (10:14 +0300)]
Got map spanning working
- Fixed duplicating received tiles in mapImageReceived()
when necessary
- Fixed removeOutOfViewTiles() not to remove duplicated
tiles when view is near world limits
- MapScene::addTile() does now take care of remove old
version of the tile from the scene if it already exists
Kaj Wallin [Mon, 7 Jun 2010 07:07:57 +0000 (10:07 +0300)]
Cleaned some garbage from repository and thus closed bug 5765
Reviewed by: Ville Tiensuu
Kaj Wallin [Mon, 7 Jun 2010 06:43:57 +0000 (09:43 +0300)]
Added functionality test for localization
Reviewed by: Ville Tiensuu
Kaj Wallin [Mon, 7 Jun 2010 06:40:39 +0000 (09:40 +0300)]
Merge branch 'localization'
Kaj Wallin [Mon, 7 Jun 2010 06:36:16 +0000 (09:36 +0300)]
Finished Finnish localization
Reviewed by: Ville Tiensuu
Jussi Laitinen [Mon, 7 Jun 2010 05:50:56 +0000 (08:50 +0300)]
Added error handler to LiblocationWrapper.
Ville Tiensuu [Fri, 4 Jun 2010 13:10:16 +0000 (16:10 +0300)]
backup
Jussi Laitinen [Fri, 4 Jun 2010 11:56:03 +0000 (14:56 +0300)]
Added comments to liblocationwrapper.cpp.
Jussi Laitinen [Fri, 4 Jun 2010 11:06:03 +0000 (14:06 +0300)]
Merged gpspositionprivate.cpp from master branch.
Jussi Laitinen [Fri, 4 Jun 2010 10:58:56 +0000 (13:58 +0300)]
Merge branch 'master' into gps_wrapper
Jussi Laitinen [Fri, 4 Jun 2010 10:58:42 +0000 (13:58 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Fri, 4 Jun 2010 10:57:33 +0000 (13:57 +0300)]
Added GeoCoordinate, GeoPositionInfo, GpsPositionPrivate (liblocation)
and LiblocationWrapper classes.
lampehe-local [Fri, 4 Jun 2010 10:44:06 +0000 (13:44 +0300)]
Added queue for information notes
Ville Tiensuu [Fri, 4 Jun 2010 10:16:42 +0000 (13:16 +0300)]
backup before changing update dialog to be a data member of UserInfo
Sami Rämö [Fri, 4 Jun 2010 07:04:42 +0000 (10:04 +0300)]
Out of view tiles removal modified
- Tiles are NOT added correctly to the scene
Ville Tiensuu [Fri, 4 Jun 2010 05:52:17 +0000 (08:52 +0300)]
backup
Kaj Wallin [Fri, 4 Jun 2010 05:48:33 +0000 (08:48 +0300)]
New version of the localization
Reviewed by:
lampehe-local [Thu, 3 Jun 2010 13:21:17 +0000 (16:21 +0300)]
Added functional test for session expired and login failed error messages
Reviewed by: Katri Kaikkonen
Ville Tiensuu [Thu, 3 Jun 2010 13:08:48 +0000 (16:08 +0300)]
backup...
continue by routing signals
Jussi Laitinen [Thu, 3 Jun 2010 12:56:52 +0000 (15:56 +0300)]
Added GeoPositionInfo and LiblocationWrapper classes.
Jussi Laitinen [Thu, 3 Jun 2010 12:41:06 +0000 (15:41 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)]
Merge branch 'master' into save_message
Ville Tiensuu [Thu, 3 Jun 2010 12:18:01 +0000 (15:18 +0300)]
backup
Kaj Wallin [Thu, 3 Jun 2010 12:16:57 +0000 (15:16 +0300)]
Merge branch 'master' into localization
Kaj Wallin [Thu, 3 Jun 2010 12:15:17 +0000 (15:15 +0300)]
Initial verion of localization
Reviewed by:
lampehe-local [Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)]
Merge branch 'master' into timeout
lampehe-local [Thu, 3 Jun 2010 12:07:27 +0000 (15:07 +0300)]
Added error messages and error handling for UI
Reviewed by: Kaj Wallin
lampehe-local [Thu, 3 Jun 2010 11:53:15 +0000 (14:53 +0300)]
Added error messages and handling
Ville Tiensuu [Thu, 3 Jun 2010 11:42:31 +0000 (14:42 +0300)]
dialog keeps now open until message is received on Situare server
Kaj Wallin [Thu, 3 Jun 2010 10:00:22 +0000 (13:00 +0300)]
Added functionality test for full screen toggling
Reviewed by: Marko Niemelä
Kaj Wallin [Thu, 3 Jun 2010 09:59:44 +0000 (12:59 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Thu, 3 Jun 2010 09:53:01 +0000 (12:53 +0300)]
Added feature for full screen toggling
Reviewed by: Marko Niemelä
Ville Tiensuu [Thu, 3 Jun 2010 07:28:42 +0000 (10:28 +0300)]
finalised tests for bigger profile images.
fixed doxygen documentation from avatarimage.h
reviewed by: Pekka Nissinen
Ville Tiensuu [Thu, 3 Jun 2010 06:35:11 +0000 (09:35 +0300)]
added functional test for bigger profile images
Sami Rämö [Thu, 3 Jun 2010 06:32:06 +0000 (09:32 +0300)]
Merge branch 'master' into pan_map
Sami Rämö [Thu, 3 Jun 2010 06:27:30 +0000 (09:27 +0300)]
Fixed and re-factored tile grid calculation
Ville Tiensuu [Thu, 3 Jun 2010 06:22:07 +0000 (09:22 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Thu, 3 Jun 2010 06:21:01 +0000 (09:21 +0300)]
added unit test for avatarimage
Pekka Nissinen [Wed, 2 Jun 2010 12:41:13 +0000 (15:41 +0300)]
Removed unnecessary images from res folder and made a few cosmetic changes
Kaj Wallin [Wed, 2 Jun 2010 11:50:10 +0000 (14:50 +0300)]
Added filter clearing to friend list panel close
Reviewed by: Ville Tiensuu
Jussi Laitinen [Wed, 2 Jun 2010 11:32:18 +0000 (14:32 +0300)]
Changed timestamp() to dateTime() in GPSPositionPrivate.
Sami Rämö [Wed, 2 Jun 2010 11:04:18 +0000 (14:04 +0300)]
Merge branch 'master' into pan_map
Conflicts:
src/ui/mainwindow.cpp
Kaj Wallin [Wed, 2 Jun 2010 11:03:37 +0000 (14:03 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Wed, 2 Jun 2010 11:02:45 +0000 (14:02 +0300)]
Updated functional tests
Reviewed by: Henri Lampela
Sami Rämö [Wed, 2 Jun 2010 06:47:36 +0000 (09:47 +0300)]
Ignore map tile request if it is already downloading
lampehe-local [Wed, 2 Jun 2010 06:12:16 +0000 (09:12 +0300)]
Bug fix for Login e-mail field is not pre-filled after failed login attempt
Reviewed by: Kaj Wallin
Sami Rämö [Wed, 2 Jun 2010 05:42:29 +0000 (08:42 +0300)]
Replace expired tile in the scene with fresh one
Sami Rämö [Tue, 1 Jun 2010 13:01:57 +0000 (16:01 +0300)]
Span also hidden FriendLocationItems
- Refactored MapScene::spanItems()
Ville Tiensuu [Tue, 1 Jun 2010 08:55:02 +0000 (11:55 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Tue, 1 Jun 2010 08:53:24 +0000 (11:53 +0300)]
changed firts start map view to 0,0.
disabled debug messages from src.pro
Jussi Laitinen [Tue, 1 Jun 2010 08:52:24 +0000 (11:52 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Tue, 1 Jun 2010 08:51:23 +0000 (11:51 +0300)]
Removed GPSPosition destructor.
Ville Tiensuu [Tue, 1 Jun 2010 07:59:08 +0000 (10:59 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Tue, 1 Jun 2010 07:57:41 +0000 (10:57 +0300)]
Changed debian/rules to use armel CONFIG flag.
Jussi Laitinen [Tue, 1 Jun 2010 07:56:54 +0000 (10:56 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Tue, 1 Jun 2010 07:55:14 +0000 (10:55 +0300)]
Merge branch 'bigger_images'
Jussi Laitinen [Tue, 1 Jun 2010 07:54:38 +0000 (10:54 +0300)]
Changed src/src.pro to use armel flag instead of sbox.
Ville Tiensuu [Tue, 1 Jun 2010 07:37:40 +0000 (10:37 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Tue, 1 Jun 2010 07:36:34 +0000 (10:36 +0300)]
reviewed and iterated with Marno Niemela
Kaj Wallin [Tue, 1 Jun 2010 07:15:18 +0000 (10:15 +0300)]
Added prerm file to packaging which removes situare.conf during
application removal
Reviewed by: Marko Niemelä
Sami Rämö [Tue, 1 Jun 2010 06:31:58 +0000 (09:31 +0300)]
Cleaned development garbages
Ville Tiensuu [Tue, 1 Jun 2010 06:31:30 +0000 (09:31 +0300)]
backup before test
Pekka Nissinen [Tue, 1 Jun 2010 06:31:15 +0000 (09:31 +0300)]
Removed a few empty lines
Pekka Nissinen [Tue, 1 Jun 2010 06:23:50 +0000 (09:23 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Pekka Nissinen [Tue, 1 Jun 2010 06:23:16 +0000 (09:23 +0300)]
Minor tweak to the previous bug fix
Jussi Laitinen [Tue, 1 Jun 2010 06:08:55 +0000 (09:08 +0300)]
Added networkhandler include to
tests/map/gpslocationitem/gpslocationitem.pro.
Jussi Laitinen [Tue, 1 Jun 2010 05:56:35 +0000 (08:56 +0300)]
Merge branch 'master' into settings_auto_update
Conflicts:
src/src.pro