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ä
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
Pekka Nissinen [Tue, 1 Jun 2010 05:53:49 +0000 (08:53 +0300)]
Fixed a bug that made compiling under scratchbox impossible
Jussi Laitinen [Tue, 1 Jun 2010 05:48:42 +0000 (08:48 +0300)]
Added checkbox enabling in SettingsDialog::enableSituareSettings.
Ville Tiensuu [Mon, 31 May 2010 13:21:59 +0000 (16:21 +0300)]
Merge branch 'bigger_images'
Ville Tiensuu [Mon, 31 May 2010 13:20:32 +0000 (16:20 +0300)]
added rounding to large profile image corners
Jussi Laitinen [Mon, 31 May 2010 12:52:45 +0000 (15:52 +0300)]
Added test case for automatic location update.
Jussi Laitinen [Mon, 31 May 2010 12:50:20 +0000 (15:50 +0300)]
Added list pick selector in settings.
lampehe-local [Mon, 31 May 2010 12:38:55 +0000 (15:38 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Mon, 31 May 2010 12:37:06 +0000 (15:37 +0300)]
cleaned small profila image handling
lampehe-local [Mon, 31 May 2010 12:37:01 +0000 (15:37 +0300)]
Fixed GPS/manual states when logging in
Reviewd by: Marko Niemelä
Ville Tiensuu [Mon, 31 May 2010 11:46:47 +0000 (14:46 +0300)]
backup before removing small profile image handling from source code
Kaj Wallin [Mon, 31 May 2010 11:38:19 +0000 (14:38 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Mon, 31 May 2010 11:37:07 +0000 (14:37 +0300)]
Reworked debian packaging to comply with PR1.2 changes
Reviewed by: Henri Lampela
lampehe-local [Mon, 31 May 2010 11:31:28 +0000 (14:31 +0300)]
Finalized login using cookies
Reviewed by: Marko Niemelä
Ville Tiensuu [Mon, 31 May 2010 11:10:13 +0000 (14:10 +0300)]
cleaning
Ville Tiensuu [Mon, 31 May 2010 10:41:36 +0000 (13:41 +0300)]
finalising big profile images
Jussi Laitinen [Mon, 31 May 2010 10:00:51 +0000 (13:00 +0300)]
Added comments to settingsdialog, engine and mainwindow.
lampehe-local [Mon, 31 May 2010 09:28:00 +0000 (12:28 +0300)]
Merge branch 'master' into cookies_refactored
lampehe-local [Mon, 31 May 2010 09:25:52 +0000 (12:25 +0300)]
Few clean-ups
Pekka Nissinen [Mon, 31 May 2010 07:38:50 +0000 (10:38 +0300)]
Resized refresh and set location buttons to follow Fremantle Master Layout Quide
and made a few minor cosmetic fixes to mapfetcher.cpp, imagebutton.cpp and src.pro
Jussi Laitinen [Mon, 31 May 2010 06:54:16 +0000 (09:54 +0300)]
Merge branch 'master' into settings_auto_update
Jussi Laitinen [Mon, 31 May 2010 06:48:41 +0000 (09:48 +0300)]
Modified src.pro to include networkhandlerprivatestub when using
simulator.
Jussi Laitinen [Mon, 31 May 2010 06:23:20 +0000 (09:23 +0300)]
Merge branch 'master' into settings_auto_update
Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/gps/gpspositionprivate.cpp
src/src.pro
lampehe-local [Mon, 31 May 2010 05:58:35 +0000 (08:58 +0300)]
Merge branch 'master' into cookies_refactored
lampehe-local [Mon, 31 May 2010 05:57:38 +0000 (08:57 +0300)]
Added missing files
Jussi Laitinen [Mon, 31 May 2010 05:50:48 +0000 (08:50 +0300)]
Modified src.pro to include networkhandlerprivatestub when building in
scratchbox.
Jussi Laitinen [Mon, 31 May 2010 05:03:51 +0000 (08:03 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Ville Tiensuu [Fri, 28 May 2010 13:11:25 +0000 (16:11 +0300)]
working new borders for bigger profile images
Jussi Laitinen [Fri, 28 May 2010 13:00:21 +0000 (16:00 +0300)]
Added comments to networkhandlerprivate.cpp.
lampehe-local [Fri, 28 May 2010 12:41:49 +0000 (15:41 +0300)]
Moved networkcookiejar to network folder
lampehe-local [Fri, 28 May 2010 12:32:21 +0000 (15:32 +0300)]
Merge branch 'master' into cookies_refactored
lampehe-local [Fri, 28 May 2010 12:30:58 +0000 (15:30 +0300)]
Few fixes and improvements
Kaj Wallin [Fri, 28 May 2010 11:54:22 +0000 (14:54 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Fri, 28 May 2010 11:53:18 +0000 (14:53 +0300)]
Fixed zoom panel position loading bug.
Reviewed by: Pekka Nissinen
Jussi Laitinen [Fri, 28 May 2010 10:49:56 +0000 (13:49 +0300)]
Added auto updating methods to Engine.
Jussi Laitinen [Fri, 28 May 2010 05:48:20 +0000 (08:48 +0300)]
Added debug prints to classes.
lampehe-local [Fri, 28 May 2010 05:40:43 +0000 (08:40 +0300)]
Removed zoom panel related definitions from common.h
lampehe-local [Fri, 28 May 2010 05:20:20 +0000 (08:20 +0300)]
Merge branch 'master' into cookies_refactored
Conflicts:
src/common.h
src/src.pro
ville tiensuu [Thu, 27 May 2010 19:21:12 +0000 (22:21 +0300)]
played with image borders
Ville Tiensuu [Thu, 27 May 2010 13:28:47 +0000 (16:28 +0300)]
started feature to show bigger profile images
Jussi Laitinen [Thu, 27 May 2010 13:06:07 +0000 (16:06 +0300)]
Merge branch 'network_handler'
Jussi Laitinen [Thu, 27 May 2010 13:05:01 +0000 (16:05 +0300)]
Modified test script. Added networkhandlerprivate and
networkhandlerprivatestub classes.
Pekka Nissinen [Thu, 27 May 2010 11:30:22 +0000 (14:30 +0300)]
Corrected wrong method call in UserInfo::setProfileImage()
Jussi Laitinen [Thu, 27 May 2010 10:37:23 +0000 (13:37 +0300)]
Merge branch 'master' into network_handler
Jussi Laitinen [Thu, 27 May 2010 10:36:00 +0000 (13:36 +0300)]
Network classes reviewed.
Jussi Laitinen [Thu, 27 May 2010 09:51:59 +0000 (12:51 +0300)]
Added no caching attribute to ImageFetcher and SituareService requests.
Jussi Laitinen [Thu, 27 May 2010 09:18:57 +0000 (12:18 +0300)]
Moved network related files from src/engine to src/network.
Pekka Nissinen [Thu, 27 May 2010 07:33:59 +0000 (10:33 +0300)]
Removed obsolete referencies from tests.pro
Pekka Nissinen [Thu, 27 May 2010 07:20:47 +0000 (10:20 +0300)]
Redrawed zoom buttons to follow Fremantle Master Layout Quide size suggestions
and made a few minor cosmetic fixes to zoombuttonpanel.cpp
Ville Tiensuu [Thu, 27 May 2010 06:43:55 +0000 (09:43 +0300)]
moved test from own test class to TestMapEngine class.
moved data const from common.h to engine.cpp
Kaj Wallin [Thu, 27 May 2010 05:10:29 +0000 (08:10 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Kaj Wallin [Thu, 27 May 2010 05:09:52 +0000 (08:09 +0300)]
Fixed test project files so no debug is printed
Reviewed by:
Jussi Laitinen [Thu, 27 May 2010 05:00:51 +0000 (08:00 +0300)]
Merge branch 'master' into network_handler
Sami Rämö [Wed, 26 May 2010 14:20:23 +0000 (17:20 +0300)]
Test script removes unit test binaries after testing
- Binaries are removed so they are not annoying in the list
of untracked files if commit is made without compiling
tests after running the script.
Kaj Wallin [Wed, 26 May 2010 13:51:22 +0000 (16:51 +0300)]
Merge branch 'zoom_button_drag'
Kaj Wallin [Wed, 26 May 2010 13:50:30 +0000 (16:50 +0300)]
Fixed some test cases
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 13:23:52 +0000 (16:23 +0300)]
Merge branch 'master' into zoom_button_drag
Conflicts:
src/common.h
tests/ui/zoombuttonpanel/zoombuttonpanel.pro
Pekka Nissinen [Wed, 26 May 2010 13:21:03 +0000 (16:21 +0300)]
Removed obsolete references to OpenGL
Kaj Wallin [Wed, 26 May 2010 13:19:11 +0000 (16:19 +0300)]
Removed obsolete unittest
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 13:12:25 +0000 (16:12 +0300)]
Finished zoom panel drag feature fixes
Reviewed by: Marko Niemelä
Jussi Laitinen [Wed, 26 May 2010 12:55:34 +0000 (15:55 +0300)]
Changed NetworkAccessManager to use Singleton.
Ville Tiensuu [Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Conflicts:
doc/test_cases/functionality-tests.doc
Ville Tiensuu [Wed, 26 May 2010 12:26:21 +0000 (15:26 +0300)]
final fixing after merge
Katri Kaikkonen [Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)]
Merge branch 'userinfo'
Conflicts:
doc/test_cases/functionality-tests.doc
lampehe-local [Wed, 26 May 2010 11:54:33 +0000 (14:54 +0300)]
Added comments
Jussi Laitinen [Wed, 26 May 2010 11:48:48 +0000 (14:48 +0300)]
Merge branch 'master' into network_handler
Conflicts:
src/engine/engine.h
src/src.pro
Jussi Laitinen [Wed, 26 May 2010 11:32:21 +0000 (14:32 +0300)]
Added method to queue requests if not connected to network.
Katri Kaikkonen [Wed, 26 May 2010 11:26:41 +0000 (14:26 +0300)]
Added minor changes to userinfo
Reviewed by: Marko Niemelä
lampehe-local [Wed, 26 May 2010 11:26:34 +0000 (14:26 +0300)]
third draft
Ville Tiensuu [Wed, 26 May 2010 11:14:00 +0000 (14:14 +0300)]
Merge branch 'show_gps_location_on_first_start'
lampehe-local [Wed, 26 May 2010 10:53:15 +0000 (13:53 +0300)]
Merge branch 'master' into cookies_refactored
Conflicts:
src/common.h
src/src.pro
Ville Tiensuu [Wed, 26 May 2010 10:45:41 +0000 (13:45 +0300)]
Final fixing.
Reviewed by: Pekka Nissinen
lampehe-local [Wed, 26 May 2010 10:45:41 +0000 (13:45 +0300)]
Second draft, credentials are not saved to settings anymore. WebView is
still alive for application's life span
Kaj Wallin [Wed, 26 May 2010 10:30:38 +0000 (13:30 +0300)]
Fixed faulty release logic for ZoomButtonPanel
Reviewed by:
Kaj Wallin [Wed, 26 May 2010 10:11:41 +0000 (13:11 +0300)]
Removed timer from zoombutton, created new signals and fixed some logics
Reviewed by:
Ville Tiensuu [Wed, 26 May 2010 10:07:46 +0000 (13:07 +0300)]
changed implementation of setZoomLevel in mapEngine
Sami Rämö [Wed, 26 May 2010 08:52:39 +0000 (11:52 +0300)]
Merged master with test script modifications
Conflicts:
tests/ui/friendlist/friendlist.pro
lampehe-local [Wed, 26 May 2010 08:45:41 +0000 (11:45 +0300)]
First draft, credentials are still saved to settings
Sami Rämö [Wed, 26 May 2010 08:02:29 +0000 (11:02 +0300)]
Use up-to-date tests and run in test directory
- Reviewed by Ville
- delete unit test binaries and run qmake & make for
tests.pro so unit tests run are always up-to-date
- run each unit test in it's directory so test finds
it's test data placed in it's directory
Jussi Laitinen [Wed, 26 May 2010 08:01:43 +0000 (11:01 +0300)]
Deleted friendlist binary from tests.
Jussi Laitinen [Wed, 26 May 2010 07:58:16 +0000 (10:58 +0300)]
Added NetworkReply class.
Jussi Laitinen [Wed, 26 May 2010 07:05:38 +0000 (10:05 +0300)]
Modified gpspositionprivate.h headers.
Kaj Wallin [Wed, 26 May 2010 05:54:41 +0000 (08:54 +0300)]
Had zoom panel drag fetaure reviewed. Updated functional tests.
Reviewed by: Henri Lampela
Kaj Wallin [Wed, 26 May 2010 05:20:24 +0000 (08:20 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Jussi Laitinen [Tue, 25 May 2010 12:58:24 +0000 (15:58 +0300)]
Added automatic location update timer to Engine. Modified settings in
settingsdialog.
Ville Tiensuu [Tue, 25 May 2010 12:52:21 +0000 (15:52 +0300)]
final fixing
Pekka Nissinen [Tue, 25 May 2010 12:40:51 +0000 (15:40 +0300)]
Corrected led image dropshadows
projects / situare / log