add google conversion tracking code 1.34 maps exception null creator bug ignore file build 1.33 Build 1.33 issues fix. ARC conversion ARC convert facebook Auto login alert question service map service 1.32 issues PUT verb with body workarounds implementing API v 2.6 wiki image resolution in CQ1 learning link as tag in CQ4 architecture fix 1.31 Images in diffirent screens signup enhancements issues #14 #14 test2 test issues issues start new battle fix issues 1.30 1.30 1.30 issues issues enhances download images Afnetworking 2 enhancements Issue #55 Issue #55 Cocapods Issue #57 #61 #58 Issues #67 #63 issue #63 Issue #66 Issue #54 Issue #61 clean ADS chat facebook SDK SDK4 Facebook SDK4 facebook SDK vfbfriends under test new FB SDK 4 4th Q error + first Q speed q1 slower Merge: 0c25079 4cdeb49 Merge branch 'master' of git.wokcraft.com:wokcraft/QK7 into master1 # Conflicts: # WOKbattle2/Quiz King-Info.plist build #41 #42 #43 map annotations change w it user photos type error Issue #30 in progress Issue #35 #28 #26 #29 #31 #32 #33 closes#28 Fix FB crash when search issue Build 1.29 , application crash when error happen from server side , or connection error while submitting the answer 1.29 help setting related to GIT revision number Erik validation for home screen language flag issue closes#21 close#23 close#22 added nx to sbmit answer service #18 scoreboard when address not set facebook 3 apps new login/regeister design access token service issue the new subdomain api “platform” = “qk” small issues apply new submission technique Fix put services apply access token Profile: iPhone 6; 3 buttons shall be lower 3,99 USD shall be not fixed in USD for other markets like SEK in Sweden sound- map-scoreboard setting user profile data issue for state remove DS_Store files 1.25 - new design for login screen. - text fix in Languages screen. - unfollow woke A2 service - popup crash fix in create question wikipage new formula header date crach in review round screen Scoreboard clean after WOKers press , when no WOKers issues vconfirm question for real question creation change password service - popup validation. - when error happens in load questions or categries make application go to home screen. - home screen notification fix when battle is finished . - change passwords check between multiple applications , multiple deivices and cached accounts. - change password screen fix. - change password service to A2. - fixed CQ3 like WOKwiki. - Facebook login issue, was opening web dialog instead of Facebook application dialog - double battles issue, checking when reading from cache if there is any doubling happen new gitlab languages with flags Pågående WOKbattle -> Pågående Quizkamp refresh bar animating in home screen issues sent device id for regiestering device for push notifications uialertview wrapper popups scoreboard issue after release application name dynamically in whole application workaround for submit round issue bold font in first circle score login pages for quizKampen create question with image CQ2 Review question with images (RQ) fixed this If I challenge Chris Alonso. : I just have a note "This fight will be in another language". I should know its in arabic. - > This battle will be in arabic. - fixed Bug: Scoreboard WOKers -updated user profile service as requested by server side - fixed inapppurchase bug - enhanced wikipage images speed - localize scoreboard to sweden - fixed profile page question with image create quesion with images issues facebook-wokbattle issue issues question view QuizKampen help files QuizKampen question image image question with image questions with images scoreboard A2 issues issues issue isseues issues issues issues issues nearby nearby issues issues issues wokbits issues issues issues issues issues issues issues home service parsing issue API2 device token vreview issue issues 1.18 categories && home notifications && caching issues issues issues A2 and EB battles from start to finish A2 A2 Home+ battles A2 issues profile-Fbfriends-nearbyplayers-graph screen A2 question reveiw (tags and learning links) search Wokers random WOKer profile Page User Data API2 Lgoin API2 but commented v1 1.16 Fight start round review API2 help file logo round review API2 issues API2 load count in WIKI add question add tags and learning links issues issues release 1.16 issues Merge: 5b93a23 29137ed Merge remote-tracking branch 'origin/master' added Quiz King Calling from WOKwiki register + home notification issues Design issues for Create Questions. GG and EB Tag screen Tag Service Learning Links bug for not work Adding a tag now linked to Wikipedia article issues issues wbsession issues German- Portages German issues localization home screen ongoing - finished battle images image caching notifications cases for cancel and finish battles push notifications inside app push notifications scores of battle graph screen issues WOKbits stability issues stability of home screen + Facebook issue ADS Fix x46 support + ADS Language setting Application language - arabic application icons - ADS arabic facebook Help issues - shake issue Merge: b97ea50 b96b36b Merge remote-tracking branch 'origin/master' Fixed issues Merge: fd94f8b 5754e19 Merge remote-tracking branch 'origin/master' Facebook Login isuue Screen no.9 bug Solve share issue to Facebook and help screen Solve loading issue Merge: 615adb4 08f62b5 Merge remote-tracking branch 'origin/master' Solve Help screen bug but still it has one localisation issue to solve. Handle API2 post to Wall. issues hide battle Merge: 16b4e48 0704d00 Merge remote-tracking branch 'origin/master' Fix Help screen in English bug fight word to Battle in notifications request Setting + help +questions reviews chat notifications in home screen issues Scoreboard issue. Merge: 31d98d6 f03279a Merge remote-tracking branch 'origin/master' Issues Fixed English App Settings version in phone settings issues issues Home screen stability caching battles Home Screen stability Fixing issues , home screen, graph issue, Answered Time Localizing Help Screens issues fixing issues Repeated Categories Issue. Merge: a6bf490 8272c57 Merge remote-tracking branch 'origin/master' 1- Last round issue. 2- Graph screen was appearing before finishing the Battle. 3- Forced Battle Issue, didn't have winner ID. Change images for correct and incorrect images fixing issues Missing play button after finish a Battle Translate texts : 166, 168, 169, 196 in help screens. Merge: bdc2a99 8cd89ef Merge remote-tracking branch 'origin/master' System files! Edit Invite scenarios to facebook. Setting + chat issues chat issue Merge: ed53641 70c42ff Merge remote-tracking branch 'origin/master' User profile screen issue New Facebook API 2.0 Merge: ead2d7c d05d86a Merge remote-tracking branch 'origin/master' Solve simple issues of versioning and get the newest build Fix chat issue upload to apple Fixing issues fixing facebook login crach fixing issues Golden Merge: 20b2e78 dd8e1e1 Merge remote-tracking branch 'origin/master' A. Chat date issue --- > This message from Souki Soukaina has been recorded in database by this date "2014-11-02 12:20:48", so this message has been sent in the afternoon not in the morning B. Chat Send Button ------>Done C. 100/166 issue Top bar and Scoreboard -------> I’ve increased width of Box for 100/166, and made the name box only show first 15 characters if more it puts “…” . D. 224 issue ——> It’s a bug from server output, it repeats some categories , I asked MH, he told he doesn’t have time now, so I handled it from client side. E. Localuzation files 3 New —— > added 3 new languages in the application Facebook invitation issue fix fixed a crash problem Add new scheme Solve Apple rejection reasons, users who already purchased an item are no allowed to purchase again. Starting Facebook API 2.0 migration 40% Solve Notification issue internally. commoit Solve the Ads problem. Add the missing arabic target to wikiparser.m file. fixed wiki icon search in review and create question pages fixed UI of tag page to make service more clear fixed create question autfill wikipedia article was missed fixed map issue for iOS8 build 1.1 arabic in app purchase added Merge: 4fedb95 948af22 Merge remote-tracking branch 'origin/master' adding arabic target Twitter code and files fixed top battles again according to EB design requiirmentsx colour of 3 headlines in battles stats are purple fixed colours for top battles in user profile battle header line fixed fixed give up issue top battle statistics is fixed in user profile Nadine issue in scoreboard is fixed fixed list of battles in User profile Resizing for Scoreboard Table Progress on Battles list for a user Merge: fb82de3 e632eec Merge remote-tracking branch 'origin/master' added new iTunes launch images Detect links in chat messages. Give up issue. Search for WOkers page -Search with user letters entrance like scoreboard user search -Scrolling should be made better so it is not considered a selection Merge: 6776e7f 3ad9871 Merge remote-tracking branch 'origin/master' coomit Get refresh time back to 15 seconds Fix load more battles when scroll down bug. Merge: 7cf397d 70177e9 Merge remote-tracking branch 'origin/master' Home pull feature new icons added Scoreboard All WOK" that need purple background as before Merge: 09dff3c db8c7cb Merge remote-tracking branch 'origin/master' Add the pull and refresh feature fixed loading categories when starting app with no internet changed loading images in Search user rows Fixed a scoreboard Unnoticed bug in getting data from selecting button of type category place and time then creating API Fixed Category Color for Cars and vechiles added battles to scoreboard in UI and API added a label to show that no result Merge: e307197 6b83513 Merge remote-tracking branch 'origin/master' Minus points resloving added battle with scoreboard EB edits to add version number in setting hide stats buttons in user profile page Commit GG change to solve the Golden round issue. Change the purchasing feature to be, when buy 4x, you will have 3x and 2x for free. added MC icon in user profile MC stats -Added Category table for MC in user profile page Added a Lock in the beginning of the fight in User Profile So Multiple Clicks Don’t add multiple fights Added a Lock in chat in fight so don’t open it multiple times Put back hide from scoreboard service API In review question page adding a link will add wiki article as a tag whether their is a tag or not Fixed a bug in user profile for begin chatting it starts a fight now it only adds a fight without starting it reaffixing the home page scroll top show more fixed home page scroll to show more battles Merge: d974041 14e2bd1 Merge remote-tracking branch 'origin/master' fixed home page resizing Choose category correct spelling. hidden setting API at it makes top bar as zero added online button and UI code to filter nearby online users fixed scoreboard fonts and rows layout with EB fixed image uploading compression quality factor from 0.5 to 1 for better images quality put scoreboard hide back added map online and offline annotation progress in Facebook image Merge: 0a349a3 443b0ed Merge remote-tracking branch 'origin/master' Now Home screen updates and refreshes itself, new finished or status updated battles appears normally. fixed table view screen size for 3.5 and 4 inch hide pie chart button stopped hide from scoreboard service until MH fix it fixed closing and opening up missing state name replaced state abbreviation until MH add state name in user data API Merge: 1c97e6c 2c895ac Merge remote-tracking branch 'origin/master' To get latest update added hide from scoreboard setting API added supporting State in Scoreboard & registering state name in user data change position number in scoreboard Not to be global postpone but as EB required fixed the bug in pie chart fixing memory leakage and releasing unused allocations Merge: 8cc9365 cdd0c94 Merge remote-tracking branch 'origin/master' Home page scroller is rewritten to UITableView to give much more enhanced speed memory leakage is downgraded but still many memory leakage occur Merge: 4a93a70 5523d35 Merge remote-tracking branch 'origin/master' has chosen - > has chosen spell error changed Merge: 46eba07 444e414 Merge remote-tracking branch 'origin/master' Edit the WOKer search function. refactoring bad code causing problem on BE with help of MH Merge: 4b6bc02 b93c93a Merge remote-tracking branch 'origin/master' fixing issue appeared in submitting user answers with MH Seperate Loading for the user image sending screen Solve loading old battles then refresh battles -> remove the old loaded battles bug. Image bug fixing, to be approved by EB Merge: ea24690 c910e78 Merge remote-tracking branch 'origin/master' No important changes, just for EB new build fixed the double wok bit as found that API calls once to 1- update the round with the answers then 2- submit answers which is a redundancy and double values so I removed the second submission added the pie chart colour values fixed user missing wok bits made progress in double wok bits issue , MH reported that answer are registered twice in BE and that mean it is sent twicee from App I am debuging to remove the extra one but could not found yet The stable tested version that doesn’t experienced the Golden round bug ever with me! Merge: 2039bef a5df4b2 Merge remote-tracking branch 'origin/master' Just to get the latest version Help file 5/ #165 translation for swedish. Merge: 12f3870 7d95eb1 Merge remote-tracking branch 'origin/master' Added Map Chart in profile page added integration for Get WOKbits for Categories API added missing User ID in edit question/add link API so server increase his WB by 10 Help file 5: Added in english: Clic on any round to review questions and learn more. (need arabic translation) working on learning link —> added user id in edit question but return php error disabled it until MH fix progress in learning link wok bits removed movers function and returned fixed sizes for scoreboard rows fixed Movers function API and UI changed localisation arabic text sent from MF test pushing Merge: 94020f9 479f8be Merge remote-tracking branch 'origin/master' Remove the dummy names in graph screen Merge: c46e60c aa911c4 Merge remote-tracking branch 'origin/master' fixed finished battle chat symbol fixed chat symbol in Fight page Merge: b1912a4 a3599df Merge remote-tracking branch 'origin/master' Solve the 4Q graph bug fixed scoreboard user profile bug Merge: 465d977 e75a637 Merge remote-tracking branch 'origin/master' fixed Wiki create question learning link issue Please clic W for Wikipedia help fixed row chat size fixed location in profile size fixed build problem by EB Localization in swedish for Upgrade Added Chat in Home page changed location icon to new MR in Profile page Map button added in user profile when clicked it open a map over profile page showing his location and pressing outside the map or on map button will remove it Release version Localization of Upgrade screen is done Add green row in first chat row Solve chat crash issue Double check to solve the fifth round crash Merge: f507556 0c934e2 Merge remote-tracking branch 'origin/master' Try to avoid the crash in 5th round added map icon in profile added chat icon in home to be integrated with API on sunday when MH finish them Merge: 753fdec 81da000 Merge remote-tracking branch 'origin/master' fixed scoreboard crash bug fixed scoreboard crash bug Merge: 6637240 c4320c0 Merge remote-tracking branch 'origin/master' Swedish Map popup “Vill du slå på kartfunktionen och se WOKers att spela med ?” inserted Merge: adeb68a 50c25bf Merge remote-tracking branch 'origin/master' added tags in user prifle from API service Merge: 4bb66e8 0238fa2 Merge remote-tracking branch 'origin/master' Solve the graph issue. added enabling scoreboard in phone setting added map pop up when disabled and if user accepts change map setting to enabled Merge: 41f7585 58e9f36 Merge remote-tracking branch 'origin/master' get latest version fixed category font W symbol: To large: Make it same size as the globe for language on the right. In Wikipedia link: It inherit the question in step 4: Remove. Clic on it and it has inherit the correct article. = It shall display the link and not the Q making fights between newly registered user and a robot added wiki btn image in Add question with Wiki added created tags UI in user profile Search in wikipedia article hide the search field: (Make it easier ) Merge: b33f9e1 ff88154 Merge remote-tracking branch 'origin/master' Solve the Arabic save language problem debuged map issue changed hide from map to show on map in iPhone setting language bug for saving the language to be same after restarting app is fixed home increased timer fixed setting page Merge: ef94d3a 62608b9 Merge remote-tracking branch 'origin/master' just to get the latest version wikipedia added in create question added Hide map setting UI Solve help screen inside Help after login. Merge: 9773cba 51c2fe0 Merge remote-tracking branch 'origin/master' To get the help screens Merge: 904741c 9f164e5 Merge remote-tracking branch 'origin/master' update changes made Checked the music bug solved. Merge: e945802 9a7f1f9 Merge remote-tracking branch 'origin/master' Nothing new. Merge: 62040db fcf16e2 Merge remote-tracking branch 'origin/master' Merge: 93239fa 838c2fe Merge remote-tracking branch 'origin/master' recheck music with app setting Merge: 853472c 9f164e5 Merge remote-tracking branch 'origin/master' fixed 1.03 Fix 9d help pic: QP7_off9c_140814.png Merge: 278d6b2 8e014a5 Merge remote-tracking branch 'origin/master' Change to 9c and 9d help files for learning link Merge: 9a9f1f6 375a0c0 Merge remote-tracking branch 'origin/master' Test back end bug solve Merge: a88c76f e320db9 Merge remote-tracking branch 'origin/master' sound bug fixed sound added in loading app and in loading review change WOK_API_Key with WOK-API-Key Merge: d8e085f 633ddf3 Merge remote-tracking branch 'origin/master' fixed localisation error added sweedish localisation Merge: f8754b7 ab3af0c Merge remote-tracking branch 'origin/master' automatic add tag when selecting learning link add localisation Merge: b5df9f9 ab3af0c Merge remote-tracking branch 'origin/master' Solve the d@diaa account new home loading bug. Add two new help screens Merge: 91ddb11 a0fb74f Merge remote-tracking branch 'origin/master' Just to pull fixed comma issue Merge: 3896cab a0fb74f Merge remote-tracking branch 'origin/master' map view fixed with two button your WOKers and other WOKers Merge: c2b2898 a0a8f63 Merge remote-tracking branch 'origin/master' Solve duplicated battles in home page. Merge: dc83a17 a0a8f63 Merge remote-tracking branch 'origin/master' music stops when loading is finished Add paging feature. Solve finished battles review screen. Merge: 0cff6fd 1305c89 Merge remote-tracking branch 'origin/master' Solve review page colours of circles issue. music playing forever bug is solved Merge: 92d016d 7e0e218 Merge remote-tracking branch 'origin/master' integrated online and offline services changed help menu image Merge: 9f3da5e 71e3aac Merge remote-tracking branch 'origin/master' removed adding location from login fixed tag of help button to enable localisation fixing wiki link bug map view profile pic rounded menu help button added to help pages Merge: 6547b29 16e6c38 Merge remote-tracking branch 'origin/master' Solve chat default image issue. Finetune english 196 Pollish the 196 Mission statement in english and fix off9.xib Updating xib files for Help screens with new design for July/ Aug. Updating english localization accordingly to new help screens. Change help pic 1 with Nearby Adding 194 and 195 text Syncing localize 181-193 in 5 language offline page added fixed wiki link according to app localization language Merge: fb687a0 2914f9a Merge remote-tracking branch 'origin/master' showed the copy to pasteboard to fill in did you know info fixed localisation os shake to play string in opponent page Merge: 25edbad 376a349 Merge remote-tracking branch 'origin/master' Chat design improve. fixed Create question Wikipedia adding and viewing articles Merge: 513d1a8 2d85c8f Merge remote-tracking branch 'origin/master' Change chat read work to sent and purple colour. Merge: 6fb4220 859a39a Merge remote-tracking branch 'origin/master' fixed map issue to make colour of Annotations according to being WOKer or not to the current User change in nearby API to add userID fixed search in wiki to resign search bar when user scrolls in the table Merge: 7d626ef 99728b7 Merge remote-tracking branch 'origin/master' try to solve the chat problemm Merge: a5bb06c 0e6bfe0 Merge remote-tracking branch 'origin/master' scoreboard fixed with yellow placeholder colour and localising placeholder string scoreboard search bar fixed with UI and functionality User Profile back issue fixed from going back only to scoreboard —> to go back to the calling page fixed alignment of learning link in review question Near by translation to Swedish. Solve Give problem. small fix on add button to be clickable all the time Merge: 74d2c34 4730322 Merge remote-tracking branch 'origin/master' fixed wikipedia article page view in quiz king 1. Chat local time. 2. add Unfollow option in opponent profile page. search for wiki Solve the graph issue Merge: 1c3d6d5 7a95ef2 Merge remote-tracking branch 'origin/master' Chat date Merge: 20950f6 6b47132 Merge remote-tracking branch 'origin/master' fixed searching in scoreboard Chat aside timing Merge: 4c6c31c e6681c3 Merge remote-tracking branch 'origin/master' Delete some redundant images. adding search bar to scoreboard fixed round image view in scoreboard added photos to scoreboard list fixed bug in joining map view with user profile Merge: b0e887f 4684b2e Merge remote-tracking branch 'origin/master' Chat tidemark and date. maps added real user location The chat messages date is done. Commit for mapView missing file Merge: 27a593f 9333c77 Merge remote-tracking branch 'origin/master' Question with images. Progress in Mapview to put points on the map and show nearby users fixed 24 h issue in scoreboard integrated WOK Location added get long lat in delegate for saving in WOKcraft changed Shake Image in get opponent and fix text in English localisation file 191 added Nearby button and shake image progress in Maps Merge: f094e1d f7c7f64 Merge remote-tracking branch 'origin/master' Set the english translation of the store screen for the Germany and Portuguese languages Merge: 4220916 4645ee4 Merge remote-tracking branch 'origin/master' fixed bad encoded characters Merge: 82dd22b e83bf00 Merge remote-tracking branch 'origin/master' Restore already purchased items when move from a device to another or when delete the app and re-install it. fixed encoding worked on wiki search Merge: 5057bba c47da6b Merge remote-tracking branch 'origin/master' Merge: 5077a32 078e8c1 Merge remote-tracking branch 'origin/master' Login and Signup with Quiz King + tagline fixed QK7_help_header_logo_tagline_140614.png Merge: 3fbd0e3 8d4842b Merge remote-tracking branch 'origin/master' After 1.02 sent 140626: EB changed WOK quiz from WOKbattle icons in top bar, review rounds, Facebook friends , congrats etc. Choose Category (not categories) in xib Wide space in menu for translations to fit Wide space for numbers when we pass 10000 users in Scoreboard fixed sound with iPhone setting removed language Merge: b975a34 f344cfa Merge remote-tracking branch 'origin/master' small edit in scoreboard Quiz Pro in Signup and Login changed. Quiz battle logo in pic changed before load from server. in Review placed purple splash screens reverted Facebook back Merge: a576ed0 de6c687 Merge remote-tracking branch 'origin/master' Svenska menyn fixad. Swedish fix. Merge: 9c09330 9129478 Merge remote-tracking branch 'origin/master' fixed cropping user image .DS Store WOkbattle played- > Quizbattles played in profile fixed fixed color of language fixed learning link in review question facebook isssue fixed smaa fix in review question tag Merge: 1bba14a 4edc26a Merge remote-tracking branch 'origin/master' fixed sound fixed tag issue Help 3 had help 5 pic. Now its Help 3 in 4 inch again added sound at the launching Merge: 6de9aeb fd514fc Merge remote-tracking branch 'origin/master' Portugues and German Language added to the App fixed add tag in review question for first time fixed tag spacing 58 c version 58 icon prob quiz battle text change fixing app icon different sizes added scrolling in you in wok and import Facebook friends when empty WOKers Merge: 14162f0 3706ab9 Merge remote-tracking branch 'origin/master' Merge: c1f565c 2cadbe9 Merge remote-tracking branch 'origin/master' Help issues remade 161-199 in english. Not changed due to Arabic and swedish translation in need to be made first. Merge: 9158e87 06481e7 Merge remote-tracking branch 'origin/master' fixed scoreboard crash as a result of empty Null name Merge: 630aca8 b78732c Merge remote-tracking branch 'origin/master' Help text reorganized as 161-199, but not implemented added tags to review question audio file is played at correct and wrong answer Merge: 3857115 56c1c07 Merge remote-tracking branch 'origin/master' progress added for sound setting Merge: 9a14104 4a7e057 Merge remote-tracking branch 'origin/master' Merge: 539edd7 c3d6c28 Merge remote-tracking branch 'origin/master' Change the default user image. Change help pic 5 Language text for Application language switched 98/93 EB edit in Help text english and pic for Scoreboard zoom Merge: 9626cec 0661ca1 Merge remote-tracking branch 'origin/master' Latest and final help screens Merge: 9b512a4 1dddb36 Merge remote-tracking branch 'origin/master' Solve the help one more redundant dot in scroll views, change the order of them. Solve Keyboard in help screens issue and solve the Quiz Pro text issue. fixed country and setting with Music sound Edit help Screen Merge: 0c4d8a5 a2b301d Merge remote-tracking branch 'origin/master' The new purple app icons. fixed score percentage in review question fixed scoreboard notification to enter location if it was missing wbservice edit Change all app text to the new Quiz King instead of Quiz Pro, change apple store Url to refers to the new application-Quiz King- in the store instead of WOKbattle Solve the Push notification issue, and the loading in splash screen issue. Renaming the app to Quiz King Change the app icons to QuizKing, change the help screen icons, change login and change the splash screen fixed review question arabic to english