0000000000000000000000000000000000000000 e0a2e43047ec3b1484f560f3f00b9ecaea004d9e Qingbo Jiang <qingbojiang@noble154.xe.com> 1505504719 -0400	branch: Created from HEAD
e0a2e43047ec3b1484f560f3f00b9ecaea004d9e 2af16db2a73f6b5d1687811a05fea32a7a49ce3a Qingbo Jiang <qingbojiang@noble154.xe.com> 1505745364 -0400	commit: template trip dashboard created
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 f6ae462cba5618b0aaff074ad3a13d027531f695 Qingbo Jiang <qingbojiang@noble154.xe.com> 1505920468 -0400	commit: added expense adapter for tripdashboard
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 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 b2e37aa345cea50fd4a51a554b664b0f3db31262 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506022527 -0400	commit: sends trip to api and updates with apiId
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 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 bf73ac2855e250f9504d554b084528eec8fa55d5 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506433627 -0400	commit (merge): merge from dev
bf73ac2855e250f9504d554b084528eec8fa55d5 baceceecbb0171d44b462a3a08ee19e54d81b7ae Qingbo Jiang <qingbojiang@noble154.xe.com> 1506437944 -0400	pull: Fast-forward
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 d3688da15ea45f06a47bf593dff02b28b06a1853 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506524160 -0400	commit (merge): merge from ns-92
d3688da15ea45f06a47bf593dff02b28b06a1853 fe865132d907dfa6dab5ac3070d54f287f8a297d Qingbo Jiang <qingbojiang@noble154.xe.com> 1506525174 -0400	commit (merge): merged from ns-92 again
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 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 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 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 cfd79a896cf416e07ca6de909514b2ae8f7bc931 Qingbo Jiang <qingbojiang@noble154.xe.com> 1506979964 -0400	commit: simplify apiutils getupdatebudgetcategorylist
