0000000000000000000000000000000000000000 147ab7b6875a47ce663cafe771b0213286bfec49 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500649892 -0400	clone: from git@gitlabv2.xe.com:xeta/android.git
147ab7b6875a47ce663cafe771b0213286bfec49 147ab7b6875a47ce663cafe771b0213286bfec49 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500650058 -0400	reset: moving to HEAD
147ab7b6875a47ce663cafe771b0213286bfec49 fb4309babbb2330d99f0bbbe0f5ed8fb179d559b Qingbo Jiang <qingbojiang@noble154.xe.com> 1500650070 -0400	checkout: moving from master to ns-XETA-Init
fb4309babbb2330d99f0bbbe0f5ed8fb179d559b 4b751fe4082219e3a06bf25716af599902a0cf02 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500664442 -0400	pull: Fast-forward
4b751fe4082219e3a06bf25716af599902a0cf02 05a42661754358773ab884b61e7db933f9170910 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500902817 -0400	pull: Fast-forward
05a42661754358773ab884b61e7db933f9170910 05a42661754358773ab884b61e7db933f9170910 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500990389 -0400	checkout: moving from ns-XETA-Init to qj-XETA-MetadataRequest
05a42661754358773ab884b61e7db933f9170910 58c07784182afb079b39be3e5c92e60fdde29358 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500990418 -0400	commit: added mock metadata request
58c07784182afb079b39be3e5c92e60fdde29358 0c561cb91fadf8db2b0387387e06f45c7c8a3d50 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500991684 -0400	commit: added tmicode case
0c561cb91fadf8db2b0387387e06f45c7c8a3d50 3b684615df30716d161d2fe7fc4467a116e19409 Qingbo Jiang <qingbojiang@noble154.xe.com> 1500996960 -0400	commit: added generic resource single observer
3b684615df30716d161d2fe7fc4467a116e19409 49233cab81ce71c235ef0fe6ec3c0a5052d79a96 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501082145 -0400	commit: clean up
49233cab81ce71c235ef0fe6ec3c0a5052d79a96 dd549c59af496cba51254ff89079fd42f8f19678 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501096080 -0400	commit: added a few placeholders
dd549c59af496cba51254ff89079fd42f8f19678 05a42661754358773ab884b61e7db933f9170910 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501254781 -0400	checkout: moving from qj-XETA-MetadataRequest to ns-XETA-Init
05a42661754358773ab884b61e7db933f9170910 feaf19bda53cc613e509cb4b26dd2fedc6d18c49 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501254783 -0400	pull: Fast-forward
feaf19bda53cc613e509cb4b26dd2fedc6d18c49 feaf19bda53cc613e509cb4b26dd2fedc6d18c49 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501254814 -0400	checkout: moving from ns-XETA-Init to qj-XETA-FragmentTesting
feaf19bda53cc613e509cb4b26dd2fedc6d18c49 8fb7d43c5eccf5b24edead91fe2b10644922a54b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501276033 -0400	commit: added fragments and onchange listener
8fb7d43c5eccf5b24edead91fe2b10644922a54b 8fb7d43c5eccf5b24edead91fe2b10644922a54b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501513120 -0400	reset: moving to HEAD
8fb7d43c5eccf5b24edead91fe2b10644922a54b 8fb7d43c5eccf5b24edead91fe2b10644922a54b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501516150 -0400	reset: moving to HEAD
8fb7d43c5eccf5b24edead91fe2b10644922a54b 8fb7d43c5eccf5b24edead91fe2b10644922a54b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501516504 -0400	reset: moving to HEAD
8fb7d43c5eccf5b24edead91fe2b10644922a54b 8fb7d43c5eccf5b24edead91fe2b10644922a54b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501516531 -0400	reset: moving to HEAD
8fb7d43c5eccf5b24edead91fe2b10644922a54b 2b345bd253ead8a3978686c811f6ad4edb6bccea Qingbo Jiang <qingbojiang@noble154.xe.com> 1501516558 -0400	commit: passing data through fragments
2b345bd253ead8a3978686c811f6ad4edb6bccea 50aa851f7fe9bd56a8651c9751b9d40f58ea28c7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501521622 -0400	commit: testing inter fragment communications
50aa851f7fe9bd56a8651c9751b9d40f58ea28c7 907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501522546 -0400	commit: butterknife textbinding
907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501524074 -0400	reset: moving to HEAD
907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 feaf19bda53cc613e509cb4b26dd2fedc6d18c49 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501524080 -0400	checkout: moving from qj-XETA-FragmentTesting to ns-XETA-Init
feaf19bda53cc613e509cb4b26dd2fedc6d18c49 6ae481f765c1dc706608819b298196fe1aac2460 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501524083 -0400	pull: Fast-forward
6ae481f765c1dc706608819b298196fe1aac2460 6ae481f765c1dc706608819b298196fe1aac2460 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501527621 -0400	reset: moving to HEAD
6ae481f765c1dc706608819b298196fe1aac2460 6ae481f765c1dc706608819b298196fe1aac2460 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501528815 -0400	reset: moving to HEAD
6ae481f765c1dc706608819b298196fe1aac2460 907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501528822 -0400	checkout: moving from ns-XETA-Init to qj-XETA-FragmentTesting
907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501529160 -0400	reset: moving to HEAD
907bbe524b6d25c02cdbb348bf1b0c5ccc0f9711 6ae481f765c1dc706608819b298196fe1aac2460 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501529164 -0400	checkout: moving from qj-XETA-FragmentTesting to ns-XETA-Init
6ae481f765c1dc706608819b298196fe1aac2460 6ae481f765c1dc706608819b298196fe1aac2460 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501529303 -0400	checkout: moving from ns-XETA-Init to qj-XETA-TopNavBar
6ae481f765c1dc706608819b298196fe1aac2460 1622fdb51d1481b19e1db484f435e5146057eba6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501534925 -0400	commit: replaces the content with the fragment
1622fdb51d1481b19e1db484f435e5146057eba6 bfd34f2c8d12355ecaa0d38025d1d401ef91bde6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501535878 -0400	commit: animator working
bfd34f2c8d12355ecaa0d38025d1d401ef91bde6 9561d1b62ff65525c3342cb89cbc9449dc1fd8a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501603066 -0400	commit: final mockup
9561d1b62ff65525c3342cb89cbc9449dc1fd8a6 5cfdc302150141b631937bf50b9390602a9af4bd Qingbo Jiang <qingbojiang@noble154.xe.com> 1501617764 -0400	commit: added actionbarsize
5cfdc302150141b631937bf50b9390602a9af4bd 5cfdc302150141b631937bf50b9390602a9af4bd Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682522 -0400	reset: moving to HEAD
5cfdc302150141b631937bf50b9390602a9af4bd 4de6ab783fe9fe1e2df7caa6e89ab0d475686a10 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682545 -0400	checkout: moving from qj-XETA-TopNavBar to ns-XETA-Design
4de6ab783fe9fe1e2df7caa6e89ab0d475686a10 a25ead5ed1ce20769962d25cc86a24274c8d3319 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682768 -0400	commit: XE temp toolbar
a25ead5ed1ce20769962d25cc86a24274c8d3319 5cfdc302150141b631937bf50b9390602a9af4bd Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682829 -0400	checkout: moving from ns-XETA-Design to qj-XETA-TopNavBar
5cfdc302150141b631937bf50b9390602a9af4bd 3726ccebdbd2a178fa72052dc1f93120e62ba2c6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682920 -0400	commit: added styling library
3726ccebdbd2a178fa72052dc1f93120e62ba2c6 a25ead5ed1ce20769962d25cc86a24274c8d3319 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501682933 -0400	checkout: moving from qj-XETA-TopNavBar to ns-XETA-Design
a25ead5ed1ce20769962d25cc86a24274c8d3319 a25ead5ed1ce20769962d25cc86a24274c8d3319 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501683118 -0400	reset: moving to HEAD
a25ead5ed1ce20769962d25cc86a24274c8d3319 3726ccebdbd2a178fa72052dc1f93120e62ba2c6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501683124 -0400	checkout: moving from ns-XETA-Design to qj-XETA-TopNavBar
3726ccebdbd2a178fa72052dc1f93120e62ba2c6 daa1a51f3ad38c29dff8a620fd152a4659c6bf4c Qingbo Jiang <qingbojiang@noble154.xe.com> 1501683153 -0400	merge ns-XETA-Design: Merge made by the 'recursive' strategy.
daa1a51f3ad38c29dff8a620fd152a4659c6bf4c 5ca110ef6c8399753f4a01c5620b56cc8893b830 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501687021 -0400	commit: clean up
5ca110ef6c8399753f4a01c5620b56cc8893b830 1303fd9c70436d8a495724ba2c08d9e5254d34b1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501687127 -0400	commit: clean up
1303fd9c70436d8a495724ba2c08d9e5254d34b1 c632831e768a24f26e0af473e25f0d398dfdc59f Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698057 -0400	commit: refractor styling
c632831e768a24f26e0af473e25f0d398dfdc59f a25ead5ed1ce20769962d25cc86a24274c8d3319 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698100 -0400	checkout: moving from qj-XETA-TopNavBar to ns-XETA-Design
a25ead5ed1ce20769962d25cc86a24274c8d3319 543947f137f581fc9dac9a984449143ca71b5138 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698103 -0400	pull: Fast-forward
543947f137f581fc9dac9a984449143ca71b5138 c632831e768a24f26e0af473e25f0d398dfdc59f Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698113 -0400	checkout: moving from ns-XETA-Design to qj-XETA-TopNavBar
c632831e768a24f26e0af473e25f0d398dfdc59f 8be8c1cfb99c71a4deb107e0499fe70263fd5701 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698299 -0400	commit (merge): merge from design
8be8c1cfb99c71a4deb107e0499fe70263fd5701 0e047490c6e0a5c77a0ef49aca1bdc839d377bbb Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698491 -0400	commit: pulling everything from styling library
0e047490c6e0a5c77a0ef49aca1bdc839d377bbb e1683b404e1e66697855e1ee258bad465285f858 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501698710 -0400	commit: refractor
e1683b404e1e66697855e1ee258bad465285f858 543947f137f581fc9dac9a984449143ca71b5138 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501703141 -0400	checkout: moving from qj-XETA-TopNavBar to ns-XETA-Design
543947f137f581fc9dac9a984449143ca71b5138 abbc9639894d6577e2dfb44c2e11b306fc8f117b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501703144 -0400	pull: Fast-forward
abbc9639894d6577e2dfb44c2e11b306fc8f117b abbc9639894d6577e2dfb44c2e11b306fc8f117b Qingbo Jiang <qingbojiang@noble154.xe.com> 1501703265 -0400	checkout: moving from ns-XETA-Design to qj-XETA-FabSpeedDial
abbc9639894d6577e2dfb44c2e11b306fc8f117b e5b5043702a054232e9cc1218412228b0af17b40 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501773621 -0400	commit: fab speed dial created
e5b5043702a054232e9cc1218412228b0af17b40 2883676ff3237e89dec5f26125dc6c369bfbabd6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501775683 -0400	commit: clean up
2883676ff3237e89dec5f26125dc6c369bfbabd6 5384899e7eccff7a553e56e82162b43326b36356 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501775693 -0400	checkout: moving from qj-XETA-FabSpeedDial to ns-XETA-16-DashboardMockup
5384899e7eccff7a553e56e82162b43326b36356 2883676ff3237e89dec5f26125dc6c369bfbabd6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501775706 -0400	checkout: moving from ns-XETA-16-DashboardMockup to qj-XETA-FabSpeedDial
2883676ff3237e89dec5f26125dc6c369bfbabd6 b1dac9439e9948cee1f4de974c5fa39a0d9bf64f Qingbo Jiang <qingbojiang@noble154.xe.com> 1501776889 -0400	commit (merge): merge from NS dashboard branch
b1dac9439e9948cee1f4de974c5fa39a0d9bf64f bc33623e9bdc7f88c1776fc8cae2602ca3794212 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501781891 -0400	commit: clean up
bc33623e9bdc7f88c1776fc8cae2602ca3794212 b29cc1e013004d712271b4e574e4c18301655c83 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501789123 -0400	commit: added mini fabs fading in and out
b29cc1e013004d712271b4e574e4c18301655c83 fb12cadae05058ddac409d2f1042af8b01e44bc1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501789784 -0400	commit: rotation added
fb12cadae05058ddac409d2f1042af8b01e44bc1 9b74ddf2457227e3903174e7b90ffee0304e6af5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501789900 -0400	commit: clean up
9b74ddf2457227e3903174e7b90ffee0304e6af5 b9c8825d6e89c6e1115685da04f52741a91d0502 Qingbo Jiang <qingbojiang@noble154.xe.com> 1501789992 -0400	commit: change rotation degree
b9c8825d6e89c6e1115685da04f52741a91d0502 7c5540de15ecb006edb1ec025ef090936f7817bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1501793110 -0400	commit: added text beside FABs
7c5540de15ecb006edb1ec025ef090936f7817bc 8e737ac9da38427a285d149d2042e67f5548fb9d Qingbo Jiang <qingbojiang@noble154.xe.com> 1501794984 -0400	commit: change fab title sample text
8e737ac9da38427a285d149d2042e67f5548fb9d 13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502198403 -0400	checkout: moving from qj-XETA-FabSpeedDial to ns-XETA-7-DashboardDesign
13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a 8e737ac9da38427a285d149d2042e67f5548fb9d Qingbo Jiang <qingbojiang@noble154.xe.com> 1502198414 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-FabSpeedDial
8e737ac9da38427a285d149d2042e67f5548fb9d 49438faf17cf4621030c7a15c29a7e1ba1e026a4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502199071 -0400	commit (merge): merge from xeta-7
49438faf17cf4621030c7a15c29a7e1ba1e026a4 13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502199085 -0400	checkout: moving from qj-XETA-FabSpeedDial to ns-XETA-7-DashboardDesign
13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a 49438faf17cf4621030c7a15c29a7e1ba1e026a4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502199279 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-FabSpeedDial
49438faf17cf4621030c7a15c29a7e1ba1e026a4 2999cdee36ec126221feab2e38bcdee7fa81f2b1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502199996 -0400	commit: merge conflict fixes
2999cdee36ec126221feab2e38bcdee7fa81f2b1 cc1fedacfa2ebd3d963866ea496b57f4230fee66 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502200284 -0400	commit: clean up
cc1fedacfa2ebd3d963866ea496b57f4230fee66 00e39f39e1260e233dd99f6639ac363f77c4038e Qingbo Jiang <qingbojiang@noble154.xe.com> 1502200335 -0400	commit: more clean up
00e39f39e1260e233dd99f6639ac363f77c4038e 13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502201446 -0400	checkout: moving from qj-XETA-FabSpeedDial to ns-XETA-7-DashboardDesign
13fd5d4e7c5b40efe88a47ba32ee74411bde9a3a 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502201449 -0400	pull: Fast-forward
314fc49c238e4e46acdf3f586742a9f039338e13 00e39f39e1260e233dd99f6639ac363f77c4038e Qingbo Jiang <qingbojiang@noble154.xe.com> 1502201619 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-FabSpeedDial
00e39f39e1260e233dd99f6639ac363f77c4038e 047144c09e6672f9083666b0ce513e807e09f8bb Qingbo Jiang <qingbojiang@noble154.xe.com> 1502201696 -0400	commit (merge): more merge conflicts from ronak's branch
047144c09e6672f9083666b0ce513e807e09f8bb d298a1170c5f194469b3a68af875b4c5df8e90ed Qingbo Jiang <qingbojiang@noble154.xe.com> 1502201923 -0400	commit: clean up
d298a1170c5f194469b3a68af875b4c5df8e90ed 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502202375 -0400	checkout: moving from qj-XETA-FabSpeedDial to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203043 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-TripsScrollView
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203053 -0400	checkout: moving from qj-XETA-TripsScrollView to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203071 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-TripsScrollView
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203335 -0400	checkout: moving from qj-XETA-TripsScrollView to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203360 -0400	reset: moving to HEAD
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203396 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-TripsScrollView
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203416 -0400	checkout: moving from qj-XETA-TripsScrollView to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502203962 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj&rp-XETA-18-TripAndExpenseListBase
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502204021 -0400	checkout: moving from qj&rp-XETA-18-TripAndExpenseListBase to qj-rp-XETA-18-TripAndExpenseListBase
314fc49c238e4e46acdf3f586742a9f039338e13 3a2ac33a4e79b22d85f665cc0809d310e196d4fc Qingbo Jiang <qingbojiang@noble154.xe.com> 1502204048 -0400	commit: init
3a2ac33a4e79b22d85f665cc0809d310e196d4fc 3a2ac33a4e79b22d85f665cc0809d310e196d4fc Qingbo Jiang <qingbojiang@noble154.xe.com> 1502204234 -0400	checkout: moving from qj-rp-XETA-18-TripAndExpenseListBase to qj-XETA-18-TripList
3a2ac33a4e79b22d85f665cc0809d310e196d4fc 9b18bbadae0d563a06565eccbed2afc0dbf258e2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502224957 -0400	commit: recycler and card view with buttons placeholder
9b18bbadae0d563a06565eccbed2afc0dbf258e2 f89b5c9d075bf6b8116729c2ebc64befcaaa7911 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502225664 -0400	commit: added animations and centered buttons
f89b5c9d075bf6b8116729c2ebc64befcaaa7911 874200096acb332ebec95dca5c545c1670f39f4a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286008 -0400	commit: disable scrolling by touch
874200096acb332ebec95dca5c545c1670f39f4a 6782d8d45a952be8adfe3afc98259229bb50101e Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286351 -0400	commit: clean up
6782d8d45a952be8adfe3afc98259229bb50101e 3a2ac33a4e79b22d85f665cc0809d310e196d4fc Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286610 -0400	checkout: moving from qj-XETA-18-TripList to qj-rp-XETA-18-TripAndExpenseListBase
3a2ac33a4e79b22d85f665cc0809d310e196d4fc 720ab360f2e438e98e506c3382f93c793aa3acf2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286649 -0400	checkout: moving from qj-rp-XETA-18-TripAndExpenseListBase to rp-XETA-18-ExpenseList
720ab360f2e438e98e506c3382f93c793aa3acf2 3a2ac33a4e79b22d85f665cc0809d310e196d4fc Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286656 -0400	checkout: moving from rp-XETA-18-ExpenseList to qj-rp-XETA-18-TripAndExpenseListBase
3a2ac33a4e79b22d85f665cc0809d310e196d4fc d8a01ec05ceb73361038120c66329e5c099c939a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502286899 -0400	commit (merge): merge ronak's recycler
d8a01ec05ceb73361038120c66329e5c099c939a e32504188ada2575e13c8394b1a7f3b7375b5e7b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502287785 -0400	commit (merge): added qingbo's recycler
e32504188ada2575e13c8394b1a7f3b7375b5e7b e32504188ada2575e13c8394b1a7f3b7375b5e7b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502289353 -0400	checkout: moving from qj-rp-XETA-18-TripAndExpenseListBase to qj-XETA-FabTripExpenseMockup
e32504188ada2575e13c8394b1a7f3b7375b5e7b 163bcd15f770d49d2f99b9e3967da88e76c6e52b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502289392 -0400	merge qj-XETA-FabSpeedDial: Merge made by the 'recursive' strategy.
163bcd15f770d49d2f99b9e3967da88e76c6e52b 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502290321 -0400	checkout: moving from qj-XETA-FabTripExpenseMockup to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 e32504188ada2575e13c8394b1a7f3b7375b5e7b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502291230 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-rp-XETA-18-TripAndExpenseListBase
e32504188ada2575e13c8394b1a7f3b7375b5e7b 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502291267 -0400	checkout: moving from qj-rp-XETA-18-TripAndExpenseListBase to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502292526 -0400	reset: moving to HEAD
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502292531 -0400	reset: moving to HEAD
314fc49c238e4e46acdf3f586742a9f039338e13 e32504188ada2575e13c8394b1a7f3b7375b5e7b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502292547 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-rp-XETA-18-TripAndExpenseListBase
e32504188ada2575e13c8394b1a7f3b7375b5e7b 163bcd15f770d49d2f99b9e3967da88e76c6e52b Qingbo Jiang <qingbojiang@noble154.xe.com> 1502298288 -0400	checkout: moving from qj-rp-XETA-18-TripAndExpenseListBase to qj-XETA-FabTripExpenseMockup
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502307296 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-SingleFabButton
314fc49c238e4e46acdf3f586742a9f039338e13 099f19b4caa4c90db3b04727f84138f45ea0d1b8 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502309229 -0400	commit: changing fab icon due to each fragment
e32504188ada2575e13c8394b1a7f3b7375b5e7b b8a6867000ef7d8f7c38a7bc4dda7dcb67dddc33 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502373447 -0400	commit: refractor and clean up
099f19b4caa4c90db3b04727f84138f45ea0d1b8 099f19b4caa4c90db3b04727f84138f45ea0d1b8 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502382513 -0400	reset: moving to HEAD
099f19b4caa4c90db3b04727f84138f45ea0d1b8 bf03b1093842ee9790208eb70369d03c063105db Qingbo Jiang <qingbojiang@noble154.xe.com> 1502383282 -0400	commit: added handling of fab button
bf03b1093842ee9790208eb70369d03c063105db 73e4d1ee52b68ca557b5bffbab50e1d51b712112 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502383374 -0400	commit: clean up
73e4d1ee52b68ca557b5bffbab50e1d51b712112 357eb10b147432ab90b12b53c3f18babd855bb11 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502387653 -0400	commit: remove toasts and clean up
357eb10b147432ab90b12b53c3f18babd855bb11 d83df8bc0731366d70f97c03001c99ed624b6280 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502387678 -0400	pull: Merge made by the 'recursive' strategy.
d83df8bc0731366d70f97c03001c99ed624b6280 2c8afce287595a0c8cf8de462d5187e31f1d39b0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502387841 -0400	commit: more clean up
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502388023 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-42-
314fc49c238e4e46acdf3f586742a9f039338e13 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502388036 -0400	checkout: moving from qj-XETA-42- to qj-XETA-42-CreateAddCurrencyPicker
314fc49c238e4e46acdf3f586742a9f039338e13 c9f6caf5bb8abf26919fd1d833e73f7db05646a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502388577 -0400	commit: added adapter
c9f6caf5bb8abf26919fd1d833e73f7db05646a6 742d887a0bf68d3aa43023abf6cc87acb92c97a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502399431 -0400	commit: added currencies adapters showing dummy currencies
742d887a0bf68d3aa43023abf6cc87acb92c97a0 b12ecec421aae9eef1550662815739646ad38efb Qingbo Jiang <qingbojiang@noble154.xe.com> 1502400049 -0400	commit: need to change toolbar
b12ecec421aae9eef1550662815739646ad38efb b1b121b9f86090b04e172edf643ec09e87142685 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502467439 -0400	commit: added toolbar with searchview
b1b121b9f86090b04e172edf643ec09e87142685 b1b121b9f86090b04e172edf643ec09e87142685 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502474445 -0400	reset: moving to HEAD
b1b121b9f86090b04e172edf643ec09e87142685 314fc49c238e4e46acdf3f586742a9f039338e13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502474487 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to ns-XETA-7-DashboardDesign
314fc49c238e4e46acdf3f586742a9f039338e13 44f753f942a65d5567fb369beaf105ef2c564365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502474489 -0400	pull: Fast-forward
44f753f942a65d5567fb369beaf105ef2c564365 b1b121b9f86090b04e172edf643ec09e87142685 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502474500 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-42-CreateAddCurrencyPicker
b1b121b9f86090b04e172edf643ec09e87142685 3dd79af7ceefe82753e3652276923caef3c3fc72 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502474745 -0400	commit (merge): merge from xeta-7
3dd79af7ceefe82753e3652276923caef3c3fc72 9e47694d0bcf18ea634b1a826032662b534a9010 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502479958 -0400	commit: added filter
9e47694d0bcf18ea634b1a826032662b534a9010 d82b94883ab9aa0b4d2448a2ee24b120ab460794 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502484303 -0400	commit: added indicator mockup
d82b94883ab9aa0b4d2448a2ee24b120ab460794 6aa33d6572a171a1a11fb4c21740e7c1c5210206 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502719046 -0400	commit: add currency list mockup
6aa33d6572a171a1a11fb4c21740e7c1c5210206 2bd81dd476da613c6d1e394caa90a5c7577e1aee Qingbo Jiang <qingbojiang@noble154.xe.com> 1502719455 -0400	commit: clean up
2c504f8578d2d4d5a1cafc2a6fce25eced5441ef f8c4e259b8127d8c693aa3895090d1852ec38b04 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502737787 -0400	commit: set querytextlistener
f8c4e259b8127d8c693aa3895090d1852ec38b04 99907976e67260bad8b54f99aed632dc5bbb7380 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502737957 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to ns-XETA-ApiDaoWithTmi4
99907976e67260bad8b54f99aed632dc5bbb7380 99907976e67260bad8b54f99aed632dc5bbb7380 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502810003 -0400	reset: moving to HEAD
99907976e67260bad8b54f99aed632dc5bbb7380 da07aa3be97b3facd0ce44e56b0da32fcaea1401 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502810007 -0400	pull: Fast-forward
da07aa3be97b3facd0ce44e56b0da32fcaea1401 f8c4e259b8127d8c693aa3895090d1852ec38b04 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502810030 -0400	checkout: moving from ns-XETA-ApiDaoWithTmi4 to qj-XETA-42-CreateAddCurrencyPicker
f8c4e259b8127d8c693aa3895090d1852ec38b04 44f753f942a65d5567fb369beaf105ef2c564365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502811245 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to ns-XETA-7-DashboardDesign
44f753f942a65d5567fb369beaf105ef2c564365 44f753f942a65d5567fb369beaf105ef2c564365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502811332 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-45-RefineDashboard
44f753f942a65d5567fb369beaf105ef2c564365 e13018741e614897c0c3a27f7f279f7952a12ce5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502818084 -0400	commit: save point
e13018741e614897c0c3a27f7f279f7952a12ce5 44f753f942a65d5567fb369beaf105ef2c564365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502818171 -0400	checkout: moving from qj-XETA-45-RefineDashboard to ns-XETA-7-DashboardDesign
44f753f942a65d5567fb369beaf105ef2c564365 f8c4e259b8127d8c693aa3895090d1852ec38b04 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502818202 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-42-CreateAddCurrencyPicker
f8c4e259b8127d8c693aa3895090d1852ec38b04 e906c7db81b6541bc4da243e5264d705323f3f04 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502821413 -0400	commit: changed search button/text to white, changed how to hide title
e906c7db81b6541bc4da243e5264d705323f3f04 e13018741e614897c0c3a27f7f279f7952a12ce5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502821607 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to qj-XETA-45-RefineDashboard
e13018741e614897c0c3a27f7f279f7952a12ce5 e13018741e614897c0c3a27f7f279f7952a12ce5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502822261 -0400	reset: moving to HEAD
e13018741e614897c0c3a27f7f279f7952a12ce5 e906c7db81b6541bc4da243e5264d705323f3f04 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502822268 -0400	checkout: moving from qj-XETA-45-RefineDashboard to qj-XETA-42-CreateAddCurrencyPicker
e906c7db81b6541bc4da243e5264d705323f3f04 da00b0dda61e604ed7598fe3d4c066a1c1cd81df Qingbo Jiang <qingbojiang@noble154.xe.com> 1502822312 -0400	pull: Fast-forward
da00b0dda61e604ed7598fe3d4c066a1c1cd81df 65949391847ec1efb7c5dcc9c2dcb3702a99f8ce Qingbo Jiang <qingbojiang@noble154.xe.com> 1502822810 -0400	commit: added cursor when searching
65949391847ec1efb7c5dcc9c2dcb3702a99f8ce e13018741e614897c0c3a27f7f279f7952a12ce5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502823175 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to qj-XETA-45-RefineDashboard
e13018741e614897c0c3a27f7f279f7952a12ce5 032a52bee99c6811b21942a25e02de22f5640d9f Qingbo Jiang <qingbojiang@noble154.xe.com> 1502829871 -0400	commit: fixed scrolling, added color tint to buttons if at end
032a52bee99c6811b21942a25e02de22f5640d9f 762b3a4dfa37eb471bed6435a54c47065eb50abe Qingbo Jiang <qingbojiang@noble154.xe.com> 1502894873 -0400	commit: dashboard refinements
762b3a4dfa37eb471bed6435a54c47065eb50abe 37d652b8c8c362a131c17aa1c804f7c0c1589243 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502902164 -0400	commit: added a refresh button
37d652b8c8c362a131c17aa1c804f7c0c1589243 9d82d681d7018c39f5af34398417124a76bb609a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502906104 -0400	commit: clean up
9d82d681d7018c39f5af34398417124a76bb609a 65949391847ec1efb7c5dcc9c2dcb3702a99f8ce Qingbo Jiang <qingbojiang@noble154.xe.com> 1502906428 -0400	checkout: moving from qj-XETA-45-RefineDashboard to qj-XETA-42-CreateAddCurrencyPicker
65949391847ec1efb7c5dcc9c2dcb3702a99f8ce a6d2a9482285c457a49aa067eb2a2580bd1901a9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502906453 -0400	checkout: moving from qj-XETA-42-CreateAddCurrencyPicker to ns-XETA-42-CurrencyPickerWithTmi4
a6d2a9482285c457a49aa067eb2a2580bd1901a9 a6d2a9482285c457a49aa067eb2a2580bd1901a9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502909544 -0400	reset: moving to HEAD
a6d2a9482285c457a49aa067eb2a2580bd1901a9 30f0033df0cf2381142cc428b0bf19c81afccaea Qingbo Jiang <qingbojiang@noble154.xe.com> 1502909546 -0400	pull: Fast-forward
30f0033df0cf2381142cc428b0bf19c81afccaea 30f0033df0cf2381142cc428b0bf19c81afccaea Qingbo Jiang <qingbojiang@noble154.xe.com> 1502912390 -0400	reset: moving to HEAD
30f0033df0cf2381142cc428b0bf19c81afccaea c68861fd1417c5b17362be3c4e4a6f11b68bcb8d Qingbo Jiang <qingbojiang@noble154.xe.com> 1502912392 -0400	pull: Fast-forward
c68861fd1417c5b17362be3c4e4a6f11b68bcb8d c68861fd1417c5b17362be3c4e4a6f11b68bcb8d Qingbo Jiang <qingbojiang@noble154.xe.com> 1502913530 -0400	reset: moving to HEAD
c68861fd1417c5b17362be3c4e4a6f11b68bcb8d 0c79811f8a264bb4094037f80f25b9d83065a5f5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502913537 -0400	pull: Fast-forward
0c79811f8a264bb4094037f80f25b9d83065a5f5 0c79811f8a264bb4094037f80f25b9d83065a5f5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502913612 -0400	checkout: moving from ns-XETA-42-CurrencyPickerWithTmi4 to qj-XETA-41-CurrencyPickerCleanUp
0c79811f8a264bb4094037f80f25b9d83065a5f5 16ccba99f4b196df23bd1647cd95a12b3e045a0a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502976907 -0400	commit: fixed crashing
16ccba99f4b196df23bd1647cd95a12b3e045a0a 7f0b69103ea3c6bac1af52a052199353352f28fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1502977267 -0400	commit: removed pinned currencies
7f0b69103ea3c6bac1af52a052199353352f28fd c4a623ad8522e7d55cfae3445d0e42a681032037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502979038 -0400	commit: passing entire metadataprovider over
c4a623ad8522e7d55cfae3445d0e42a681032037 309c1a6d7175615c4cc3bbece2b90ff65b59b101 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502979063 -0400	commit: passing entire metadataprovider over
309c1a6d7175615c4cc3bbece2b90ff65b59b101 bd81cfdcecfa341c95e7831d0ad4343a29a3b8cf Qingbo Jiang <qingbojiang@noble154.xe.com> 1502979100 -0400	checkout: moving from qj-XETA-41-CurrencyPickerCleanUp to ns-XETA-54-Tmi4Converter
bd81cfdcecfa341c95e7831d0ad4343a29a3b8cf 309c1a6d7175615c4cc3bbece2b90ff65b59b101 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502979386 -0400	checkout: moving from ns-XETA-54-Tmi4Converter to qj-XETA-41-CurrencyPickerCleanUp
309c1a6d7175615c4cc3bbece2b90ff65b59b101 b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502980891 -0400	commit: added flags, needs clean up
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502981225 -0400	reset: moving to HEAD
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca 0c79811f8a264bb4094037f80f25b9d83065a5f5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502981226 -0400	reset: moving to 0c79811f8a264bb4094037f80f25b9d83065a5f5
0c79811f8a264bb4094037f80f25b9d83065a5f5 b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502981356 -0400	reset: moving to b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502982286 -0400	reset: moving to HEAD
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502982685 -0400	reset: moving to HEAD
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca 7e51ae8af27e6b9a5afdf3c36ff7ebf9314d59de Qingbo Jiang <qingbojiang@noble154.xe.com> 1502982703 -0400	checkout: moving from qj-XETA-41-CurrencyPickerCleanUp to ns-XETA-PersistFragments
7e51ae8af27e6b9a5afdf3c36ff7ebf9314d59de b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1502983310 -0400	checkout: moving from ns-XETA-PersistFragments to qj-XETA-41-CurrencyPickerCleanUp
b2fa5b46cb5c43d315ea281c5bc8c97d16efe5ca ac5db8fadedebc9e4a82f9fa864b02856e9a4aa6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502984015 -0400	commit: redesign add currency layout
ac5db8fadedebc9e4a82f9fa864b02856e9a4aa6 44f753f942a65d5567fb369beaf105ef2c564365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502984026 -0400	checkout: moving from qj-XETA-41-CurrencyPickerCleanUp to ns-XETA-7-DashboardDesign
44f753f942a65d5567fb369beaf105ef2c564365 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1502984028 -0400	pull: Fast-forward
43f4bc2336494021ac9db7685d32f8b05008982a ac5db8fadedebc9e4a82f9fa864b02856e9a4aa6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502984040 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-41-CurrencyPickerCleanUp
ac5db8fadedebc9e4a82f9fa864b02856e9a4aa6 bc83ed788371026a1ea1d5cd1d17f5fd2148b072 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502985099 -0400	commit (merge): merge from xeta-7
bc83ed788371026a1ea1d5cd1d17f5fd2148b072 bc83ed788371026a1ea1d5cd1d17f5fd2148b072 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502991848 -0400	reset: moving to HEAD
bc83ed788371026a1ea1d5cd1d17f5fd2148b072 bc83ed788371026a1ea1d5cd1d17f5fd2148b072 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502995563 -0400	reset: moving to HEAD
bc83ed788371026a1ea1d5cd1d17f5fd2148b072 bc83ed788371026a1ea1d5cd1d17f5fd2148b072 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502998951 -0400	reset: moving to HEAD
bc83ed788371026a1ea1d5cd1d17f5fd2148b072 bc83ed788371026a1ea1d5cd1d17f5fd2148b072 Qingbo Jiang <qingbojiang@noble154.xe.com> 1502999659 -0400	reset: moving to HEAD
bc83ed788371026a1ea1d5cd1d17f5fd2148b072 a9753aa7e0eb2f7dec59ab025547929af673318f Qingbo Jiang <qingbojiang@noble154.xe.com> 1503003783 -0400	commit: removed nestedscrollview
a9753aa7e0eb2f7dec59ab025547929af673318f a9753aa7e0eb2f7dec59ab025547929af673318f Qingbo Jiang <qingbojiang@noble154.xe.com> 1503061953 -0400	checkout: moving from qj-XETA-41-CurrencyPickerCleanUp to qj-XETA-41-SubTaskAddUtils
a9753aa7e0eb2f7dec59ab025547929af673318f 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503065192 -0400	commit: added language for currency
75baebdaa2721d1774eb3593638f6205bc775ffd a9753aa7e0eb2f7dec59ab025547929af673318f Qingbo Jiang <qingbojiang@noble154.xe.com> 1503065284 -0400	checkout: moving from qj-XETA-41-SubTaskAddUtils to qj-XETA-41-CurrencyPickerCleanUp
a9753aa7e0eb2f7dec59ab025547929af673318f 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503065294 -0400	merge qj-XETA-41-SubTaskAddUtils: Fast-forward
75baebdaa2721d1774eb3593638f6205bc775ffd 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503065755 -0400	checkout: moving from qj-XETA-41-CurrencyPickerCleanUp to ns-XETA-7-DashboardDesign
43f4bc2336494021ac9db7685d32f8b05008982a 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503068153 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-53-CreateTrip
43f4bc2336494021ac9db7685d32f8b05008982a fcbe5c1a191d27af7f76bcd3e628b7f8cf60cf53 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503088051 -0400	commit: created create trip mock-up
fcbe5c1a191d27af7f76bcd3e628b7f8cf60cf53 ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503322716 -0400	commit: created mock up for initial create trip screen
ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503324785 -0400	reset: moving to HEAD
ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503324806 -0400	checkout: moving from qj-XETA-53-CreateTrip to qj-XETA-41-SubTaskAddUtils
75baebdaa2721d1774eb3593638f6205bc775ffd ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503325027 -0400	checkout: moving from qj-XETA-41-SubTaskAddUtils to qj-XETA-53-CreateTrip
ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503329500 -0400	checkout: moving from qj-XETA-53-CreateTrip to qj-XETA-55-MockWireFameDesigned
ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503329525 -0400	checkout: moving from qj-XETA-55-MockWireFameDesigned to qj-ns-XETA-55-MockWireframeDesign
ccb8a36ecfe7b28e74c856298fd0bc1149aabf13 54fabf94db3c3a319725270ff096323964e1304e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503329646 -0400	commit: mockup
54fabf94db3c3a319725270ff096323964e1304e 54fabf94db3c3a319725270ff096323964e1304e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503329721 -0400	checkout: moving from qj-ns-XETA-55-MockWireframeDesign to qj-XETA-55-CreateTripInitialPage
54fabf94db3c3a319725270ff096323964e1304e 3d4153aba3de715e5c5e90e89852b7fe994b97be Qingbo Jiang <qingbojiang@noble154.xe.com> 1503341187 -0400	commit: added calendar
3d4153aba3de715e5c5e90e89852b7fe994b97be 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503342881 -0400	commit: added checkmark placeholder
7249b9099d76e4d9281f0853cb5a9d5dc316d730 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345869 -0400	reset: moving to HEAD
7249b9099d76e4d9281f0853cb5a9d5dc316d730 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345890 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to ns-XETA-7-DashboardDesign
43f4bc2336494021ac9db7685d32f8b05008982a 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345904 -0400	reset: moving to HEAD
43f4bc2336494021ac9db7685d32f8b05008982a 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345919 -0400	checkout: moving from ns-XETA-7-DashboardDesign to qj-XETA-55-CreateTripInitialPage
7249b9099d76e4d9281f0853cb5a9d5dc316d730 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345922 -0400	reset: moving to HEAD
7249b9099d76e4d9281f0853cb5a9d5dc316d730 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345928 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to qj-XETA-55-CreateTripInitialPage
7249b9099d76e4d9281f0853cb5a9d5dc316d730 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345933 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to ns-XETA-7-DashboardDesign
43f4bc2336494021ac9db7685d32f8b05008982a cec1efef470f8872f1d917c27900629d1ed96339 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345953 -0400	checkout: moving from ns-XETA-7-DashboardDesign to dev
cec1efef470f8872f1d917c27900629d1ed96339 cec1efef470f8872f1d917c27900629d1ed96339 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503345971 -0400	checkout: moving from dev to dev
cec1efef470f8872f1d917c27900629d1ed96339 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503346022 -0400	checkout: moving from dev to qj-XETA-55-CreateTripInitialPage
7249b9099d76e4d9281f0853cb5a9d5dc316d730 7249b9099d76e4d9281f0853cb5a9d5dc316d730 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503346639 -0400	reset: moving to HEAD
7249b9099d76e4d9281f0853cb5a9d5dc316d730 7b0ef2115aadc668eb16926f779891021ac32776 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503348470 -0400	commit: clean up
7b0ef2115aadc668eb16926f779891021ac32776 7b0ef2115aadc668eb16926f779891021ac32776 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503412908 -0400	reset: moving to HEAD
7b0ef2115aadc668eb16926f779891021ac32776 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503412921 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to qj-XETA-41-SubTaskAddUtils
75baebdaa2721d1774eb3593638f6205bc775ffd 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413101 -0400	reset: moving to HEAD
75baebdaa2721d1774eb3593638f6205bc775ffd 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413115 -0400	reset: moving to HEAD
75baebdaa2721d1774eb3593638f6205bc775ffd 7b0ef2115aadc668eb16926f779891021ac32776 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413121 -0400	checkout: moving from qj-XETA-41-SubTaskAddUtils to qj-XETA-55-CreateTripInitialPage
7b0ef2115aadc668eb16926f779891021ac32776 98e977d0f8b5b255d8ed2e9b8fd602874bb04da7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413157 -0400	commit: save point
98e977d0f8b5b255d8ed2e9b8fd602874bb04da7 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413170 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to qj-XETA-41-SubTaskAddUtils
75baebdaa2721d1774eb3593638f6205bc775ffd 75baebdaa2721d1774eb3593638f6205bc775ffd Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413353 -0400	reset: moving to HEAD
75baebdaa2721d1774eb3593638f6205bc775ffd 98e977d0f8b5b255d8ed2e9b8fd602874bb04da7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503413361 -0400	checkout: moving from qj-XETA-41-SubTaskAddUtils to qj-XETA-55-CreateTripInitialPage
98e977d0f8b5b255d8ed2e9b8fd602874bb04da7 9e26e0e1cc4597c9c3607d4c96a118e231e687d0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503425789 -0400	commit: finished budget mockup 1.0
9e26e0e1cc4597c9c3607d4c96a118e231e687d0 1fa6abe38421dc9f6a15c9e259eced623276a60e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503426547 -0400	commit: removed focus on edit text on activity start
1fa6abe38421dc9f6a15c9e259eced623276a60e d9377ed4953e822f35165772a3adf5addc766771 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503519819 -0400	commit: fixes and adding/removing from budget categories
d9377ed4953e822f35165772a3adf5addc766771 70c87bf5b838db2b0d0c9fc2cafe5e4b6d184459 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503520260 -0400	commit: format
70c87bf5b838db2b0d0c9fc2cafe5e4b6d184459 cf894f483cfea3367b7881a718ad2381752db483 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503583572 -0400	commit: made textfields more responsive
cf894f483cfea3367b7881a718ad2381752db483 9e5aa91cf15e1bd00ad0805dc6d430e20da17205 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503595779 -0400	commit: totalbudget now updates accordingly to recyclerview items
9e5aa91cf15e1bd00ad0805dc6d430e20da17205 ebc514dd269b66af7dd9cb2d087bf87645bf2c9a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503597018 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to ns-XETA-56-CreateTripApi
ebc514dd269b66af7dd9cb2d087bf87645bf2c9a b2025376d8513aaf18e2b84ac879f77bd03e71f4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503597023 -0400	pull: Fast-forward
b2025376d8513aaf18e2b84ac879f77bd03e71f4 b9e838b279981a048cc7cacdf3e18060190a762e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503597037 -0400	checkout: moving from ns-XETA-56-CreateTripApi to ns-XETA-56-NewApiTest
b9e838b279981a048cc7cacdf3e18060190a762e 9e5aa91cf15e1bd00ad0805dc6d430e20da17205 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503599323 -0400	checkout: moving from ns-XETA-56-NewApiTest to qj-XETA-55-CreateTripInitialPage
9e5aa91cf15e1bd00ad0805dc6d430e20da17205 b9e838b279981a048cc7cacdf3e18060190a762e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503599379 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to ns-XETA-56-NewApiTest
b9e838b279981a048cc7cacdf3e18060190a762e b9e838b279981a048cc7cacdf3e18060190a762e Qingbo Jiang <qingbojiang@noble154.xe.com> 1503669692 -0400	reset: moving to HEAD
b9e838b279981a048cc7cacdf3e18060190a762e 3c2b614cc79a31131e3542d31b9127482a0769ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1503669704 -0400	checkout: moving from ns-XETA-56-NewApiTest to ns-XETA-56-NewApiTestUnitTest
3c2b614cc79a31131e3542d31b9127482a0769ae 9e5aa91cf15e1bd00ad0805dc6d430e20da17205 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503926343 -0400	checkout: moving from ns-XETA-56-NewApiTestUnitTest to qj-XETA-55-CreateTripInitialPage
9e5aa91cf15e1bd00ad0805dc6d430e20da17205 5353277f0b56030a39d463210ccaa7fee17f6365 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503927349 -0400	commit: replaced float with bigdecimal
5353277f0b56030a39d463210ccaa7fee17f6365 8120ae480e2c4044b774f39a9b96781ce4d63bde Qingbo Jiang <qingbojiang@noble154.xe.com> 1503927630 -0400	commit: replaced with butterknife in adapters
8120ae480e2c4044b774f39a9b96781ce4d63bde 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503928598 -0400	commit: fixed total budget not updating
979f913286bd131e2f6451cc0ef0a88d19576a29 43f4bc2336494021ac9db7685d32f8b05008982a Qingbo Jiang <qingbojiang@noble154.xe.com> 1503934890 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to ns-XETA-7-DashboardDesign
43f4bc2336494021ac9db7685d32f8b05008982a cec1efef470f8872f1d917c27900629d1ed96339 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503934895 -0400	checkout: moving from ns-XETA-7-DashboardDesign to dev
cec1efef470f8872f1d917c27900629d1ed96339 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503934897 -0400	pull: Fast-forward
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503934996 -0400	checkout: moving from dev to qj-XETA-70-InvestigateGroundUpCalculator
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 33096577c657dec3590356c08c496867dd32d877 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503935307 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
33096577c657dec3590356c08c496867dd32d877 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503935380 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 d5adb708972637595acc8784600c4ec856c32691 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951267 -0400	commit: added ui for calculator
d5adb708972637595acc8784600c4ec856c32691 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951443 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to qj-XETA-55-CreateTripInitialPage
979f913286bd131e2f6451cc0ef0a88d19576a29 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951457 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to qj-XETA-TestBranchCreateTrip
979f913286bd131e2f6451cc0ef0a88d19576a29 a3c3c3fdff3353ec9664f9e95969d4649bee36d9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951487 -0400	checkout: moving from qj-XETA-TestBranchCreateTrip to ns-XETA-56-AddTripToApi
a3c3c3fdff3353ec9664f9e95969d4649bee36d9 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951504 -0400	checkout: moving from ns-XETA-56-AddTripToApi to qj-XETA-TestBranchCreateTrip
979f913286bd131e2f6451cc0ef0a88d19576a29 1d4286d316ca0d50fa7e7cccbb8c455e86af455d Qingbo Jiang <qingbojiang@noble154.xe.com> 1503951813 -0400	commit (merge): merge with backend
1d4286d316ca0d50fa7e7cccbb8c455e86af455d f5ade66758d23d2d98de9cf578fbfc297065fb0e Qingbo Jiang <qingbojiang@noble154.xe.com> 1504018916 -0400	commit: created trip but still null
f5ade66758d23d2d98de9cf578fbfc297065fb0e 854f4a9198c61e3c672568de1513a099c70e5b30 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504019214 -0400	commit: got ui to save in the db
854f4a9198c61e3c672568de1513a099c70e5b30 d5adb708972637595acc8784600c4ec856c32691 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504019429 -0400	checkout: moving from qj-XETA-TestBranchCreateTrip to qj-XETA-70-InvestigateGroundUpCalculator
d5adb708972637595acc8784600c4ec856c32691 33096577c657dec3590356c08c496867dd32d877 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504019505 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
33096577c657dec3590356c08c496867dd32d877 d5adb708972637595acc8784600c4ec856c32691 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504019982 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d5adb708972637595acc8784600c4ec856c32691 05d3156ebe91a8755339d65d9fd235f65f62b9a1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504022332 -0400	commit: finished button functions except equals
05d3156ebe91a8755339d65d9fd235f65f62b9a1 33096577c657dec3590356c08c496867dd32d877 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504022337 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
33096577c657dec3590356c08c496867dd32d877 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504022342 -0400	pull: Fast-forward
f2ebff6208b254aa147f0f975ecfc61e437966f3 05d3156ebe91a8755339d65d9fd235f65f62b9a1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504022546 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
05d3156ebe91a8755339d65d9fd235f65f62b9a1 da70257905cf3305bc9a503528ff1e48c9ef98ec Qingbo Jiang <qingbojiang@noble154.xe.com> 1504036490 -0400	commit: calculator working
da70257905cf3305bc9a503528ff1e48c9ef98ec f4c4bbd9e42fc77f5f00a1ff646d124242dfb883 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504037457 -0400	commit: clean up
f4c4bbd9e42fc77f5f00a1ff646d124242dfb883 6b624a5db5cef018e3fa93727133a637f5803ea9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504037489 -0400	commit: clean up
6b624a5db5cef018e3fa93727133a637f5803ea9 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504037973 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 6b624a5db5cef018e3fa93727133a637f5803ea9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504038138 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
6b624a5db5cef018e3fa93727133a637f5803ea9 d640b206ca0403d6a9214c2b7cfd81768f0b7dbf Qingbo Jiang <qingbojiang@noble154.xe.com> 1504038846 -0400	commit: reversed calc display
d640b206ca0403d6a9214c2b7cfd81768f0b7dbf f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504038890 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d640b206ca0403d6a9214c2b7cfd81768f0b7dbf Qingbo Jiang <qingbojiang@noble154.xe.com> 1504039891 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d640b206ca0403d6a9214c2b7cfd81768f0b7dbf d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101240 -0400	commit: added styling from ronak's branch
d86c7b9dd9428c3320795a1d4b44b495686fab67 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101252 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101294 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d86c7b9dd9428c3320795a1d4b44b495686fab67 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101368 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101494 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d86c7b9dd9428c3320795a1d4b44b495686fab67 d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101582 -0400	reset: moving to HEAD
d86c7b9dd9428c3320795a1d4b44b495686fab67 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101585 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101595 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d86c7b9dd9428c3320795a1d4b44b495686fab67 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101910 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d86c7b9dd9428c3320795a1d4b44b495686fab67 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504101938 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d86c7b9dd9428c3320795a1d4b44b495686fab67 2f32afdda781eccf86fc88648079ede12e82ebdd Qingbo Jiang <qingbojiang@noble154.xe.com> 1504121173 -0400	commit: calculator functional
2f32afdda781eccf86fc88648079ede12e82ebdd f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504121191 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 2f32afdda781eccf86fc88648079ede12e82ebdd Qingbo Jiang <qingbojiang@noble154.xe.com> 1504121738 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
2f32afdda781eccf86fc88648079ede12e82ebdd c07701ba01068a8efed23cbb638f77912ae29f07 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504124115 -0400	commit: saving now updates the value in the dashboard fragment
c07701ba01068a8efed23cbb638f77912ae29f07 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504185608 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to dev
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 c07701ba01068a8efed23cbb638f77912ae29f07 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504185618 -0400	checkout: moving from dev to qj-XETA-70-InvestigateGroundUpCalculator
c07701ba01068a8efed23cbb638f77912ae29f07 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504189276 -0400	commit: fits smaller devices
4cbad93e04ec59443c203f592f7c5cca017eb1a0 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504189454 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504190524 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
4cbad93e04ec59443c203f592f7c5cca017eb1a0 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191314 -0400	reset: moving to HEAD
4cbad93e04ec59443c203f592f7c5cca017eb1a0 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191320 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191749 -0400	reset: moving to HEAD
f2ebff6208b254aa147f0f975ecfc61e437966f3 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191750 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
4cbad93e04ec59443c203f592f7c5cca017eb1a0 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191889 -0400	reset: moving to HEAD
4cbad93e04ec59443c203f592f7c5cca017eb1a0 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191894 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 4cbad93e04ec59443c203f592f7c5cca017eb1a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504191961 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
4cbad93e04ec59443c203f592f7c5cca017eb1a0 d29085c672acb336716193755f97bdc24bb5bd48 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504193675 -0400	commit: resizable calculator
d29085c672acb336716193755f97bdc24bb5bd48 f2ebff6208b254aa147f0f975ecfc61e437966f3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504193686 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to rp-XETA-42-Calculator
f2ebff6208b254aa147f0f975ecfc61e437966f3 d29085c672acb336716193755f97bdc24bb5bd48 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504193880 -0400	checkout: moving from rp-XETA-42-Calculator to qj-XETA-70-InvestigateGroundUpCalculator
d29085c672acb336716193755f97bdc24bb5bd48 4f9e2ab3ab588d16f9b95a541a45edf8898d040d Qingbo Jiang <qingbojiang@noble154.xe.com> 1504195098 -0400	commit: clean up
4f9e2ab3ab588d16f9b95a541a45edf8898d040d bbff9282e665a2f875a94fdfe4a34d7b42010adb Qingbo Jiang <qingbojiang@noble154.xe.com> 1504195720 -0400	commit: clean up
bbff9282e665a2f875a94fdfe4a34d7b42010adb 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504200801 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to dev
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504200809 -0400	checkout: moving from dev to dev
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504200855 -0400	reset: moving to HEAD
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504200878 -0400	checkout: moving from dev to qj-XETA-55-CreateTripInitialPage
979f913286bd131e2f6451cc0ef0a88d19576a29 979f913286bd131e2f6451cc0ef0a88d19576a29 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504201121 -0400	checkout: moving from qj-XETA-55-CreateTripInitialPage to qj-XETA-75-BudgetAddBars
979f913286bd131e2f6451cc0ef0a88d19576a29 c880f653954279584bba11425a73df0dc638affe Qingbo Jiang <qingbojiang@noble154.xe.com> 1504275461 -0400	commit: save point
c880f653954279584bba11425a73df0dc638affe bbff9282e665a2f875a94fdfe4a34d7b42010adb Qingbo Jiang <qingbojiang@noble154.xe.com> 1504275511 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-70-InvestigateGroundUpCalculator
bbff9282e665a2f875a94fdfe4a34d7b42010adb 6b0cf956b2c54f56afa85ed6b45a9fdd9b42a8c3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504281251 -0400	commit: merge request fixes
6b0cf956b2c54f56afa85ed6b45a9fdd9b42a8c3 c880f653954279584bba11425a73df0dc638affe Qingbo Jiang <qingbojiang@noble154.xe.com> 1504281748 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to qj-XETA-75-BudgetAddBars
c880f653954279584bba11425a73df0dc638affe 63ff68994babdfe3f78585e3c4e937f1fcc482d6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504623954 -0400	commit: charts showing, not fully formatted
63ff68994babdfe3f78585e3c4e937f1fcc482d6 6b0cf956b2c54f56afa85ed6b45a9fdd9b42a8c3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504624016 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-70-InvestigateGroundUpCalculator
6b0cf956b2c54f56afa85ed6b45a9fdd9b42a8c3 fdb5c704a46287cb5dc11f0f7c29ba64822ae7e4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504624018 -0400	pull: Fast-forward
fdb5c704a46287cb5dc11f0f7c29ba64822ae7e4 1248b666a27a6520ac6c7c72f324e5aaf51807fb Qingbo Jiang <qingbojiang@noble154.xe.com> 1504624587 -0400	commit: revert to * / and equals doesn't show total before going back
1248b666a27a6520ac6c7c72f324e5aaf51807fb 63ff68994babdfe3f78585e3c4e937f1fcc482d6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504624721 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to qj-XETA-75-BudgetAddBars
63ff68994babdfe3f78585e3c4e937f1fcc482d6 1248b666a27a6520ac6c7c72f324e5aaf51807fb Qingbo Jiang <qingbojiang@noble154.xe.com> 1504625077 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-70-InvestigateGroundUpCalculator
1248b666a27a6520ac6c7c72f324e5aaf51807fb b4c5d79efe7c67b778a0a8bc6039782d629b1870 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504625333 -0400	commit: handle negative values
b4c5d79efe7c67b778a0a8bc6039782d629b1870 b4c5d79efe7c67b778a0a8bc6039782d629b1870 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504625410 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to qj-XETA-70-InvestigateGroundUpCalculator
b4c5d79efe7c67b778a0a8bc6039782d629b1870 63ff68994babdfe3f78585e3c4e937f1fcc482d6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504625420 -0400	checkout: moving from qj-XETA-70-InvestigateGroundUpCalculator to qj-XETA-75-BudgetAddBars
63ff68994babdfe3f78585e3c4e937f1fcc482d6 a9abfc98d3caa527aa8329402df1423ce447d9ad Qingbo Jiang <qingbojiang@noble154.xe.com> 1504644990 -0400	commit: save point
a9abfc98d3caa527aa8329402df1423ce447d9ad 4643e65c144c0e5a60cac8dbbe354f19d6b5f474 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504713009 -0400	commit: charts mockup
4643e65c144c0e5a60cac8dbbe354f19d6b5f474 b53e271e7b06ed8b3df90f7c3ac3859f149b45d6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504731687 -0400	commit: added popup alert
b53e271e7b06ed8b3df90f7c3ac3859f149b45d6 e87721bf8c4d222fff7496cf6b2c00d97d9db5c4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504792762 -0400	commit: added cancel button functionality
e87721bf8c4d222fff7496cf6b2c00d97d9db5c4 600a85a63c56d2ba2f9a71f7370eb1a67636a75c Qingbo Jiang <qingbojiang@noble154.xe.com> 1504815530 -0400	commit: added touch to the stacked bar
600a85a63c56d2ba2f9a71f7370eb1a67636a75c bbcc7474031fe05d61efe5db4ac61cbebb6228d9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504878397 -0400	commit: clean up
bbcc7474031fe05d61efe5db4ac61cbebb6228d9 5d2d3b44c3e19d3e4fc3626654e5026024f212e9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504878557 -0400	commit: todo, change offset for markers
5d2d3b44c3e19d3e4fc3626654e5026024f212e9 854f4a9198c61e3c672568de1513a099c70e5b30 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504878684 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-TestBranchCreateTrip
854f4a9198c61e3c672568de1513a099c70e5b30 a3c3c3fdff3353ec9664f9e95969d4649bee36d9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504879640 -0400	checkout: moving from qj-XETA-TestBranchCreateTrip to ns-XETA-56-AddTripToApi
a3c3c3fdff3353ec9664f9e95969d4649bee36d9 9b2b1642940cd29b39a316a6c9e8f2f65d5e3650 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504879645 -0400	pull: Fast-forward
9b2b1642940cd29b39a316a6c9e8f2f65d5e3650 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504892431 -0400	checkout: moving from ns-XETA-56-AddTripToApi to rp-XETA-76-ShareTrip
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504892608 -0400	checkout: moving from rp-XETA-76-ShareTrip to qj-XETA-76-FriendsListBackend
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504892883 -0400	checkout: moving from qj-XETA-76-FriendsListBackend to rp-XETA-76-ShareTrip
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504892957 -0400	checkout: moving from rp-XETA-76-ShareTrip to qj-XETA-76-FriendsListBackend
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504894945 -0400	checkout: moving from qj-XETA-76-FriendsListBackend to rp-XETA-76-ShareTrip
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1504895052 -0400	checkout: moving from rp-XETA-76-ShareTrip to qj-XETA-90-SharingFriendListBackend
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505143692 -0400	commit: save point
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 9b2b1642940cd29b39a316a6c9e8f2f65d5e3650 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505143711 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to ns-XETA-56-AddTripToApi
9b2b1642940cd29b39a316a6c9e8f2f65d5e3650 04e647984a1b1db59d56483d761183677ee239ec Qingbo Jiang <qingbojiang@noble154.xe.com> 1505143715 -0400	pull: Fast-forward
04e647984a1b1db59d56483d761183677ee239ec 5d2d3b44c3e19d3e4fc3626654e5026024f212e9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505145926 -0400	checkout: moving from ns-XETA-56-AddTripToApi to qj-XETA-75-BudgetAddBars
5d2d3b44c3e19d3e4fc3626654e5026024f212e9 0c4ad53c64450fa5b0ba90198c1de37bdb7bd444 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505152372 -0400	commit: removed category budget, bar charts
0c4ad53c64450fa5b0ba90198c1de37bdb7bd444 9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505152384 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to dev
9a86a02d5f7f61b73805c9802ae78eb1ee6ec037 f9d1b18f8fa11ce4279ed01bce3fd783711ef98c Qingbo Jiang <qingbojiang@noble154.xe.com> 1505152386 -0400	pull: Fast-forward
f9d1b18f8fa11ce4279ed01bce3fd783711ef98c 0c4ad53c64450fa5b0ba90198c1de37bdb7bd444 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505152392 -0400	checkout: moving from dev to qj-XETA-75-BudgetAddBars
0c4ad53c64450fa5b0ba90198c1de37bdb7bd444 86c6065c776dd872f15685fe403fe2442c7d39c8 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505152899 -0400	commit (merge): merged from dev
86c6065c776dd872f15685fe403fe2442c7d39c8 1133b9ccf34d21a3ea417e2f29ece9b8132d89e7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505153148 -0400	commit: clean up
1133b9ccf34d21a3ea417e2f29ece9b8132d89e7 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505153378 -0400	commit: more clean up
72185eb302980a803731babb54d23a79deb61c71 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505155655 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to rp-XETA-76-ShareTrip
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156076 -0400	checkout: moving from rp-XETA-76-ShareTrip to qj-XETA-75-BudgetAddBars
72185eb302980a803731babb54d23a79deb61c71 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156127 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-75-BudgetWithRemovedCharts
72185eb302980a803731babb54d23a79deb61c71 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156150 -0400	checkout: moving from qj-XETA-75-BudgetWithRemovedCharts to qj-XETA-75-BudgetAddBars
72185eb302980a803731babb54d23a79deb61c71 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156188 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-75-BudgetSavePointWithCharts
72185eb302980a803731babb54d23a79deb61c71 72185eb302980a803731babb54d23a79deb61c71 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156293 -0400	checkout: moving from qj-XETA-75-BudgetSavePointWithCharts to qj-XETA-75-BudgetAddBars
72185eb302980a803731babb54d23a79deb61c71 983710055bd3f1c100fdd100212bfbc162451fdb Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156438 -0400	commit: removed all charts for now
983710055bd3f1c100fdd100212bfbc162451fdb 8cb7e1d5fa125ea606422df418a3a62aea15a93f Qingbo Jiang <qingbojiang@noble154.xe.com> 1505156594 -0400	commit: deleted chartmarkerview
8cb7e1d5fa125ea606422df418a3a62aea15a93f 37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505159243 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to rp-XETA-76-ShareTrip
37b137d7f4bb454a81d0bfb1bb10a8ec6d8d9de9 8cb7e1d5fa125ea606422df418a3a62aea15a93f Qingbo Jiang <qingbojiang@noble154.xe.com> 1505160376 -0400	checkout: moving from rp-XETA-76-ShareTrip to qj-XETA-75-BudgetAddBars
8cb7e1d5fa125ea606422df418a3a62aea15a93f 3ea4943616239bbddb7a760b3825ba97795f73f6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505230213 -0400	commit: merge requests fixes
3ea4943616239bbddb7a760b3825ba97795f73f6 f9d1b18f8fa11ce4279ed01bce3fd783711ef98c Qingbo Jiang <qingbojiang@noble154.xe.com> 1505230550 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to dev
f9d1b18f8fa11ce4279ed01bce3fd783711ef98c 3ea4943616239bbddb7a760b3825ba97795f73f6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505230570 -0400	checkout: moving from dev to qj-XETA-75-BudgetAddBars
3ea4943616239bbddb7a760b3825ba97795f73f6 04815825d98aa5057d31695447d6214268d72a5f Qingbo Jiang <qingbojiang@noble154.xe.com> 1505231710 -0400	commit: use getter
04815825d98aa5057d31695447d6214268d72a5f 81bd27749fa98c4a24275fd0e1c0feb1b7ffcbad Qingbo Jiang <qingbojiang@noble154.xe.com> 1505232415 -0400	commit: fab button handling
81bd27749fa98c4a24275fd0e1c0feb1b7ffcbad 0ec5650674361961710f8eac321a1e582d14c9a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505236921 -0400	commit: removed interface for trip budget
0ec5650674361961710f8eac321a1e582d14c9a6 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237107 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-90-SharingFriendListBackend
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 1c20e5209294e146f55586e2c13b3bb8a1708556 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237189 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to ns-XETA-90-SharingFriendApi
1c20e5209294e146f55586e2c13b3bb8a1708556 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237198 -0400	checkout: moving from ns-XETA-90-SharingFriendApi to qj-XETA-90-SharingFriendListBackend
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237278 -0400	reset: moving to HEAD
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237793 -0400	reset: moving to HEAD
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 1c20e5209294e146f55586e2c13b3bb8a1708556 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237796 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to ns-XETA-90-SharingFriendApi
1c20e5209294e146f55586e2c13b3bb8a1708556 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237811 -0400	checkout: moving from ns-XETA-90-SharingFriendApi to qj-XETA-90-SharingFriendListBackend
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505237931 -0400	reset: moving to HEAD
c6a49e7857ec2ef47df0a8c95c1649a4c29c5704 7816f987b4d44eab84c842ea2d467ec8ccca8ac1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505238349 -0400	commit (merge): merged from ns branch
7816f987b4d44eab84c842ea2d467ec8ccca8ac1 0ec5650674361961710f8eac321a1e582d14c9a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505238360 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to qj-XETA-75-BudgetAddBars
0ec5650674361961710f8eac321a1e582d14c9a6 0ec5650674361961710f8eac321a1e582d14c9a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505240153 -0400	reset: moving to HEAD
0ec5650674361961710f8eac321a1e582d14c9a6 ff0b23b63bc96f641e34df3f8179045589b108c0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505240923 -0400	commit: fixed some dashboard fab issues
ff0b23b63bc96f641e34df3f8179045589b108c0 7816f987b4d44eab84c842ea2d467ec8ccca8ac1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505240950 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-90-SharingFriendListBackend
7816f987b4d44eab84c842ea2d467ec8ccca8ac1 7816f987b4d44eab84c842ea2d467ec8ccca8ac1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505244392 -0400	reset: moving to HEAD
7816f987b4d44eab84c842ea2d467ec8ccca8ac1 5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505309558 -0400	commit: added ui share trip
5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 ff0b23b63bc96f641e34df3f8179045589b108c0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505309864 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to qj-XETA-75-BudgetAddBars
ff0b23b63bc96f641e34df3f8179045589b108c0 a041a1286629dcd082752c080ff2bad0367cbdc9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505309869 -0400	pull: Fast-forward
a041a1286629dcd082752c080ff2bad0367cbdc9 e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505310715 -0400	commit: removed unused strings
e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505310851 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-90-SharingFriendListBackend
5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505315427 -0400	reset: moving to HEAD
5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505315435 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to qj-XETA-75-BudgetAddBars
e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505316254 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-90-SharingFriendListBackend
5cd6d1480f6ab79beb3641b7504ce5d1aa024be3 f9b0a7bd5ea469c9200923ff0235a05faab4481e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505335010 -0400	commit: friend list persists
f9b0a7bd5ea469c9200923ff0235a05faab4481e f9b0a7bd5ea469c9200923ff0235a05faab4481e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505410565 -0400	reset: moving to HEAD
f9b0a7bd5ea469c9200923ff0235a05faab4481e e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505410579 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to qj-XETA-75-BudgetAddBars
e3b5bc28bb1b40acc5a7ca30eed04174cd12cc35 f9b0a7bd5ea469c9200923ff0235a05faab4481e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505410639 -0400	checkout: moving from qj-XETA-75-BudgetAddBars to qj-XETA-90-SharingFriendListBackend
f9b0a7bd5ea469c9200923ff0235a05faab4481e eb215d305b566e04d0988c4bc8b5f8ed761001f1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505415702 -0400	commit: added sharing trip with, number of person sharing with
eb215d305b566e04d0988c4bc8b5f8ed761001f1 6bcc69b24d0cd6df0975ab218b70098ae31c73bf Qingbo Jiang <qingbojiang@noble154.xe.com> 1505490632 -0400	commit: added permission handling to read all contacts, edit button fills out textviews
6bcc69b24d0cd6df0975ab218b70098ae31c73bf 6c02f2860ced5a81e03e4b7acfd4a1df9810f103 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505490780 -0400	commit: clean up
6c02f2860ced5a81e03e4b7acfd4a1df9810f103 f9d1b18f8fa11ce4279ed01bce3fd783711ef98c Qingbo Jiang <qingbojiang@noble154.xe.com> 1505498534 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to dev
f9d1b18f8fa11ce4279ed01bce3fd783711ef98c e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505498536 -0400	pull: Fast-forward
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 6c02f2860ced5a81e03e4b7acfd4a1df9810f103 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505498547 -0400	checkout: moving from dev to qj-XETA-90-SharingFriendListBackend
6c02f2860ced5a81e03e4b7acfd4a1df9810f103 aa664063aa6af9d6a5aefa8317cfd819b813219d Qingbo Jiang <qingbojiang@noble154.xe.com> 1505500057 -0400	commit (merge): merged from dev
aa664063aa6af9d6a5aefa8317cfd819b813219d 9b7f63dbd24b9a300e0b82f049fe2f9cd6d5482b Qingbo Jiang <qingbojiang@noble154.xe.com> 1505500688 -0400	commit: clean up
9b7f63dbd24b9a300e0b82f049fe2f9cd6d5482b e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505501233 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to dev
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505503201 -0400	reset: moving to HEAD
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 9b7f63dbd24b9a300e0b82f049fe2f9cd6d5482b Qingbo Jiang <qingbojiang@noble154.xe.com> 1505503208 -0400	checkout: moving from dev to qj-XETA-90-SharingFriendListBackend
9b7f63dbd24b9a300e0b82f049fe2f9cd6d5482b 2683e8420528acb3217e0b5089144df3f04fce24 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504665 -0400	commit: simpify saving to db
2683e8420528acb3217e0b5089144df3f04fce24 e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504695 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to dev
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504719 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504810 -0400	reset: moving to HEAD
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 2683e8420528acb3217e0b5089144df3f04fce24 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504816 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-90-SharingFriendListBackend
2683e8420528acb3217e0b5089144df3f04fce24 7e756f2f2d00298295cc67357b7cce6494a132a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504877 -0400	commit: clean up
7e756f2f2d00298295cc67357b7cce6494a132a6 e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504898 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to qj-XETA-91TripDashBoard
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 2af16db2a73f6b5d1687811a05fea32a7a49ce3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1505745364 -0400	commit: template trip dashboard created
2af16db2a73f6b5d1687811a05fea32a7a49ce3a 7e756f2f2d00298295cc67357b7cce6494a132a6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505745408 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-90-SharingFriendListBackend
7e756f2f2d00298295cc67357b7cce6494a132a6 b2b8dd51e041e4a347cc8c2720136c166b61f0d4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505747933 -0400	commit: permission check dialog is now condition to enter picker, created permission checker
b2b8dd51e041e4a347cc8c2720136c166b61f0d4 e0edaa5f106418f257596e979c39ef2f8486b13a Qingbo Jiang <qingbojiang@noble154.xe.com> 1505747977 -0400	commit: refractor
e0edaa5f106418f257596e979c39ef2f8486b13a 1c20e5209294e146f55586e2c13b3bb8a1708556 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505750356 -0400	checkout: moving from qj-XETA-90-SharingFriendListBackend to ns-XETA-90-SharingFriendApi
1c20e5209294e146f55586e2c13b3bb8a1708556 be2f63eaa133f2260ac31ee08eea618209ad6a19 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505750359 -0400	pull: Fast-forward
be2f63eaa133f2260ac31ee08eea618209ad6a19 be2f63eaa133f2260ac31ee08eea618209ad6a19 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505756577 -0400	reset: moving to HEAD
be2f63eaa133f2260ac31ee08eea618209ad6a19 e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505756579 -0400	pull: Fast-forward
e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505757263 -0400	checkout: moving from ns-XETA-90-SharingFriendApi to qj-XETA-90-SharingFriendApiCleanup
e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 a2af5f18ad831655f9f5f24bc69ee4f9cd5f8a56 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505757270 -0400	commit: cleanup
a2af5f18ad831655f9f5f24bc69ee4f9cd5f8a56 e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505758490 -0400	checkout: moving from qj-XETA-90-SharingFriendApiCleanup to ns-XETA-90-SharingFriendApi
e900e14927ad53d0d93cd2b5c5fc8fda9716bf07 348a57612fc24cd312a18317f2fbd7912bd52d69 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505758492 -0400	pull: Fast-forward
348a57612fc24cd312a18317f2fbd7912bd52d69 348a57612fc24cd312a18317f2fbd7912bd52d69 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505765739 -0400	checkout: moving from ns-XETA-90-SharingFriendApi to qj-XETA-90-ShareTripTestsAndFixes
348a57612fc24cd312a18317f2fbd7912bd52d69 9fa666a60a81582fb69c82444b283fd30fd35f06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505765751 -0400	commit: test and fixes
9fa666a60a81582fb69c82444b283fd30fd35f06 b768357f059599d2a75e14c8f24b5921c6cf2771 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505766206 -0400	commit: added cursor tag
b768357f059599d2a75e14c8f24b5921c6cf2771 d975d15110e3e0e72e1c95a99ff827afa1cabc0f Qingbo Jiang <qingbojiang@noble154.xe.com> 1505766297 -0400	commit: sp
d975d15110e3e0e72e1c95a99ff827afa1cabc0f 348a57612fc24cd312a18317f2fbd7912bd52d69 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505769480 -0400	checkout: moving from qj-XETA-90-ShareTripTestsAndFixes to ns-XETA-90-SharingFriendApi
348a57612fc24cd312a18317f2fbd7912bd52d69 726952ab3a513644e727106622b942486898e41e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505769482 -0400	pull: Fast-forward
726952ab3a513644e727106622b942486898e41e d975d15110e3e0e72e1c95a99ff827afa1cabc0f Qingbo Jiang <qingbojiang@noble154.xe.com> 1505769491 -0400	checkout: moving from ns-XETA-90-SharingFriendApi to qj-XETA-90-ShareTripTestsAndFixes
d975d15110e3e0e72e1c95a99ff827afa1cabc0f 814bbd21872bf7b536d2001ada1c26241258e495 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505770339 -0400	commit (merge): added base test for frienddao
814bbd21872bf7b536d2001ada1c26241258e495 8c603f338734632f0d515d587984f9598bbc5425 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505771152 -0400	commit: added testing for friendDao
8c603f338734632f0d515d587984f9598bbc5425 855511e9e2177a947ce1cab79816e086bcab8260 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505772206 -0400	commit: removed and commented out select from friend id
855511e9e2177a947ce1cab79816e086bcab8260 cc9df87c0f0b84e4b771053b647a355c9e0f8853 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505773277 -0400	commit: removed friendao test, change logging
cc9df87c0f0b84e4b771053b647a355c9e0f8853 e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505828077 -0400	checkout: moving from qj-XETA-90-ShareTripTestsAndFixes to dev
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505828451 -0400	pull: Fast-forward
98c0e1bf5700074f81e9df0d95a961a1c7d13364 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505828887 -0400	checkout: moving from dev to qj-XETA-94-AsyncCallsRepoToActivity
98c0e1bf5700074f81e9df0d95a961a1c7d13364 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505833480 -0400	reset: moving to HEAD
98c0e1bf5700074f81e9df0d95a961a1c7d13364 266654eca2c328e71eb2d670c187089b108638c2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505833493 -0400	checkout: moving from qj-XETA-94-AsyncCallsRepoToActivity to ns-XETA-94-AsyncRepoRefactor
266654eca2c328e71eb2d670c187089b108638c2 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505833656 -0400	checkout: moving from ns-XETA-94-AsyncRepoRefactor to qj-XETA-94-AsyncCallsRepoToActivity
98c0e1bf5700074f81e9df0d95a961a1c7d13364 4a325d96d4198e8ecffa2cd4eb810ec9850e68bd Qingbo Jiang <qingbojiang@noble154.xe.com> 1505833677 -0400	commit: first refractor
4a325d96d4198e8ecffa2cd4eb810ec9850e68bd c31f59431e85470d0176a4556f5152284337551a Qingbo Jiang <qingbojiang@noble154.xe.com> 1505834162 -0400	commit (merge): merge from ns branch
c31f59431e85470d0176a4556f5152284337551a bc4cf3ff62563161a2deec5735f639c75f1b8462 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505836087 -0400	commit: created friends async task
bc4cf3ff62563161a2deec5735f639c75f1b8462 c6efff32089894ca7ec9979f72c32b9f65102d63 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505836237 -0400	commit: format + clean up
c6efff32089894ca7ec9979f72c32b9f65102d63 a4588278d047cf3adb12a0875b3a91925b8f81ce Qingbo Jiang <qingbojiang@noble154.xe.com> 1505845142 -0400	commit: uses friend instead of friends
a4588278d047cf3adb12a0875b3a91925b8f81ce 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505845471 -0400	checkout: moving from qj-XETA-94-AsyncCallsRepoToActivity to dev
98c0e1bf5700074f81e9df0d95a961a1c7d13364 2af16db2a73f6b5d1687811a05fea32a7a49ce3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1505845493 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
2af16db2a73f6b5d1687811a05fea32a7a49ce3a cc6b314a972b7bec8299c25d79069cd121dcb6d9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505845825 -0400	commit (merge): merge from dev
cc6b314a972b7bec8299c25d79069cd121dcb6d9 36a5b780e86124ed81e70b5c18361a2980e8b89e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505852383 -0400	commit: created xml
36a5b780e86124ed81e70b5c18361a2980e8b89e cc9df87c0f0b84e4b771053b647a355c9e0f8853 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505852394 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-90-ShareTripTestsAndFixes
cc9df87c0f0b84e4b771053b647a355c9e0f8853 36a5b780e86124ed81e70b5c18361a2980e8b89e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505853143 -0400	checkout: moving from qj-XETA-90-ShareTripTestsAndFixes to qj-XETA-91TripDashBoard
36a5b780e86124ed81e70b5c18361a2980e8b89e f6ae462cba5618b0aaff074ad3a13d027531f695 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505920468 -0400	commit: added expense adapter for tripdashboard
f6ae462cba5618b0aaff074ad3a13d027531f695 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505920475 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
98c0e1bf5700074f81e9df0d95a961a1c7d13364 54fabf94db3c3a319725270ff096323964e1304e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505921456 -0400	checkout: moving from dev to qj-ns-XETA-55-MockWireframeDesign
54fabf94db3c3a319725270ff096323964e1304e 98c0e1bf5700074f81e9df0d95a961a1c7d13364 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505921469 -0400	checkout: moving from qj-ns-XETA-55-MockWireframeDesign to dev
98c0e1bf5700074f81e9df0d95a961a1c7d13364 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505921471 -0400	pull: Fast-forward
8f6908563fc9d43d37d714aa4577b3ebd42234b3 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505921964 -0400	reset: moving to HEAD
8f6908563fc9d43d37d714aa4577b3ebd42234b3 f6ae462cba5618b0aaff074ad3a13d027531f695 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505921976 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
f6ae462cba5618b0aaff074ad3a13d027531f695 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505922100 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505922365 -0400	reset: moving to HEAD
8f6908563fc9d43d37d714aa4577b3ebd42234b3 f6ae462cba5618b0aaff074ad3a13d027531f695 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505922378 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
f6ae462cba5618b0aaff074ad3a13d027531f695 f6ae462cba5618b0aaff074ad3a13d027531f695 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505922383 -0400	reset: moving to HEAD
f6ae462cba5618b0aaff074ad3a13d027531f695 dde2d6652f3b1aee028849312fc88a40c855ca3e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506003707 -0400	commit: finished friend list for trip dashboard
dde2d6652f3b1aee028849312fc88a40c855ca3e badc3abdaefbdfd3c2c3a205694aa81db54d8281 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506004510 -0400	commit: added arrows to trip dashboard
badc3abdaefbdfd3c2c3a205694aa81db54d8281 fa41d74759687476045df6f5180ebc3ee66b00c3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506006253 -0400	commit: dimens and scrollview added
fa41d74759687476045df6f5180ebc3ee66b00c3 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506006264 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 fa41d74759687476045df6f5180ebc3ee66b00c3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506006277 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
fa41d74759687476045df6f5180ebc3ee66b00c3 7c3c9acb9f6505497f71256f9f3571fdcc303128 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506006281 -0400	merge dev: Merge made by the 'recursive' strategy.
7c3c9acb9f6505497f71256f9f3571fdcc303128 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506008544 -0400	commit: posting trip to api
7f51f91a01bc9a208aff3248c78f468709278c06 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506008943 -0400	reset: moving to HEAD
7f51f91a01bc9a208aff3248c78f468709278c06 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506008950 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506008995 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
7f51f91a01bc9a208aff3248c78f468709278c06 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506009029 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506009073 -0400	checkout: moving from dev to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506009339 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
7f51f91a01bc9a208aff3248c78f468709278c06 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506016033 -0400	reset: moving to HEAD
7f51f91a01bc9a208aff3248c78f468709278c06 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506016037 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506017549 -0400	checkout: moving from dev to qj-XETA-FixingActionBarThemes
8f6908563fc9d43d37d714aa4577b3ebd42234b3 0b8e6fa915c818159317994b43e6b8bbeba26ea5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506017564 -0400	commit: fixed with another theme
0b8e6fa915c818159317994b43e6b8bbeba26ea5 0167f52b953bb2a8179f47ce6960d5a8efa06e60 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506017683 -0400	commit: clean up
0167f52b953bb2a8179f47ce6960d5a8efa06e60 7f51f91a01bc9a208aff3248c78f468709278c06 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506017793 -0400	checkout: moving from qj-XETA-FixingActionBarThemes to qj-XETA-91TripDashBoard
7f51f91a01bc9a208aff3248c78f468709278c06 b2e37aa345cea50fd4a51a554b664b0f3db31262 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506022527 -0400	commit: sends trip to api and updates with apiId
b2e37aa345cea50fd4a51a554b664b0f3db31262 b2e37aa345cea50fd4a51a554b664b0f3db31262 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506023720 -0400	reset: moving to HEAD
b2e37aa345cea50fd4a51a554b664b0f3db31262 8f6908563fc9d43d37d714aa4577b3ebd42234b3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506023726 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
8f6908563fc9d43d37d714aa4577b3ebd42234b3 6b3f62154ced883c040df58c2ef1c917cffca9c4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506023728 -0400	pull: Fast-forward
6b3f62154ced883c040df58c2ef1c917cffca9c4 b2e37aa345cea50fd4a51a554b664b0f3db31262 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506023735 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
b2e37aa345cea50fd4a51a554b664b0f3db31262 2e2a8e4b8bd61100d70e290d8804ccb4bb46d010 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506023853 -0400	commit (merge): merge from dev
2e2a8e4b8bd61100d70e290d8804ccb4bb46d010 e46fbfd970b721b94ad6ac7e070f5aad40f779c6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506086892 -0400	commit: created method for saving to local db only
e46fbfd970b721b94ad6ac7e070f5aad40f779c6 6b3f62154ced883c040df58c2ef1c917cffca9c4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506086901 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
6b3f62154ced883c040df58c2ef1c917cffca9c4 4f6bacf25da240df70564ea02a849296e9ba250e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506086904 -0400	pull: Fast-forward
4f6bacf25da240df70564ea02a849296e9ba250e 4f6bacf25da240df70564ea02a849296e9ba250e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506088295 -0400	checkout: moving from dev to qj-XETA-DevBranchCleanUp
4f6bacf25da240df70564ea02a849296e9ba250e 03c86277c6b57b603d4134330c789e70f6fbf910 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506091640 -0400	commit: lint clean up
03c86277c6b57b603d4134330c789e70f6fbf910 4f6bacf25da240df70564ea02a849296e9ba250e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506091652 -0400	checkout: moving from qj-XETA-DevBranchCleanUp to dev
4f6bacf25da240df70564ea02a849296e9ba250e ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506091654 -0400	pull: Fast-forward
ca065e5cf67f597d4eb520e1a5287ca7834258bc 03c86277c6b57b603d4134330c789e70f6fbf910 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506091670 -0400	checkout: moving from dev to qj-XETA-DevBranchCleanUp
03c86277c6b57b603d4134330c789e70f6fbf910 57bb4a339083787e247b4728418c22a626ef37d4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506091713 -0400	commit (merge): merge from dev
57bb4a339083787e247b4728418c22a626ef37d4 1c8aad830b1637230f5762784fa330f663130b3f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506092511 -0400	commit: more clean up
1c8aad830b1637230f5762784fa330f663130b3f 886ce4f98e9db11b5b18ea750aa8a3e664875284 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506092886 -0400	commit: clean up
886ce4f98e9db11b5b18ea750aa8a3e664875284 ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506093034 -0400	checkout: moving from qj-XETA-DevBranchCleanUp to dev
ca065e5cf67f597d4eb520e1a5287ca7834258bc ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506093065 -0400	checkout: moving from dev to qj-XETA-DevDimensCleanUp
ca065e5cf67f597d4eb520e1a5287ca7834258bc ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506101375 -0400	reset: moving to HEAD
ca065e5cf67f597d4eb520e1a5287ca7834258bc 886ce4f98e9db11b5b18ea750aa8a3e664875284 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506101385 -0400	checkout: moving from qj-XETA-DevDimensCleanUp to qj-XETA-DevBranchCleanUp
886ce4f98e9db11b5b18ea750aa8a3e664875284 66fdd6114ddc24bc90462285108caf11561257ba Qingbo Jiang <qingbojiang@noble154.xe.com> 1506101433 -0400	commit: revert locale.us
66fdd6114ddc24bc90462285108caf11561257ba f331b7598ab7f8ab4b1dda22d07073ae22b2df27 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506101470 -0400	commit: clean up
f331b7598ab7f8ab4b1dda22d07073ae22b2df27 ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506101526 -0400	checkout: moving from qj-XETA-DevBranchCleanUp to qj-XETA-DevDimensCleanUp
ca065e5cf67f597d4eb520e1a5287ca7834258bc aa35c73e26adca79f223dd0abec86e9aa3d21096 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110341 -0400	commit: dimens refractor, some layout refractor/fixes
aa35c73e26adca79f223dd0abec86e9aa3d21096 8cfa33735981f12640b08d4081084a002d488ae9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110603 -0400	commit: calc dimens refractor
8cfa33735981f12640b08d4081084a002d488ae9 ca065e5cf67f597d4eb520e1a5287ca7834258bc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110832 -0400	checkout: moving from qj-XETA-DevDimensCleanUp to dev
ca065e5cf67f597d4eb520e1a5287ca7834258bc 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110835 -0400	pull: Fast-forward
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 8cfa33735981f12640b08d4081084a002d488ae9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110850 -0400	checkout: moving from dev to qj-XETA-DevDimensCleanUp
8cfa33735981f12640b08d4081084a002d488ae9 b301b6ec677099159126bffaed436f030f8f38ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1506110853 -0400	merge dev: Merge made by the 'recursive' strategy.
b301b6ec677099159126bffaed436f030f8f38ca e46fbfd970b721b94ad6ac7e070f5aad40f779c6 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506346071 -0400	checkout: moving from qj-XETA-DevDimensCleanUp to qj-XETA-91TripDashBoard
e46fbfd970b721b94ad6ac7e070f5aad40f779c6 e5b24042ee15402e03248e0fc21f6930f4f058bf Qingbo Jiang <qingbojiang@noble154.xe.com> 1506348643 -0400	commit: added createtrip to edit button, need something to handle different actions
e5b24042ee15402e03248e0fc21f6930f4f058bf 4e6d0adf8a10b609da588ba9c68be863fbac099f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506375710 -0400	commit: get all trips working without pagedlist
4e6d0adf8a10b609da588ba9c68be863fbac099f 70d43890298044512d835dc3c41db707f82d60ec Qingbo Jiang <qingbojiang@noble154.xe.com> 1506376907 -0400	commit: on changed not getting called
70d43890298044512d835dc3c41db707f82d60ec 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506433483 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 70d43890298044512d835dc3c41db707f82d60ec Qingbo Jiang <qingbojiang@noble154.xe.com> 1506433494 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
70d43890298044512d835dc3c41db707f82d60ec bf73ac2855e250f9504d554b084528eec8fa55d5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506433627 -0400	commit (merge): merge from dev
bf73ac2855e250f9504d554b084528eec8fa55d5 3b1495cf2b1cb5c1bca322a4fb559c204675b819 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435657 -0400	checkout: moving from qj-XETA-91TripDashBoard to EG-XETA-93-StandardizeStyling
3b1495cf2b1cb5c1bca322a4fb559c204675b819 3b1495cf2b1cb5c1bca322a4fb559c204675b819 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435756 -0400	reset: moving to HEAD
3b1495cf2b1cb5c1bca322a4fb559c204675b819 bf73ac2855e250f9504d554b084528eec8fa55d5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435766 -0400	reset: moving to bf73ac2
bf73ac2855e250f9504d554b084528eec8fa55d5 3b1495cf2b1cb5c1bca322a4fb559c204675b819 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435774 -0400	reset: moving to 3b1495c
3b1495cf2b1cb5c1bca322a4fb559c204675b819 bf73ac2855e250f9504d554b084528eec8fa55d5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435885 -0400	checkout: moving from EG-XETA-93-StandardizeStyling to qj-XETA-91TripDashBoard
bf73ac2855e250f9504d554b084528eec8fa55d5 3b1495cf2b1cb5c1bca322a4fb559c204675b819 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506435969 -0400	checkout: moving from qj-XETA-91TripDashBoard to EG-XETA-93-StandardizeStyling
3b1495cf2b1cb5c1bca322a4fb559c204675b819 96bf3d205bea4621b1bdf7066f6c3df5baec4ffe Qingbo Jiang <qingbojiang@noble154.xe.com> 1506436343 -0400	pull: Fast-forward
96bf3d205bea4621b1bdf7066f6c3df5baec4ffe 96bf3d205bea4621b1bdf7066f6c3df5baec4ffe Qingbo Jiang <qingbojiang@noble154.xe.com> 1506437030 -0400	reset: moving to HEAD
96bf3d205bea4621b1bdf7066f6c3df5baec4ffe bf73ac2855e250f9504d554b084528eec8fa55d5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506437506 -0400	checkout: moving from EG-XETA-93-StandardizeStyling to qj-XETA-91TripDashBoard
bf73ac2855e250f9504d554b084528eec8fa55d5 baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506437944 -0400	pull: Fast-forward
baceceecbb0171d44b462a3a08ee19e54d81b7ae 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506438081 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506438205 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
baceceecbb0171d44b462a3a08ee19e54d81b7ae baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506450434 -0400	reset: moving to HEAD
baceceecbb0171d44b462a3a08ee19e54d81b7ae baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506450977 -0400	reset: moving to HEAD
baceceecbb0171d44b462a3a08ee19e54d81b7ae baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506451189 -0400	reset: moving to HEAD
baceceecbb0171d44b462a3a08ee19e54d81b7ae 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506451192 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506451223 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
baceceecbb0171d44b462a3a08ee19e54d81b7ae baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506451348 -0400	reset: moving to HEAD
baceceecbb0171d44b462a3a08ee19e54d81b7ae 30f818c496511a46e0ad8b0d3613c58675936039 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506451401 -0400	commit: pagedList implemented but not working
30f818c496511a46e0ad8b0d3613c58675936039 eaf7822584791b72b1537ae93b061fe96b251567 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506522756 -0400	commit: save point
eaf7822584791b72b1537ae93b061fe96b251567 eaa1797d25a18f3c69132328f0060729b42ec5fc Qingbo Jiang <qingbojiang@noble154.xe.com> 1506522765 -0400	checkout: moving from qj-XETA-91TripDashBoard to ns-XETA-92-TripDashboardApi
eaa1797d25a18f3c69132328f0060729b42ec5fc 6803803ecc9300188a09013a812dfbac0456f788 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506522786 -0400	checkout: moving from ns-XETA-92-TripDashboardApi to ns-XETA-92-CreateTripDashboardApi
6803803ecc9300188a09013a812dfbac0456f788 eaf7822584791b72b1537ae93b061fe96b251567 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506522806 -0400	checkout: moving from ns-XETA-92-CreateTripDashboardApi to qj-XETA-91TripDashBoard
eaf7822584791b72b1537ae93b061fe96b251567 d3688da15ea45f06a47bf593dff02b28b06a1853 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506524160 -0400	commit (merge): merge from ns-92
d3688da15ea45f06a47bf593dff02b28b06a1853 6803803ecc9300188a09013a812dfbac0456f788 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506524178 -0400	checkout: moving from qj-XETA-91TripDashBoard to ns-XETA-92-CreateTripDashboardApi
6803803ecc9300188a09013a812dfbac0456f788 b48da8ed9491f4fffe4759cfaecacb3def276c16 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506524180 -0400	pull: Fast-forward
b48da8ed9491f4fffe4759cfaecacb3def276c16 d3688da15ea45f06a47bf593dff02b28b06a1853 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506524186 -0400	checkout: moving from ns-XETA-92-CreateTripDashboardApi to qj-XETA-91TripDashBoard
d3688da15ea45f06a47bf593dff02b28b06a1853 fe865132d907dfa6dab5ac3070d54f287f8a297d Qingbo Jiang <qingbojiang@noble154.xe.com> 1506525174 -0400	commit (merge): merged from ns-92 again
fe865132d907dfa6dab5ac3070d54f287f8a297d b301b6ec677099159126bffaed436f030f8f38ca Qingbo Jiang <qingbojiang@noble154.xe.com> 1506525196 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-DevDimensCleanUp
b301b6ec677099159126bffaed436f030f8f38ca 8d3a363dbd346dd7a27e3906f850bf87092016b2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506536486 -0400	commit: more refractor
8d3a363dbd346dd7a27e3906f850bf87092016b2 9209867171727c95b10cfe5b897988772bf7748e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506536590 -0400	commit: clean up
9209867171727c95b10cfe5b897988772bf7748e 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506536607 -0400	checkout: moving from qj-XETA-DevDimensCleanUp to dev
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 9209867171727c95b10cfe5b897988772bf7748e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506536620 -0400	checkout: moving from dev to qj-XETA-DevDimensCleanUp
9209867171727c95b10cfe5b897988772bf7748e 9209867171727c95b10cfe5b897988772bf7748e Qingbo Jiang <qingbojiang@noble154.xe.com> 1506537866 -0400	reset: moving to HEAD
9209867171727c95b10cfe5b897988772bf7748e fe865132d907dfa6dab5ac3070d54f287f8a297d Qingbo Jiang <qingbojiang@noble154.xe.com> 1506537879 -0400	checkout: moving from qj-XETA-DevDimensCleanUp to qj-XETA-91TripDashBoard
fe865132d907dfa6dab5ac3070d54f287f8a297d 7087e3a83ed1bec491685e526f980501d4742500 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506605318 -0400	commit: using pagedlist to display trips
7087e3a83ed1bec491685e526f980501d4742500 2961837faf3438f1dd175302bce058a2d48b64a0 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506629669 -0400	commit: added bundle passing between activity
2961837faf3438f1dd175302bce058a2d48b64a0 9a1df426d8de055d3f5063a001f50c7e066e8deb Qingbo Jiang <qingbojiang@noble154.xe.com> 1506693945 -0400	commit: added constants
9a1df426d8de055d3f5063a001f50c7e066e8deb 9a1df426d8de055d3f5063a001f50c7e066e8deb Qingbo Jiang <qingbojiang@noble154.xe.com> 1506694104 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-91-IntegrateWithBudgetCategoryAPI
9a1df426d8de055d3f5063a001f50c7e066e8deb dd07839a14711581123c635134b58db448a02fb3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506694115 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to ns-XETA-100-BudgetCategoryApi
dd07839a14711581123c635134b58db448a02fb3 9a1df426d8de055d3f5063a001f50c7e066e8deb Qingbo Jiang <qingbojiang@noble154.xe.com> 1506694127 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to qj-XETA-91-IntegrateWithBudgetCategoryAPI
9a1df426d8de055d3f5063a001f50c7e066e8deb 0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506699492 -0400	commit (merge): merged from budget category
0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506699511 -0400	reset: moving to HEAD
0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 9a1df426d8de055d3f5063a001f50c7e066e8deb Qingbo Jiang <qingbojiang@noble154.xe.com> 1506699517 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to qj-XETA-91TripDashBoard
9a1df426d8de055d3f5063a001f50c7e066e8deb 0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506699528 -0400	merge qj-XETA-91-IntegrateWithBudgetCategoryAPI: Fast-forward
0d5d2da1a8721253d855a140dfd3ef0d09fc31a1 0baf7d3f396d108165a400cbef72b81da81d4088 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506709891 -0400	commit: added TripListViewModel
0baf7d3f396d108165a400cbef72b81da81d4088 e4b9617d0def7d579cd0f817f3b8651ff680d96d Qingbo Jiang <qingbojiang@noble154.xe.com> 1506719960 -0400	commit: added pagelist to budget category
e4b9617d0def7d579cd0f817f3b8651ff680d96d 8f128db3897909c941d0767c26bae00bad94d0fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506953151 -0400	commit: pagedlist for showing categories
8f128db3897909c941d0767c26bae00bad94d0fd dd07839a14711581123c635134b58db448a02fb3 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506953164 -0400	checkout: moving from qj-XETA-91TripDashBoard to ns-XETA-100-BudgetCategoryApi
dd07839a14711581123c635134b58db448a02fb3 8535779ecfd3964d1e59d23a0fcf38c19080a704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506953166 -0400	pull: Fast-forward
8535779ecfd3964d1e59d23a0fcf38c19080a704 8f128db3897909c941d0767c26bae00bad94d0fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506953344 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to qj-XETA-91TripDashBoard
8f128db3897909c941d0767c26bae00bad94d0fd 8f128db3897909c941d0767c26bae00bad94d0fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506953355 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-91-IntegrateWithBudgetCategoryAPI
8f128db3897909c941d0767c26bae00bad94d0fd aefcca656183771d312d3b7bce6980766a8f74aa Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954630 -0400	commit (merge): merged from ns-100
aefcca656183771d312d3b7bce6980766a8f74aa 8535779ecfd3964d1e59d23a0fcf38c19080a704 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954651 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to ns-XETA-100-BudgetCategoryApi
8535779ecfd3964d1e59d23a0fcf38c19080a704 08102f00bcf7f206a2e02add28cf80f0d40bfebf Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954653 -0400	pull: Fast-forward
08102f00bcf7f206a2e02add28cf80f0d40bfebf aefcca656183771d312d3b7bce6980766a8f74aa Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954672 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to qj-XETA-91-IntegrateWithBudgetCategoryAPI
aefcca656183771d312d3b7bce6980766a8f74aa cc4765dcfdaa34b8d85280a3188dea7273fc2d89 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954678 -0400	merge ns-XETA-100-BudgetCategoryApi: Merge made by the 'recursive' strategy.
cc4765dcfdaa34b8d85280a3188dea7273fc2d89 8f128db3897909c941d0767c26bae00bad94d0fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954710 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to qj-XETA-91TripDashBoard
8f128db3897909c941d0767c26bae00bad94d0fd cc4765dcfdaa34b8d85280a3188dea7273fc2d89 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506954724 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-91-IntegrateWithBudgetCategoryAPI
cc4765dcfdaa34b8d85280a3188dea7273fc2d89 cc4765dcfdaa34b8d85280a3188dea7273fc2d89 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506955821 -0400	reset: moving to HEAD
cc4765dcfdaa34b8d85280a3188dea7273fc2d89 8f128db3897909c941d0767c26bae00bad94d0fd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506955836 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to qj-XETA-91TripDashBoard
8f128db3897909c941d0767c26bae00bad94d0fd cc4765dcfdaa34b8d85280a3188dea7273fc2d89 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506955846 -0400	merge qj-XETA-91-IntegrateWithBudgetCategoryAPI: Fast-forward
cc4765dcfdaa34b8d85280a3188dea7273fc2d89 62083064dc2887c4e68430692ed2bb5fdcf6f432 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506956302 -0400	commit: merge from ns-100 updated with fixes
62083064dc2887c4e68430692ed2bb5fdcf6f432 62083064dc2887c4e68430692ed2bb5fdcf6f432 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506964757 -0400	reset: moving to HEAD
62083064dc2887c4e68430692ed2bb5fdcf6f432 5448efb4564cace4816a399167d4b0ce90859c80 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506964786 -0400	checkout: moving from qj-XETA-91TripDashBoard to eg-XETA-101-FriendList
5448efb4564cace4816a399167d4b0ce90859c80 b39ebe3ba5fdadce5264586cbe579f7340f838cd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506964789 -0400	pull: Fast-forward
b39ebe3ba5fdadce5264586cbe579f7340f838cd b39ebe3ba5fdadce5264586cbe579f7340f838cd Qingbo Jiang <qingbojiang@noble154.xe.com> 1506964986 -0400	reset: moving to HEAD
b39ebe3ba5fdadce5264586cbe579f7340f838cd 62083064dc2887c4e68430692ed2bb5fdcf6f432 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506964993 -0400	checkout: moving from eg-XETA-101-FriendList to qj-XETA-91TripDashBoard
62083064dc2887c4e68430692ed2bb5fdcf6f432 b6d27b01bafa81deec4deee65b398fa5194b02db Qingbo Jiang <qingbojiang@noble154.xe.com> 1506969370 -0400	commit: budget categories working
b6d27b01bafa81deec4deee65b398fa5194b02db ba1d0afb2d9acc056abbe34f6f89c4c9b9c811e9 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506971075 -0400	commit: budget total updates, minor fixes
ba1d0afb2d9acc056abbe34f6f89c4c9b9c811e9 f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506973854 -0400	commit: now update category name changes
f3b2238fb1a56561762b7fd81127e88701b6aa6f 08102f00bcf7f206a2e02add28cf80f0d40bfebf Qingbo Jiang <qingbojiang@noble154.xe.com> 1506974284 -0400	checkout: moving from qj-XETA-91TripDashBoard to ns-XETA-100-BudgetCategoryApi
08102f00bcf7f206a2e02add28cf80f0d40bfebf 08102f00bcf7f206a2e02add28cf80f0d40bfebf Qingbo Jiang <qingbojiang@noble154.xe.com> 1506974308 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to qj-XETA-100-BudgetCategoryAddingRemoving
08102f00bcf7f206a2e02add28cf80f0d40bfebf 64a9ff71e1939470d4dc5cf2d2d79d3f0d156fd4 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506974524 -0400	commit: added fix to budgetcategory removing
64a9ff71e1939470d4dc5cf2d2d79d3f0d156fd4 4d802eaf3651bd66b9c9f677e9a2a7695b39822a Qingbo Jiang <qingbojiang@noble154.xe.com> 1506974593 -0400	commit: remove nl
4d802eaf3651bd66b9c9f677e9a2a7695b39822a f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506975084 -0400	checkout: moving from qj-XETA-100-BudgetCategoryAddingRemoving to qj-XETA-91TripDashBoard
f3b2238fb1a56561762b7fd81127e88701b6aa6f f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506978103 -0400	reset: moving to HEAD
f3b2238fb1a56561762b7fd81127e88701b6aa6f 9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506978113 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
9bf40a5fd42f2a18db7333d5e5a3c74720f36d41 f7f93d6c583a9f428551e58ec7e6eb0c0d2ad255 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506978117 -0400	pull: Fast-forward
f7f93d6c583a9f428551e58ec7e6eb0c0d2ad255 4d802eaf3651bd66b9c9f677e9a2a7695b39822a Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979325 -0400	checkout: moving from dev to qj-XETA-100-BudgetCategoryAddingRemoving
4d802eaf3651bd66b9c9f677e9a2a7695b39822a 85a60ef785aadc39df0e3cf1dc7a6c05d34d932f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979328 -0400	pull: Fast-forward
85a60ef785aadc39df0e3cf1dc7a6c05d34d932f 85a60ef785aadc39df0e3cf1dc7a6c05d34d932f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979361 -0400	reset: moving to HEAD
85a60ef785aadc39df0e3cf1dc7a6c05d34d932f f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979385 -0400	checkout: moving from qj-XETA-100-BudgetCategoryAddingRemoving to qj-XETA-91TripDashBoard
f3b2238fb1a56561762b7fd81127e88701b6aa6f 85a60ef785aadc39df0e3cf1dc7a6c05d34d932f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979403 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-100-BudgetCategoryAddingRemoving
85a60ef785aadc39df0e3cf1dc7a6c05d34d932f f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979411 -0400	checkout: moving from qj-XETA-100-BudgetCategoryAddingRemoving to qj-XETA-91TripDashBoard
f3b2238fb1a56561762b7fd81127e88701b6aa6f f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979430 -0400	reset: moving to HEAD
f3b2238fb1a56561762b7fd81127e88701b6aa6f 85a60ef785aadc39df0e3cf1dc7a6c05d34d932f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979431 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-100-BudgetCategoryAddingRemoving
85a60ef785aadc39df0e3cf1dc7a6c05d34d932f f3b2238fb1a56561762b7fd81127e88701b6aa6f Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979447 -0400	checkout: moving from qj-XETA-100-BudgetCategoryAddingRemoving to qj-XETA-91TripDashBoard
f3b2238fb1a56561762b7fd81127e88701b6aa6f cfd79a896cf416e07ca6de909514b2ae8f7bc931 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979964 -0400	commit: simplify apiutils getupdatebudgetcategorylist
cfd79a896cf416e07ca6de909514b2ae8f7bc931 cc4765dcfdaa34b8d85280a3188dea7273fc2d89 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507038362 -0400	checkout: moving from qj-XETA-91TripDashBoard to qj-XETA-91-IntegrateWithBudgetCategoryAPI
cc4765dcfdaa34b8d85280a3188dea7273fc2d89 cfd79a896cf416e07ca6de909514b2ae8f7bc931 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507038380 -0400	checkout: moving from qj-XETA-91-IntegrateWithBudgetCategoryAPI to qj-XETA-91TripDashBoard
cfd79a896cf416e07ca6de909514b2ae8f7bc931 cfd79a896cf416e07ca6de909514b2ae8f7bc931 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507040080 -0400	reset: moving to HEAD
cfd79a896cf416e07ca6de909514b2ae8f7bc931 08102f00bcf7f206a2e02add28cf80f0d40bfebf Qingbo Jiang <qingbojiang@noble154.xe.com> 1507040086 -0400	checkout: moving from qj-XETA-91TripDashBoard to ns-XETA-100-BudgetCategoryApi
08102f00bcf7f206a2e02add28cf80f0d40bfebf 0d77e8692c9744d95d60d2609cc3c6f00115fb98 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507040088 -0400	pull: Fast-forward
0d77e8692c9744d95d60d2609cc3c6f00115fb98 b39ebe3ba5fdadce5264586cbe579f7340f838cd Qingbo Jiang <qingbojiang@noble154.xe.com> 1507041400 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to eg-XETA-101-FriendList
b39ebe3ba5fdadce5264586cbe579f7340f838cd c50d6c3bfd88217771f15448d51de6c518879cc2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507041402 -0400	pull: Fast-forward
c50d6c3bfd88217771f15448d51de6c518879cc2 c50d6c3bfd88217771f15448d51de6c518879cc2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507041466 -0400	reset: moving to HEAD
c50d6c3bfd88217771f15448d51de6c518879cc2 c50d6c3bfd88217771f15448d51de6c518879cc2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507041467 -0400	reset: moving to HEAD
c50d6c3bfd88217771f15448d51de6c518879cc2 0d77e8692c9744d95d60d2609cc3c6f00115fb98 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507041481 -0400	checkout: moving from eg-XETA-101-FriendList to ns-XETA-100-BudgetCategoryApi
0d77e8692c9744d95d60d2609cc3c6f00115fb98 c50d6c3bfd88217771f15448d51de6c518879cc2 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507045145 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to eg-XETA-101-FriendList
c50d6c3bfd88217771f15448d51de6c518879cc2 0d77e8692c9744d95d60d2609cc3c6f00115fb98 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507045474 -0400	checkout: moving from eg-XETA-101-FriendList to ns-XETA-100-BudgetCategoryApi
0d77e8692c9744d95d60d2609cc3c6f00115fb98 0d77e8692c9744d95d60d2609cc3c6f00115fb98 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507045931 -0400	reset: moving to HEAD
0d77e8692c9744d95d60d2609cc3c6f00115fb98 f7f93d6c583a9f428551e58ec7e6eb0c0d2ad255 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507045936 -0400	checkout: moving from ns-XETA-100-BudgetCategoryApi to dev
f7f93d6c583a9f428551e58ec7e6eb0c0d2ad255 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507045947 -0400	pull: Fast-forward
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507057403 -0400	reset: moving to HEAD
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 cfd79a896cf416e07ca6de909514b2ae8f7bc931 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507057405 -0400	checkout: moving from dev to qj-XETA-91TripDashBoard
cfd79a896cf416e07ca6de909514b2ae8f7bc931 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507060493 -0400	checkout: moving from qj-XETA-91TripDashBoard to dev
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507132089 -0400	reset: moving to HEAD
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507132092 -0400	checkout: moving from dev to dev
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507132710 -0400	checkout: moving from dev to qj-XETA-Minify
680e6a9d5ef2098c38822a0e273c3e3e2a818fe7 d6514e33d6b8c2b9cff8b153c1809d8be5d88884 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507139911 -0400	commit: removed fragments, activties and db items
d6514e33d6b8c2b9cff8b153c1809d8be5d88884 38a035b5aa3a77ef659a9ca0ed3998adb15c9d84 Qingbo Jiang <qingbojiang@noble154.xe.com> 1507148640 -0400	commit: renamed and removed all sensitive data
38a035b5aa3a77ef659a9ca0ed3998adb15c9d84 f1d8620d5bbe994c4a6a1a4d0a8a563680125dcf Qingbo Jiang <qingbojiang@noble154.xe.com> 1507149691 -0400	commit: clean up
