summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: Increase version code for version 1.4HEADmasterCaroline Chao2014-10-301-1/+1
| | | | | Change-Id: Iac5d70f9b7aa33fd06e1eb36f350265be354f165 Reviewed-by: Niels Weber <niels.weber@digia.com>
* iOS: Increase version to 1.2Caroline Chao2014-10-301-2/+2
| | | | | Change-Id: I24a424be3e62eac2b55f4df0564dab955f2dd7fb Reviewed-by: Niels Weber <niels.weber@digia.com>
* Decrease font of upcoming events' labelCaroline Chao2014-10-291-1/+1
| | | | | Change-Id: I22d19f0dc771aa7e793663e5a25aa58ce6fe814a Reviewed-by: Niels Weber <niels.weber@digia.com>
* Improve Breaks handlingCaroline Chao2014-10-291-1/+17
| | | | | | | If the time does not fit, do not display it. Change-Id: I2381aeb548444117c276db20a2adbb07153f2b10 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Android: Increment version to 1.4Caroline Chao2014-10-271-1/+1
| | | | | Change-Id: Id90f316ae63f0de2cf495aae6144041a1cc988a4 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Force models update when eventsModel is empty while reloadingCaroline Chao2014-10-273-5/+10
| | | | | | | Even if the authentication state is "Authenticated". Change-Id: I659f3a899540b15a845ee54376d2f0846e1db25b Reviewed-by: Niels Weber <niels.weber@digia.com>
* Android: Increment version to 1.3Caroline Chao2014-10-271-1/+1
| | | | | Change-Id: Idb84e4c51ba23e16ee97e5b07d2c240a54bc9588 Reviewed-by: Niels Weber <niels.weber@digia.com>
* iOS: Increment version to 1.1Caroline Chao2014-10-271-2/+2
| | | | | Change-Id: Iad65bbc4145b40f3ee6bc6a212dd81478f28ece5 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Improve offline to online handlingCaroline Chao2014-10-275-12/+74
| | | | | | | Enable data loading without restarting the application. Change-Id: I7e4d9ba221759426c5e8df770d53787ce0f61524 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Add a status message when changing conference in HomeScreenCaroline Chao2014-10-273-12/+32
| | | | | | | Load cached data if any or state no cached data is available. Change-Id: I3ea00c98272e77680fd3dbd1672ed37eab9fb248 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Twitter reload: request authentication on "bad authentication error"Caroline Chao2014-10-231-2/+10
| | | | | | | | | Currently we only authenticate on Component.onCompleted. When switching between offline and online mode, authentication is now also possible to get the tweets. Change-Id: I760d7178e62c611d33763a444836d22ca1ee26a5 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Add a "no cached data" message when no data is availableCaroline Chao2014-10-222-0/+15
| | | | | | | Used for offline mode. Change-Id: Ie09b53c0a084d17de33d63f05a9e3a96a6427599 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Increase size of clickable area for the reload buttonsCaroline Chao2014-10-221-2/+6
| | | | | | | Both for upcoming news and twitter data. Change-Id: If11daecce30f3b4bc36e9210afeed08f52d08b85 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Hide menu when poping to previous page on back keyCaroline Chao2014-10-221-0/+1
| | | | | Change-Id: Ib0c7d04efd2df6c32aaf285429c84b0e46ed5bcc Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Fix Models::reset() functionCaroline Chao2014-10-211-5/+3
| | | | | | | Call begin/end ResetModel instead of RemoveRows. Change-Id: Ica960b84343c9f76781cfd9eea237365ef4151da Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Increase space between conference selection buttonsNiels Weber2014-10-172-2/+3
| | | | | Change-Id: I94f8944c2ba5a2e40bcf99c76f2d7e93c5f84def Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fixes in Feedback pageCaroline Chao2014-10-172-16/+18
| | | | | | | | | - Use TextArea instead of TextEdit - Add cliping to the TextArea - Increase rating stars size Change-Id: Ia2104c0b57605c22d3a7693e37d7c6af9ddbeec6 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Alignment changes in the HomeScreenCaroline Chao2014-10-171-17/+31
| | | | | Change-Id: Ic3ef8d2bae9257b2fd75c77a66e9c548cb641d37 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Move Schedule to lower position in menuNiels Weber2014-10-171-1/+1
| | | | | Change-Id: Ibcc98f296716b3aa9db9501fb06a786f52bfa6d8 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Make button border same color as button itselfNiels Weber2014-10-171-1/+1
| | | | | Change-Id: I1fc85bed2b0d256d4889f241ab2ba2a88ec08c8a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Align on the right the reload buttons with the application menuCaroline Chao2014-10-161-2/+2
| | | | | | | In the HomeScreen page. Change-Id: I4530b2dd694ec99b6588aa05740bd7dc3df225a2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Increase the white margin at the bottom of the Presentation DetailsNiels Weber2014-10-161-1/+1
| | | | | Change-Id: I6135792df4858e094b25b6a68d6745671ef24c91 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Twitter, show date when elapsed time is over 24 hoursCaroline Chao2014-10-161-5/+1
| | | | | Change-Id: I9f02342fed9c7aadb9ebdf3e114325e45e933c27 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Make tweets a bit calmer color wise.Niels Weber2014-10-161-6/+7
| | | | | Change-Id: I01d3bb615399aa515d772c8f4155b7d143841590 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix the city not been displayed properly in the "home" menu itemCaroline Chao2014-10-161-0/+5
| | | | | Change-Id: I5fabd30d0e3552895fb3ed1cf2175ae3c212cc34 Reviewed-by: Niels Weber <niels.weber@digia.com>
* "12:00 | Room" instead of "12:00 - Room" on HomescreenNiels Weber2014-10-161-1/+1
| | | | | Change-Id: I8d7193e3fb66205c16ca5d768253425fdf860c43 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Home screen gets same font size as Presentation DetailsNiels Weber2014-10-161-6/+11
| | | | | Change-Id: I483056d24b79563fa99ac2fa68cda86299439e6d Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Replace location icon by back and home textCaroline Chao2014-10-154-74/+23
| | | | | | | | | | Display "home" when page opened is not an event/feedback or floorplan or if the poped page would be the home page (page depth equal to two). Location.svg is not used anymore, removing it. Change-Id: I990d330a61e3f58392b8077c4f073044df7399be Reviewed-by: Niels Weber <niels.weber@digia.com>
* Changes in the event details page designCaroline Chao2014-10-152-56/+60
| | | | | Change-Id: Ic65ffa9ea849e480db36b3e8a70186a25580d9dd Reviewed-by: Niels Weber <niels.weber@digia.com>
* Add a link to conference Website to menuNiels Weber2014-10-152-3/+9
| | | | | Change-Id: Ic8367a306fb9306320a478adfa5208a8afa9bf76 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Update qt developer days logoCaroline Chao2014-10-141-109/+2
| | | | | Change-Id: Id15c0637e96e0941aeae384b591f3440e7ab3b4b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Add conference id to events and favoritesNiels Weber2014-10-144-8/+8
| | | | | Change-Id: I9bfa2aad533a1de595a4509a3549410205d7d951 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* In the event view, open the floorplan page when clicking the room nameCaroline Chao2014-10-142-0/+6
| | | | | Change-Id: If39d8841816cf6d50bac4be3aa260a0d8955d0f2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Remove useful info section from HomeScreenNiels Weber2014-10-146-369/+2
| | | | | | | | Items are all available through the menu. This gives more space for upcoming and news. Change-Id: Ice5920dad233dcc066ca0050ce9b6fd22f0947fd Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Update twitter time displayCaroline Chao2014-10-131-6/+9
| | | | | | | Created time should be displayed in local time. Change-Id: Iea4028039ce62c54d062e25520f57f97ed7eb576 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix optimization in getTimeRangeCaroline Chao2014-10-131-4/+4
| | | | | Change-Id: Ifa0753f0ad54c4fd75414071fc9c077c550da8c4 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Don't submit "empty" feedback text when only rating is givenCaroline Chao2014-10-131-1/+2
| | | | | Change-Id: I021bec6fcb44c498ca66f1621ce362d716aedbaa Reviewed-by: Niels Weber <niels.weber@digia.com>
* Update time display in Twitter viewCaroline Chao2014-10-101-1/+24
| | | | | | | Show time elapsed or date if tweet created more than 6 days ago. Change-Id: Ib72a70adaff6b4d598044b28510b914a0a1b0b34 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Small fix in TweetModelCaroline Chao2014-10-101-1/+1
| | | | | | | jsonResponse is not defined in reload() Change-Id: I1bd9718d0a33594cb2ac05452528bbbdd3b37d9f Reviewed-by: Niels Weber <niels.weber@digia.com>
* Enable reload of upcoming events from HomeScreenCaroline Chao2014-10-102-18/+60
| | | | | Change-Id: I28c2bb9bd75ee49882a3a58f803ad889ec1d052e Reviewed-by: Niels Weber <niels.weber@digia.com>
* Check index validity before querrying data from modelCaroline Chao2014-10-091-2/+6
| | | | | Change-Id: Ifa48f526e9da38116ecfe5572cfad5cbb48208b8 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Android: increment version to 1.2Caroline Chao2014-10-091-1/+1
| | | | | Change-Id: Ic29f6a562ec8b8a903f77d4eef1bad1485ea89e6 Reviewed-by: Niels Weber <niels.weber@digia.com>
* iOS: increase build numberCaroline Chao2014-09-291-1/+1
| | | | | Change-Id: I835504861336468935ec822d829ee02672ad5f05 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Android: Increment versionCaroline Chao2014-09-291-1/+1
| | | | | | | Now version 1.1. Change-Id: Ide1b86266848db4d1e8d0ec9dca36c1d536b4465 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Use TextEdit instead of TextAreaCaroline Chao2014-09-261-2/+2
| | | | | | | Workaround to fix a crash on iOS with unreleased 5.4 beta. Change-Id: I9c97ecc8ac99dffbd0dfbbc01224014093b15cac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix getTimeRangeCaroline Chao2014-09-261-14/+24
| | | | | | | | If the first/last Breaks are not Event as well, we can miss some intermediate times when joining the Events and Breaks time ranges. Change-Id: I71da8a9363ab0f97e46d0667ba034acf0c9690eb Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix Model inconsistency when data changesCaroline Chao2014-09-262-40/+47
| | | | | Change-Id: I05538074c83e8b9e4ba37b10e2b90a33f7a21891 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Rework back / home buttonNiels Weber2014-09-261-8/+11
| | | | | | | | | | Make it more consistent and intuitive: Only Feedback and event page have back arrow as they are logically sub pages. All other pages have the location button that leads back to the homescreen. Change-Id: I7c0cadb05b461032b0fb77d22c25df7a688f52dc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Always take into account the minutes when getting the end hourCaroline Chao2014-09-261-15/+7
| | | | | | | | So for example if the end time is 10:30 we jump to 11:00 for the end hour. Change-Id: I429b64305063f0925f9f3836bfa40da33841f3cb Reviewed-by: Niels Weber <niels.weber@digia.com>
* Prepend debug- to username in debug modeNiels Weber2014-09-261-0/+4
| | | | | | | So we can filter out those users later. Change-Id: Idbc857454c9370b58f41a7116cbc2eac2a7696a2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>