summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Zoltan Papp [Mon, 1 Jun 2009 06:16:11 +0000 (09:16 +0300)]
Merge branch 'master' into dev_local
Zoltan Papp [Mon, 1 Jun 2009 06:14:56 +0000 (09:14 +0300)]
Merge branch 'master' into dev_local
Conflicts:
src/BusinessLogic/UIManager.h
Jan Lapinkataja [Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)]
Confilcts solved
Conflicts:
src/BusinessLogic/Engine.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
Jan Lapinkataja [Fri, 29 May 2009 10:04:46 +0000 (13:04 +0300)]
Operation mode changing related defects corrected.
Mikko Siren [Fri, 29 May 2009 09:47:16 +0000 (12:47 +0300)]
Modified the dialog signaling to prevent idle screen coming from visible while dialog is shown. Does not work for progress bar right now.
Mikko Siren [Thu, 28 May 2009 13:06:57 +0000 (16:06 +0300)]
Empty line at the end of file
Mikko Siren [Thu, 28 May 2009 13:05:21 +0000 (16:05 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 13:05:18 +0000 (16:05 +0300)]
Fixed the room status indicator view partly. Image is still not shown
Jan Lapinkataja [Thu, 28 May 2009 12:29:09 +0000 (15:29 +0300)]
Confilct solved
Conflicts:
src/BusinessLogic/UIManager.h
Jan Lapinkataja [Thu, 28 May 2009 12:26:57 +0000 (15:26 +0300)]
Corrected the password dialog and progress bar related errors. Texts and titles of those were incorrect and cancel button was visible during operation mode change.
Mikko Siren [Thu, 28 May 2009 10:21:51 +0000 (13:21 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 10:21:45 +0000 (13:21 +0300)]
Changed something cannot remember what
Zoltan Papp [Thu, 28 May 2009 10:11:27 +0000 (13:11 +0300)]
Changes to screen saver mode connection status handling
Zoltan Papp [Thu, 28 May 2009 10:08:16 +0000 (13:08 +0300)]
Merge branch 'master' into dev_local
Conflicts:
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/UserInterface/WindowManager.h
Jan Lapinkataja [Thu, 28 May 2009 09:26:29 +0000 (12:26 +0300)]
Merge branch 'jasa'
Jan Lapinkataja [Thu, 28 May 2009 09:25:28 +0000 (12:25 +0300)]
Meeting detaild cancel button correction
Mikko Siren [Thu, 28 May 2009 08:15:59 +0000 (11:15 +0300)]
Added first fetching of meetings trough UIManager
Mikko Siren [Thu, 28 May 2009 07:27:55 +0000 (10:27 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Mikko Siren [Thu, 28 May 2009 07:27:50 +0000 (10:27 +0300)]
Commented the UIManager include file
Jan Lapinkataja [Thu, 28 May 2009 06:57:35 +0000 (09:57 +0300)]
Merge branch 'jasa'
Jan Lapinkataja [Thu, 28 May 2009 06:52:34 +0000 (09:52 +0300)]
Changes to error texts
Zoltan Papp [Thu, 28 May 2009 06:08:11 +0000 (09:08 +0300)]
Added no connection indicator to screen saver mode (no logic implemented yet)
Simo Puonti [Thu, 28 May 2009 05:56:04 +0000 (08:56 +0300)]
Merge branch 'dev_puontsi' into master_merge
Simo Puonti [Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)]
Merge branch 'master' into master_merge
Mikko Siren [Wed, 27 May 2009 14:14:44 +0000 (17:14 +0300)]
Merge
Mikko Siren [Wed, 27 May 2009 13:54:44 +0000 (16:54 +0300)]
Got the new stuff working, last commit before final pull push
Jan Lapinkataja [Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Conflicts:
src/BusinessLogic/Engine.cpp
Jan Lapinkataja [Wed, 27 May 2009 13:35:42 +0000 (16:35 +0300)]
Auto refresh of meetings showed wrong meetings (Task id 1166)
Mikko Siren [Wed, 27 May 2009 13:10:04 +0000 (16:10 +0300)]
Merged the engine
Mikko Siren [Wed, 27 May 2009 13:05:51 +0000 (16:05 +0300)]
Merged and got it partly working
Jan Lapinkataja [Wed, 27 May 2009 12:46:20 +0000 (15:46 +0300)]
Merge finished
Simo Puonti [Wed, 27 May 2009 12:27:47 +0000 (15:27 +0300)]
Summer time/winter time/Timezone changes done
Mikko Siren [Wed, 27 May 2009 11:10:50 +0000 (14:10 +0300)]
Got something working
Jan Lapinkataja [Wed, 27 May 2009 10:26:33 +0000 (13:26 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Conflicts:
src/BusinessLogic/Engine.cpp
src/UserInterface/Views/WeeklyViewWidget.h
Jan Lapinkataja [Wed, 27 May 2009 10:13:45 +0000 (13:13 +0300)]
Re-implemented the showing of meetings (Task id 1166). Corrected the errortable order so that correct error messages are now shown.
Simo Puonti [Wed, 27 May 2009 09:00:54 +0000 (12:00 +0300)]
fixed the pro-file
Simo Puonti [Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)]
Merge branch 'master_merge' into dev_puontsi
Conflicts:
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/DateTimeSettings.cpp
Simo Puonti [Wed, 27 May 2009 07:28:26 +0000 (10:28 +0300)]
added the conf file changes
Simo Puonti [Wed, 27 May 2009 07:26:12 +0000 (10:26 +0300)]
Work done for the date/time..
Mikko Siren [Wed, 27 May 2009 06:54:02 +0000 (09:54 +0300)]
Merged
Mikko Siren [Wed, 27 May 2009 06:45:03 +0000 (09:45 +0300)]
Still working
Zoltan Papp [Wed, 27 May 2009 06:40:54 +0000 (09:40 +0300)]
Merge branch 'master' into dev_local
Conflicts:
src/BusinessLogic/Engine.cpp
itkonma [Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Conflicts:
src/BusinessLogic/Engine.cpp
Zoltan Papp [Tue, 26 May 2009 11:50:09 +0000 (14:50 +0300)]
Merge branch 'master' into dev_local
Conflicts:
src/BusinessLogic/Engine.cpp
Mikko Siren [Tue, 26 May 2009 11:46:46 +0000 (14:46 +0300)]
UIManager and some functionality
Simo Puonti [Tue, 26 May 2009 11:08:14 +0000 (14:08 +0300)]
changes done by simo
Zoltan Papp [Tue, 26 May 2009 11:05:42 +0000 (14:05 +0300)]
First commit to dev_local, trying to merge with .
Kimmo Teerimaki [Tue, 26 May 2009 10:33:58 +0000 (13:33 +0300)]
Removed commented code.
itkonma [Tue, 26 May 2009 10:20:59 +0000 (13:20 +0300)]
When moving from Room Status View to Weekly View, the current week of default room is shown
Kimmo Teerimaki [Tue, 26 May 2009 10:19:21 +0000 (13:19 +0300)]
Timezone offset.
Zoltan Papp [Tue, 26 May 2009 09:43:40 +0000 (12:43 +0300)]
date/time configuration implementation in progress..
Jan Lapinkataja [Tue, 26 May 2009 09:30:04 +0000 (12:30 +0300)]
Enabled the error sending from Operation Mode changing. And corrected some possible bugs. (Task id 1168)
Mikko Siren [Tue, 26 May 2009 07:54:06 +0000 (10:54 +0300)]
Merged
Mikko Siren [Tue, 26 May 2009 07:43:41 +0000 (10:43 +0300)]
ViewBase added and major changes to use the new architecture
Jan Lapinkataja [Fri, 22 May 2009 12:53:38 +0000 (15:53 +0300)]
Progress bar related updating
Jan Lapinkataja [Fri, 22 May 2009 08:18:56 +0000 (11:18 +0300)]
Doxygen documentation added
Jan Lapinkataja [Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Conflicts:
src/UserInterface/Utils/ProgressBar.cpp
Jan Lapinkataja [Fri, 22 May 2009 07:58:35 +0000 (10:58 +0300)]
New thread class (OperationodeToggler) created in DeviceControl module to send sub-status signals to progress bar (Task id 1168)
Ossi Jormakka [Fri, 22 May 2009 07:17:31 +0000 (10:17 +0300)]
Task #1170 Progress bar for meeting details pop-up
Jan Lapinkataja [Wed, 20 May 2009 11:52:16 +0000 (14:52 +0300)]
Merge branch 'jasa'
Jan Lapinkataja [Wed, 20 May 2009 11:51:06 +0000 (14:51 +0300)]
ProgressBar connections modified + Progress Bar class itself updated
Ossi Jormakka [Wed, 20 May 2009 08:06:13 +0000 (11:06 +0300)]
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
Conflicts:
QtMeetings.pro
src/main.cpp
Ossi Jormakka [Wed, 20 May 2009 07:58:52 +0000 (10:58 +0300)]
Multiple simultaneous request support to Communication
Jan Lapinkataja [Wed, 20 May 2009 07:33:48 +0000 (10:33 +0300)]
Merge branch 'jasa'
Jan Lapinkataja [Wed, 20 May 2009 07:27:06 +0000 (10:27 +0300)]
- Re-factored the code so that Engine is now the main class that owns WindowManager and contains all the logical parts of it (Task 1176)
- Some updating to progress bar class relation with operation mode change (Task 1168)
Jan Lapinkataja [Tue, 19 May 2009 13:55:15 +0000 (16:55 +0300)]
Testing if the name is now correct. Two previous commits mistakely committed with Papp Zoltan.
Zoltan Papp [Tue, 19 May 2009 13:41:28 +0000 (16:41 +0300)]
Moved the logicasl part of the progresbar/password dialog from WindowManager to Engine (related to tasks 1168 and 1169)
Zoltan Papp [Tue, 19 May 2009 12:28:55 +0000 (15:28 +0300)]
Re-factored the basic idea of the application: Engine is the main class that ownsWindowManager from now on.
Ossi Jormakka [Tue, 19 May 2009 06:25:11 +0000 (09:25 +0300)]
qtmeetings sources to Maemo garage
Ossi Jormakka [Wed, 13 May 2009 08:33:34 +0000 (11:33 +0300)]
Maemo garage GIT testing
www-data [Fri, 24 Apr 2009 15:10:15 +0000 (18:10 +0300)]
welcome
projects / qtmeetings / log