API tools faq
paste
Advertisement
Guest User

git sam log2

a guest
Nov 9th, 2015
1,022
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.11 KB | None | 0 0
raw download clone embed print report
  1. * commit 479e0cc9ecc85922db6fc44b592d400501932fe3 (HEAD, web-view)
  2. | Author: Sam Warren <samuel.l.warren@gmail.com>
  3. | Date: Sun Nov 8 22:41:03 2015 -0800
  4. |
  5. | make webview open user input
  6. |
  7. * commit 887098ebe6f510396502b5ca7733f82004fa29e2
  8. | Author: Sam Warren <samuel.l.warren@gmail.com>
  9. | Date: Thu Nov 5 10:29:28 2015 -0800
  10. |
  11. | make web-view
  12. |
  13. * commit 9ca4835e025ed506d338a4489179643374c9b2ae
  14. | Author: Sam Warren <samuel.l.warren@gmail.com>
  15. | Date: Mon Nov 9 16:22:44 2015 -0800
  16. |
  17. | resolve merge error webview rebase
  18. |
  19. * commit 4e81957ae8f6f5ca31e1b03994d520d6c25b1528 (origin/develop, develop)
  20. |\ Merge: 2db2bf4 25f1424
  21. | | Author: Patrick Shao <shao.pat@gmail.com>
  22. | | Date: Thu Nov 5 13:13:18 2015 -0800
  23. | |
  24. | | Merge pull request #19 from theworldbright/feature/song-image-view
  25. | |
  26. | | Add song picker screen without images
  27. | |
  28. | * commit 25f1424b21330c6d98f5f738f07c8cc07633648e
  29. | | Author: theworldbright <kent@kentshikama.com>
  30. | | Date: Thu Nov 5 12:33:22 2015 -0800
  31. | |
  32. | | Fix UI tests
  33. | |
  34. | * commit e3adf8b22a7f3260b10c51e2863a6b6e979962e2
  35. |/ Author: theworldbright <kent@kentshikama.com>
  36. | Date: Thu Nov 5 01:43:59 2015 -0800
  37. |
  38. | Add song picker screen without images
  39. |
  40. * commit 2db2bf42002e2020a55ddf7b816687c6999dd878
  41. | Author: theworldbright <kent@kentshikama.com>
  42. | Date: Wed Nov 4 16:10:18 2015 -0800
  43. |
  44. | Add SongByteDataDownloader test
  45. |
  46. * commit 6e93c48abfdd9794bbe2b935fca1b9112a036589
  47. |\ Merge: 7749dba 875bf77
  48. | | Author: Patrick Shao <shao.pat@gmail.com>
  49. | | Date: Tue Nov 3 14:55:09 2015 -0800
  50. | |
  51. | | Merge pull request #18 from theworldbright/feature/song-query-no-internet-handling
  52. | |
  53. | | Show alert dialog on no internet for SongSearcher
  54. | |
  55. | * commit 875bf77e27e5cc2c550863fa53d823dc7ad460de
  56. | | Author: theworldbright <kent@kentshikama.com>
  57. | | Date: Tue Nov 3 14:23:45 2015 -0800
  58. | |
  59. | | Fix song searcher test
  60. | |
  61. | * commit 63a878976af60005d6e6c9e4edcf0ce19fbc5fbe
  62. |/ Author: theworldbright <kent@kentshikama.com>
  63. | Date: Tue Nov 3 13:01:54 2015 -0800
  64. |
  65. | Show alert dialog on no internet for SongSearcher
  66. |
  67. * commit 7749dba689fe959a3b2fa21a01512e390443ac49
  68. | Author: theworldbright <kent@kentshikama.com>
  69. | Date: Tue Nov 3 12:44:21 2015 -0800
  70. |
  71. | Move ItemContentReader to inner class of SongSearcher
  72. |
  73. * commit 1e6c4bae68870b4ff1ef1a7ad3a86c751cd107f1
  74. |\ Merge: 75329f4 3f02b17
  75. | | Author: Patrick Shao <shao.pat@gmail.com>
  76. | | Date: Thu Oct 29 14:47:59 2015 -0700
  77. | |
  78. | | Merge pull request #17 from theworldbright/list-view
  79. | |
  80. | | Integrate List view
  81. | |
  82. | * commit 3f02b17c31e9aa2b4283d9bb349e131ed6b43d61
  83. | | Author: theworldbright <kent@kentshikama.com>
  84. | | Date: Thu Oct 29 14:27:09 2015 -0700
  85. | |
  86. | | Rename HelloWorldTest to UITest
  87. | |
  88. | * commit bdf2a91d5a19768d1d11d98d67089e623eac206f
  89. | | Author: Sam Warren <samuel.l.warren@gmail.com>
  90. | | Date: Tue Oct 27 14:14:51 2015 -0700
  91. | |
  92. | | Implement automatic return from app adder
  93. | |
  94. | * commit 944e12fc2c408cb62b0f061c118423d06df7d645
  95. |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  96. | Date: Fri Oct 23 16:11:29 2015 -0700
  97. |
  98. | Make applications list view
  99. |
  100. * commit 75329f4e8a7aa4cdb3ee140b66656363429e1a2b
  101. |\ Merge: f285a26 19f233d
  102. | | Author: Patrick Shao <shao.pat@gmail.com>
  103. | | Date: Thu Oct 29 12:17:26 2015 -0700
  104. | |
  105. | | Merge pull request #10 from theworldbright/feature/song-search
  106. | |
  107. | | Add ability to search songs from Spotify
  108. | |
  109. | * commit 19f233dc0b5cae81462e587917535a420363515c
  110. | | Author: theworldbright <kent@kentshikama.com>
  111. | | Date: Tue Oct 27 14:10:56 2015 -0700
  112. | |
  113. | | Make song name query URL safe
  114. | |
  115. | * commit 9edd4735442fa45edecfe9518acb96c3b47dfa33
  116. | | Author: theworldbright <kent@kentshikama.com>
  117. | | Date: Sun Oct 18 00:11:58 2015 -0700
  118. | |
  119. | | Add album image URL to song searcher
  120. | |
  121. | | + Minor refactorings
  122. | |
  123. | * commit a10772e3313bbbd16de545750bb61803cbf3c5ee
  124. |/ Author: theworldbright <kent@kentshikama.com>
  125. | Date: Sat Oct 17 12:58:28 2015 -0700
  126. |
  127. | Add ability to search songs from Spotify
  128. |
  129. * commit f285a26b5813068de2cbb138a7f7ba9c45c73d53 (tag: alpha-v1, origin/master, origin/HEAD, master)
  130. |\ Merge: 5cbd514 a9332ef
  131. | | Author: Patrick Shao <shao.pat@gmail.com>
  132. | | Date: Tue Oct 27 00:10:48 2015 -0700
  133. | |
  134. | | Merge pull request #13 from theworldbright/update-readme
  135. | |
  136. | | Update README.md
  137. | |
  138. | * commit a9332efe70aba82bcda86f16f13058ef6c5f0012
  139. |/ Author: Kent Shikama <kent@kentshikama.com>
  140. | Date: Mon Oct 26 23:34:22 2015 -0700
  141. |
  142. | Update README.md
  143. |
  144. * commit 5cbd514b6e7867b562eba7e3fcfd030f5c61fd76
  145. |\ Merge: df48890 aa93cba
  146. | | Author: Patrick Shao <shao.pat@gmail.com>
  147. | | Date: Sat Oct 24 17:39:58 2015 -0700
  148. | |
  149. | | Merge pull request #12 from theworldbright/readme
  150. | |
  151. | | Add a README
  152. | |
  153. | * commit aa93cbac1cf63e66792d4ae55aba22df63b4fa95
  154. |/ Author: theworldbright <kent@kentshikama.com>
  155. | Date: Fri Oct 23 23:34:05 2015 -0700
  156. |
  157. | Add README
  158. |
  159. | * commit a4ef461ac6020f0f0be21c2dd9496f4135d8d8b2 (origin/web-view)
  160. | | Author: Sam Warren <samuel.l.warren@gmail.com>
  161. | | Date: Mon Nov 2 19:57:44 2015 -0800
  162. | |
  163. | | implement basic webview
  164. | |
  165. | | * commit 9e676370bcd3dbee31274b308b0db2f4175a1230 (list-view)
  166. | | | Author: Sam Warren <samuel.l.warren@gmail.com>
  167. | | | Date: Thu Oct 29 13:58:19 2015 -0700
  168. | | |
  169. | | | Revert globabl variable appname to local variable
  170. | | |
  171. | | * commit 4f00324f26fdf6e81566a3936fbd4393d127686c
  172. | | | Author: Sam Warren <samuel.l.warren@gmail.com>
  173. | | | Date: Thu Oct 29 11:33:41 2015 -0700
  174. | | |
  175. | | | refactor appName test
  176. | | |
  177. | | * commit 91129c1d89ce946cc400f6ea358cc29245e8947b
  178. | | | Author: Sam Warren <samuel.l.warren@gmail.com>
  179. | | | Date: Tue Oct 27 14:14:51 2015 -0700
  180. | | |
  181. | | | Implement automatic return from app adder
  182. | | |
  183. | | * commit 49e64aa1fd78b06fb862a1401bff9aeae7c31625
  184. | |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  185. |/| Date: Fri Oct 23 16:11:29 2015 -0700
  186. | |
  187. | | Make applications list view
  188. | |
  189. * | commit df4889094d430c9daebe5adf230d3b170410bf30
  190. | | Author: Sam Warren <samuel.l.warren@gmail.com>
  191. | | Date: Thu Oct 15 13:48:07 2015 -0700
  192. | |
  193. | | Hash byte array using SHA256
  194. | |
  195. * | commit db9d474c02f79709eadebe1137863e4219c0dade
  196. | | Author: theworldbright <kent@kentshikama.com>
  197. | | Date: Tue Oct 13 14:34:08 2015 -0700
  198. | |
  199. | | Handle no internet connection case
  200. | |
  201. * | commit dba05315b369db1a2ed06374488b3551d9857ac9
  202. | | Author: theworldbright <kent@kentshikama.com>
  203. | | Date: Sat Oct 10 17:30:16 2015 -0700
  204. | |
  205. | | Set default password length as 5
  206. | |
  207. * | commit a7be58c51f145813bf093e649c2152ffd6080b53
  208. | | Author: theworldbright <kent@kentshikama.com>
  209. | | Date: Sat Oct 10 17:18:32 2015 -0700
  210. | |
  211. | | Enforce password length that was supplied
  212. | |
  213. * | commit e1f457f4fd8dc86d63dcc491852944a76c6dc1fe
  214. | | Author: theworldbright <kent@kentshikama.com>
  215. | | Date: Sat Oct 10 17:30:55 2015 -0700
  216. | |
  217. | | Use HttpsURLConnection for Spotify previews
  218. | |
  219. * | commit d3c323db21f0f44ec524eb5f7b0d2767a6da19f4
  220. | | Author: theworldbright <kent@kentshikama.com>
  221. | | Date: Sat Oct 10 16:23:36 2015 -0700
  222. | |
  223. | | Use 30 second preview from Spotify to generate password
  224. | |
  225. | | * commit 2bf5a4d12b50bf595cdfbb13c38b97721ece69ad (temp)
  226. | |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  227. | | Date: Fri Oct 23 16:11:29 2015 -0700
  228. | |
  229. | | make listview
  230. | |
  231. | * commit 88896d13c1313e377107d655770af2661b5d8e90
  232. | | Author: Sam Warren <samuel.l.warren@gmail.com>
  233. | | Date: Wed Oct 14 22:31:35 2015 -0700
  234. | |
  235. | | format code and extract methods
  236. | |
  237. | * commit ff7daece0b9fd8d298d469355a2392fa77785c14
  238. | |\ Merge: bd8cf0f 1e7f5ec
  239. | |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  240. |/| Date: Sun Oct 11 16:30:13 2015 -0700
  241. | |
  242. | | Merge branch 'develop' of https://github.com/theworldbright/SoundLocker into develop
  243. | |
  244. * | commit 1e7f5ec17ac5d6ac10bf693acb8b4ea356a418ea
  245. | | Author: theworldbright <kent@kentshikama.com>
  246. | | Date: Sat Oct 10 16:52:08 2015 -0700
  247. | |
  248. | | Adjust UI for Password Screen
  249. | |
  250. | * commit bd8cf0f7c21b7e8faaedb038064d2bf91802ff2a
  251. |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  252. | Date: Sun Oct 11 16:28:11 2015 -0700
  253. |
  254. | hash byte array using SHA256 then convert ensuing byte array into string
  255. | of designed
  256. |
  257. * commit 5d598ae94faee96434ef376f37658ed2eb960edd
  258. | Author: Sam Warren <samuel.l.warren@gmail.com>
  259. | Date: Thu Oct 8 20:59:09 2015 -0700
  260. |
  261. | Merge "byte data from song file" feature
  262. |
  263. * commit d7bab9d2b53df212170e8c5e77c392a2aa297ccd
  264. | Author: Patrick Shao <shao.pat@gmail.com>
  265. | Date: Tue Oct 6 21:11:47 2015 -0700
  266. |
  267. | Separate texts and modify user interface
  268. |
  269. * commit e97719737c06decf6115c98a3dac5ccefb6ba33b
  270. | Author: Patrick Shao <shao.pat@gmail.com>
  271. | Date: Tue Oct 6 20:37:42 2015 -0700
  272. |
  273. | Create a test for all visible elements on the screen.
  274. |
  275. * commit ba2e161ea1ca86aa7c4971b6e739210acf3979a2
  276. | Author: Patrick Shao <shao.pat@gmail.com>
  277. | Date: Tue Oct 6 19:45:33 2015 -0700
  278. |
  279. | Create new tests and change theme
  280. |
  281. * commit a42ae27abc0939e3f5332aaed7ae434adf16c91c
  282. | Author: Patrick Shao <shao.pat@gmail.com>
  283. | Date: Wed Sep 30 23:35:52 2015 -0700
  284. |
  285. | Add copy to clipboard and generate password
  286. |
  287. | Generate password currently changes Hello World into a hardcoded text.
  288. | Copy to clipboard takes information from that field and copies it to
  289. | the keyboard.
  290. |
  291. * commit 16e6da246f5259def424f048e1cc6ba5437cb1b9
  292. | Author: Patrick Shao <shao.pat@gmail.com>
  293. | Date: Wed Sep 30 21:51:03 2015 -0700
  294. |
  295. | Change theme and add initial buttons
  296. |
  297. * commit e502945930b229c3adc2f530a1c75746b19433c7
  298. | Author: Patrick Shao <shao.pat@gmail.com>
  299. | Date: Wed Sep 30 21:30:14 2015 -0700
  300. |
  301. | Add app.iml to .gitignore
  302. |
  303. | * commit 90b8b119e84c868a3abbf8e46d3c9cda1bfbdc1c (feature/song-info)
  304. | | Author: Sam Warren <samuel.l.warren@gmail.com>
  305. | | Date: Sat Oct 10 15:51:06 2015 -0700
  306. | |
  307. | | play song on sd card
  308. | |
  309. | * commit e322103b667bad763eb66cc36cc81abef414505e (song-info2, dev)
  310. |/ Author: Sam Warren <samuel.l.warren@gmail.com>
  311. | Date: Tue Sep 29 14:16:59 2015 -0700
  312. |
  313. | Read user's hangouts and play song
  314. |
  315. * commit 5b247453e72a858cb39b5004a658a1a3df771184
  316. |\ Merge: ce20eac 273fa3d
  317. | | Author: Kent Shikama <kent@kentshikama.com>
  318. | | Date: Sun Sep 27 00:48:07 2015 -0700
  319. | |
  320. | | Merge pull request #3 from theworldbright/dev
  321. | |
  322. | | Add /idea to .gitignore and removed app.iml
  323. | |
  324. | * commit 273fa3d83c7211417065c4117afd51590abaf77e
  325. |/ Author: Patrick Shao <shao.pat@gmail.com>
  326. | Date: Sun Sep 27 00:37:06 2015 -0700
  327. |
  328. | Add /idea to .gitignore and removed app.iml
  329. |
  330. * commit ce20eac0b68c4b9ce8786447530e14baffe0251f
  331. | Author: theworldbright <kent@kentshikama.com>
  332. | Date: Sun Sep 27 00:05:29 2015 -0700
  333. |
  334. | Replace tabs with spaces
  335. |
  336. * commit 60dcfffc5165412c761b8321db749aa408c726cf
  337. | Author: theworldbright <kent@kentshikama.com>
  338. | Date: Sun Sep 27 00:03:20 2015 -0700
  339. |
  340. | Add back parallel build
  341. |
  342. * commit 07cd9020e99290cc25ffde2783afaf9aa3196144
  343. | Author: theworldbright <kent@kentshikama.com>
  344. | Date: Sat Sep 26 23:59:18 2015 -0700
  345. |
  346. | Stabilize circle CI build with sleep calls
  347. |
  348. * commit ba0002119ac85577be62cc603f380e0ed7149cd3
  349. | Author: theworldbright <kent@kentshikama.com>
  350. | Date: Sat Sep 26 23:54:05 2015 -0700
  351. |
  352. | Fix minor build error
  353. |
  354. * commit d8a0860bf12570ae3146687fea03ecc425c5cd17
  355. | Author: theworldbright <kent@kentshikama.com>
  356. | Date: Sat Sep 26 22:37:15 2015 -0700
  357. |
  358. | Fix path on test server (Circle CI)
  359. |
  360. * commit afb4320922578a11511a8d7a8fc81e9d5a9e4cda
  361. | Author: theworldbright <kent@kentshikama.com>
  362. | Date: Sat Sep 26 22:24:13 2015 -0700
  363. |
  364. | Unlock screen before tests
  365. |
  366. * commit df61e1c4a31b3a592342c1c71b6ce4b2aa8bb589
  367. | Author: theworldbright <kent@kentshikama.com>
  368. | Date: Sat Sep 26 22:08:00 2015 -0700
  369. |
  370. | Change test emulator to android-21
  371. |
  372. * commit 41d75eda4cbdf569223ed101258722dc9b9d0a31
  373. | Author: theworldbright <kent@kentshikama.com>
  374. | Date: Sat Sep 26 21:50:33 2015 -0700
  375. |
  376. | Change SDK version to 21
  377. |
  378. * commit ed3ad2129e5a095722360c733ee5d30f3a14fba7
  379. | Author: theworldbright <kent@kentshikama.com>
  380. | Date: Sat Sep 26 21:43:00 2015 -0700
  381. |
  382. | Add Espresso 2.0 testing to Circle CI
  383. |
  384. * commit 6af04c95f4fcda6c83345ab36f8b7fe2b5ce3fd7
  385. | Author: theworldbright <kent@kentshikama.com>
  386. | Date: Sat Sep 26 20:25:27 2015 -0700
  387. |
  388. | Add initial circle.yml file for Circle CI
  389. |
  390. * commit d6078098d61d9a8268776aaafb031a65fd7d8862
  391. Author: theworldbright <kent@kentshikama.com>
  392. Date: Sat Sep 19 23:08:56 2015 -0700
  393.  
  394. Initial commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!