commit | 514564b18942b28738763123903cf6a391cf4d31 | [log] [tgz] |
---|---|---|
author | Ali Lown <ali@lown.me.uk> | Sat Sep 26 12:04:18 2015 +0100 |
committer | Ali Lown <ali@lown.me.uk> | Sat Sep 26 12:04:18 2015 +0100 |
tree | 1d31bfb0e8718f6393f0a883cd08a1486ff9b575 | |
parent | 28eb7a7dda68197892d22f00b19cbc72ff80095d [diff] |
Import Roshan's work during GSoC'15 This is a squashed merge commit containing the following: commit b53495061143c22d373ee07237a0a28af0bb6498 Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Sep 5 17:52:08 2015 +0530 Adding chatNewFriendActivity and chat_new_friend_activity commit b473c3c180be2ddfe44a772de350a2fe556fdd4a Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Sep 5 17:51:09 2015 +0530 Adding chatNewFriendActivity and chat_new_friend_activity commit 576a1a938dfdbb909be7be69635c7b8ea9c226ae Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 29 17:35:21 2015 +0530 Adding layout activity commit ea51ccca78993e0167d25c6520c0ff828ab20d66 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 28 16:39:00 2015 +0530 Updating the SelectFriendActivity and AndroidMainifest commit 865f9c825f4efd36bbc2ad9f71a3751441e7edc8 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 28 10:48:42 2015 +0530 Updating the ChatNewWaveActivity commit 80b993164be7c953404d5efd7bcff2df31a314dd Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 28 10:21:56 2015 +0530 Updating the ChatNewWaveActivity and ChatNewWaveFragment commit 25143f245765008f520586e2cc3bc38fbaf0a2af Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 28 08:48:11 2015 +0530 Updating the activity and fragment commit 18eea220277d8aa5ab985bf06242b0b772569c83 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 27 11:44:59 2015 +0530 Updating the activity and adding chat_new_wave_fragment commit 43490906f346fe87bfb8fca1c394cf4772006380 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 27 11:07:53 2015 +0530 Updating the chat activity and adding chat fragment commit f7d00450cfa53adecb62ce390ad91bbb4a405547 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 26 18:23:19 2015 +0530 Updating the activitys commit 6650262994570de1a3da17d61a0ac80ede25c152 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 26 14:47:14 2015 +0530 Updating the activity commit 35b59667f4302126891a832cf3fb471d1f22dca6 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 26 10:21:31 2015 +0530 Updating the activity and fragment commit 5a390fae661c03feb47fd1d7210889d5507ef4b7 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 25 13:52:42 2015 +0530 Updating Activity and Fragment commit f7f5b8932eef6c5181eee47eb590c08ba6064aa5 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 25 09:11:01 2015 +0530 Updating NewWaveActivity and NewWaveFragment commit c1219a362f858c13bc920d3488b80cf3d5168874 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 25 09:05:01 2015 +0530 Updating NewWaveActivity and NewWaveFragment commit 716522e5f491cae041bad5bc85752bf390dd3fef Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 24 12:21:20 2015 +0530 Adding the Chat New Wave Fragment Activity commit 7d092a0e462dd6e62280c103dfc747657b2bee3f Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 16:17:33 2015 +0530 Updating the MessageAdapter, custom_message_row and strings commit 35d7302458c68d425ff7f100763bbba0700776e6 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 15:05:10 2015 +0530 Adding custom_message_row activity commit 94a37f1beaed2548b0afde14920b344538773bec Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 14:32:39 2015 +0530 Updating the InboxFragment Activity commit 8282e647a3454218df4d4c1e3bed4cf9b8d2d053 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 13:43:53 2015 +0530 Updating the chat New Activity commit 627ca99552ad9764ff7a58d9c7ef64ed99d18b38 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 11:38:32 2015 +0530 Updating the menu_main2 and the values of strings commit f26b7457cb0f9fc4e25273191c9769678842ba6d Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 11:33:42 2015 +0530 Updating the menu_main2 and the values of strings commit 5f2119dca95a058929c994d38b535a67f32dbd17 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 11:32:30 2015 +0530 Updating the menu_main2 and the values of strings commit 6c6d80f11312275f28f8001d62f4fdc43a1fe334 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 11:31:08 2015 +0530 Updating the menu_main2 and the values of strings commit dc2327537c34124d715dfa5c4098d22669e3839e Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 23 11:17:15 2015 +0530 Updating the NewWaveFragment commit 4acac2c1e4192adc85f23240d029e8422906c3f1 Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 22 21:40:38 2015 +0530 Adding Chat layout activity commit 13292f771fe5648470842edbbc0e4fa00d14531d Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 21 15:14:43 2015 +0530 Adding ic_action_next_item commit 777809ad1920824ce81df28acec0e20a87ad25da Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 21 15:03:03 2015 +0530 Adding list__item_layout activity commit 0c1b461a9133e223789a5eb12a3cc417805d15ff Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 21 14:36:01 2015 +0530 Adding the check image commit ebe3e2912938056e90e04763d89542c4100ca6b9 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 21 14:33:57 2015 +0530 Adding list_item layout commit ce661e8e189fa69c9958e91af54863063decdf97 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 21 14:14:56 2015 +0530 Updating Activity commit 4433b13bf98d8e8f5de45fe4f751a800f06d5267 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 20 13:58:52 2015 +0530 Updating Activity commit 7471b55da5ee4d56e68bcb3270614948a0876f09 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 19 14:15:03 2015 +0530 Adding the DataItem,DataSource and the DrawableProvider and also updating the build.gradle commit bab601d6fc701c0aa1dc704fdcea049c2d80dee4 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 19 11:15:41 2015 +0530 Adding the MessageAdapter commit 921eabc502bf58a74428e694a1ef3a84ee84b27d Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 18 16:44:29 2015 +0530 Updating the new Wave activity commit 0c29a2203576e37375646be975e9c178345f4428 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 18 15:48:46 2015 +0530 Updating the letter images commit 9b6c53bb0ed9ef7c605b0924cbae9090f4f35992 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 18 15:40:52 2015 +0530 Adding the letter images commit a8e2b1cdbcfcec5e92d4393d223dd36b26548b0b Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 15 18:05:04 2015 +0530 Adding List View Images to NewWaveFragment commit b4de446165e3835fd9d8f6083f80734f76eafa97 Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 15 17:26:09 2015 +0530 Adding drawable lette_a commit f9fff1ce99be9584ffadf0a779a4bb9b79e92d7c Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 15 12:35:29 2015 +0530 Adding the back button to the action bar in new wave activity commit 66da030bc0183cbf9c547cdf7166a5e72555d1a3 Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 15 11:08:48 2015 +0530 Updating InboxActivity commit 6ff56c63613987a07598c71b6e0287d40fed2124 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 14 19:18:35 2015 +0530 Adding the front action and back action images commit 192c619960cc14f64e7ad4dc1ccd818eaaa14c13 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Aug 14 10:29:02 2015 +0530 Adding the front button to the search commit b694312fdcc343e8097c638b0b413bb4804cb1db Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 13 14:46:59 2015 +0530 Updating the ListView in NewWave activity commit 47a3b04325e5e54c2adb66c26ad898bf7d0aabf8 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 13 13:42:59 2015 +0530 Updating the ListView in inbox activity commit 411041a74a65fe0252f5bb67264449b66efe2901 Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Thu Aug 13 09:33:06 2015 +0530 Adding background image to the slider commit e667e4b4cb50e12e081522f61a472dddaf1ba1f0 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 19:23:28 2015 +0530 Wave Connector is done commit 070601ecbef1ce9b6f0e5fdd2d277605767b3876 Merge: c96734b 8179f73 Author: roshan <roshan.2013020@iit.ac.lk> Date: Wed Aug 12 15:38:24 2015 +0530 Merge remote-tracking branch 'origin/master' commit c96734bf017117e48d72dc74a89f7b65f722436e Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 15:37:43 2015 +0530 Create wave (new wave) is done commit 8179f73444afe1f8a92ecb02a831019c4cffe72e Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Wed Aug 12 13:52:49 2015 +0530 Updating the slider and inbox activity commit 9599ad0c4bfeb4b5cea8e6ff939ff9189ef2b8ac Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 12:32:07 2015 +0530 Adding the scroll view to inbox activity commit d8633952f0c402c28e36dd021773448018920900 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 11:57:35 2015 +0530 Updating the inbox activity commit 6d0c52f4864d8a35c55c8eaa9f532df68a30ee9e Merge: 7459ae2 31567ed Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Wed Aug 12 11:55:27 2015 +0530 Merge remote-tracking branch 'origin/master' commit 7459ae29a173508fd2e4875ac00ebcbeb763e721 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 11:52:54 2015 +0530 Updating the floating action button commit 31567ed56eaac95f0d40d626cca629519c2b7c0c Merge: e3d99a4 133f6d8 Author: roshan <roshan.2013020@iit.ac.lk> Date: Wed Aug 12 11:13:54 2015 +0530 Merge remote-tracking branch 'origin/master' commit e3d99a4fea4afd74917c4318068b5471bb10266e Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 11:13:28 2015 +0530 Wave create mode is done commit 133f6d80a8c2f67b1e8b0fb2f378ce4f70b31b15 Merge: bbcbfc8 5f99a66 Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Wed Aug 12 10:14:54 2015 +0530 Merge remote-tracking branch 'origin/master' commit 5f99a664f504ef5fcf5713e8bf2066b7b5329c03 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 10:09:45 2015 +0530 Wave render init is done commit bbcbfc85b244f73b852681ecc6f688de91352831 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 10:09:11 2015 +0530 Updating the slider and inbox activity commit 646fcfe28890275a4e0cdabaa9b14fde61266abd Merge: 1edfbb6 6f5fef3 Author: roshan <roshan.2013020@iit.ac.lk> Date: Wed Aug 12 09:47:12 2015 +0530 Merge remote-tracking branch 'origin/master' commit 1edfbb653249a7ca2c1bd782f23af9271a0cfefb Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 09:46:46 2015 +0530 Wave render started commit 6f5fef3731b82511e4641db876e6887e749ce7c1 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 12 09:12:42 2015 +0530 Updating the inbox activity commit c0ccb0c0c363c11207cdfd566582bc0066243dc0 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 11 21:49:14 2015 +0530 Wave model started commit e03f0c94dfeb759c871d67ed7582160dc9aeb4c7 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 11 14:15:35 2015 +0530 Wave Web Socket Connection close commit 937f9e7ada6306a1ed4b22ce6b051c99811a3ba8 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 11 14:13:00 2015 +0530 Wave Web Socket Connection is done commit ea1fb014c19795b4c6c78f7f605fe19b461f2ed4 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 11 14:03:35 2015 +0530 Add Wave Model wrapper commit 0d50c41e71b8dda08e8b9315f254b782824e0055 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Aug 11 09:14:38 2015 +0530 Updaing Ibox activity method test commit 638988fc97fb7da9b4b85eddf41c950d0879d74e Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 10 16:21:14 2015 +0530 Updating the tool bar, Adding the slider icon, Updating the search activity commit 32575905fccef19f31fdae4a3986493c7fe4edfe Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 10 12:03:26 2015 +0530 Adding the search action commit 893701a91423d562ba4f9cdc5ce4ff9afd9306d6 Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Mon Aug 10 11:55:41 2015 +0530 Adding the search action commit 50d5d15afcf4c91a72e26ad85dd39678e466870b Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 10 02:47:51 2015 +0530 Updating inbox Activity commit d7127ce2404021d6c248cd29f44c5288944982cc Author: unknown <roellk@ROELLK1.corpnet.ifsworld.com> Date: Sun Aug 9 16:31:16 2015 +0530 Adding the search activity commit db5fd950147ff5730c4ff3a8db682c78fce0960b Merge: eb9ce9c 146d5e6 Author: roshan <roshan.2013020@iit.ac.lk> Date: Sun Aug 9 09:50:35 2015 +0530 Merge remote-tracking branch 'origin/master' commit eb9ce9c0e23641b3a8cacff437ab6fc0a71c4f7b Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Aug 9 09:02:01 2015 +0530 WaveWebSocket updated commit 146d5e673448f10bbc521cbc3ddcf3da2fc1faac Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 8 14:50:01 2015 +0530 Udating inbox Activity commit 6a221c88c4d60d7ece63c9e1472c3bdb4d9eb21b Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 8 14:45:44 2015 +0530 Changing the Login Activity commit 31622817c807a320be1f8620e03079d32da9a57a Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Aug 8 06:59:59 2015 +0530 New Model interface added commit 64aa5e58299a0a92c256c10af1dce44cec9d8281 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 6 10:31:27 2015 +0530 Add external jars including Apache Wave common class commit 4d372d60fd015c096326c11cfe0e37705e64f158 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Aug 6 10:26:01 2015 +0530 Fix issues commit f4f7b34f4d8dca3aca12404d70006b158240b52a Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 5 13:29:17 2015 +0530 Fix web socket issues commit 137a6027166d2596a46c56ac5e92825b659114d7 Author: TinTin911 <roshanrox911@gmail.com> Date: Wed Aug 5 06:49:07 2015 +0530 Updated the Inbox Activity commit 3eb4bb5b4116b41264426646f1eb375a98877ec5 Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 3 19:20:25 2015 +0530 Fix issues commit 920d94f57fb1fdd19a445d0368e9f60698ffef7e Author: TinTin911 <roshanrox911@gmail.com> Date: Mon Aug 3 15:32:21 2015 +0530 Reformat code structure commit 120a67b1c7de0626607dd84c0f21c984c91aee4e Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Jul 26 10:55:12 2015 +0530 Updating the slider commit 2e60dec193bdcb82451153c4b60cb78e2f1c0115 Author: TinTin911 <roshanrox911@gmail.com> Date: Tue Jul 14 22:45:26 2015 +0530 Updating the NewWave commit 91e12bfdae85719c7f0d79bcf60cd09753100bd1 Author: TinTin911 <roshanrox911@gmail.com> Date: Sun Jul 12 01:06:51 2015 +0530 Add the Floating Button commit c97db6dca99368ff7564283c3467049ff432c2f0 Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Jul 11 23:48:20 2015 +0530 updating the action bar search icon commit 5b83911703f978c69fd99289d25f04f1716b48da Author: TinTin911 <roshanrox911@gmail.com> Date: Sat Jul 11 22:59:19 2015 +0530 Updated the action bar commit 44ca1b33c089ee1de48a6e48f99fca6e30e122e4 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 10 06:14:57 2015 +0530 Creating new Wave commit af47bccbaf1d65d97755a4cab40407110b029b57 Author: TinTin911 <roshanrox911@gmail.com> Date: Thu Jul 9 05:48:48 2015 +0530 modify commit 4442c43ab914bedd20005630f7dcb28a1d1ff447 Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Tue Jul 7 16:47:41 2015 +0530 Add acton bar commit 3774a09d71af1b84d796939e7b16394519a52d2a Merge: 68aae26 d64a20d Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Tue Jul 7 16:44:26 2015 +0530 Merge branch 'master' of https://github.com/TinTin911/android-wave Conflicts: .idea/workspace.xml commit 68aae26b9b8f1643e19bb4cbc8263dbece159c77 Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Sun Jul 5 20:16:45 2015 +0530 Fix few issues commit d64a20d2f4b20f715e9a90555fee863bd143e1d0 Merge: b926291 90a682e Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 23:10:15 2015 +0530 Updating commit b9262913b1cba9e0b0d25f422177b01bd92537af Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 23:07:36 2015 +0530 Updating action bar resources commit 90a682e09cd1dc63a60533d394eb6cc605f42dd5 Merge: da607a9 3a5bf3c Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 22:50:41 2015 +0530 Updating the action bar added the search icon commit da607a9d630e2334f4a3155f22def91f40e666c8 Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 22:15:29 2015 +0530 Added the search icon commit 3a5bf3cd1d221adb8d983bc495b1a6fcc5c8e54e Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 20:05:19 2015 +0530 Updating the Action Bar commit 97fd47501e47a2ba804c3821d7bca1e4e913c8db Author: TinTin911 <roshanrox911@gmail.com> Date: Fri Jul 3 11:10:11 2015 +0530 modify the activity_inbox commit 1cb79a564dba05d976ac7180413f62b7ea9941c5 Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Thu Jul 2 19:06:06 2015 +0530 Sign to Wave server is done. commit 61008a0b35720b02ab9640812d34df9da0ac8a02 Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Thu Jul 2 00:38:12 2015 +0530 Fix issues in Sign Up and add licence commit 2b2aaa7727f8423ebc7355c5cd45b2278d50c7e6 Author: Roshan <roshan.2013020@iit.ac.lk> Date: Wed Jul 1 20:58:30 2015 +0530 SignUp is done. commit 7d4025e2332f05ee14ebfd8f2c6ab67402cef233 Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Wed Jul 1 13:52:58 2015 +0530 Android app for Apache Wave commit 0691541f96622013c335fc8cf9330ebdeec943eb Author: Roshan Lakmal Elvitigala <roshanrox911@gmail.com> Date: Wed Jul 1 12:48:51 2015 +0530 Initial commit
“Wave in a Box” (WIAB) project is a stand alone wave server and rich web client that serves as an Apache Wave reference implementation. Apache Wave site: http://incubator.apache.org/wave/ This project lets developers and enterprise users run wave servers and host waves on their own hardware. And then share those waves with other wave servers.