Advertisement
Guest User

Untitled

a guest
Sep 18th, 2017
462
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 33.65 KB | None | 0 0
  1. commit 045e82d1b767f41c0ca140581e06e6730424300b
  2. Merge: caffb3b 87b0ca6
  3. Author: Michelle Koeth <michelle@codeforamerica.org>
  4. Date: Sun Jun 19 11:52:01 2011 -0700
  5.  
  6. Merge branch 'master' of github.com:hackforchange/Safehood
  7.  
  8. commit caffb3b6fd3cb99936ee2551292fb11428c7fbed
  9. Author: Michelle Koeth <michelle@codeforamerica.org>
  10. Date: Sun Jun 19 11:51:42 2011 -0700
  11.  
  12. Added Tropo Scripts
  13.  
  14. commit 87b0ca6308d3d77368d3d6ef81665bbe07f52e56
  15. Author: Karen Rustad <karen.rustad@gmail.com>
  16. Date: Sun Jun 19 11:29:19 2011 -0700
  17.  
  18. acknowledge that if the govt comes knocking, we will probably hand over our data....
  19.  
  20. commit acdbc25188db061c69960817471c5162cf1b5eaf
  21. Author: Alan Palazzolo <github@zzolo.org>
  22. Date: Sun Jun 19 11:12:49 2011 -0700
  23.  
  24. Added browser geolocation for message explorer.
  25.  
  26. commit a2e9ccdfea7e30a90f28616f4ca552e7221e8aa1
  27. Author: Alan Palazzolo <github@zzolo.org>
  28. Date: Sun Jun 19 11:07:00 2011 -0700
  29.  
  30. fixed some styles.
  31.  
  32. commit 01521b4f5631f6957032c02b9f636d8adb2553e2
  33. Merge: b46493c 0dd9613
  34. Author: Alan Palazzolo <github@zzolo.org>
  35. Date: Sun Jun 19 10:59:07 2011 -0700
  36.  
  37. Merge branch 'master' of github.com:hackforchange/Safehood
  38.  
  39. commit b46493cfe16dc604c78f0b8260f40c73ae48ec4e
  40. Author: Alan Palazzolo <github@zzolo.org>
  41. Date: Sun Jun 19 10:59:01 2011 -0700
  42.  
  43. Added better popup and message map handling.
  44.  
  45. commit 0dd961362895095309feeeb6af78f06a8bc1dd09
  46. Author: Karen Rustad <karen.rustad@gmail.com>
  47. Date: Sun Jun 19 10:37:00 2011 -0700
  48.  
  49. Added a bit about our inspiration to the /about/ page
  50.  
  51. commit f32a063d571c52dda6a5a923fb885fc069b0eeb7
  52. Author: Karen Rustad <karen.rustad@gmail.com>
  53. Date: Sun Jun 19 10:32:44 2011 -0700
  54.  
  55. added Commands page to bottom links, slight copy edits
  56.  
  57. commit 8cdf7904e6856e04a510ba40e93280831da26a36
  58. Author: Karen Rustad <karen.rustad@gmail.com>
  59. Date: Sun Jun 19 10:28:33 2011 -0700
  60.  
  61. made logo slightly bigger
  62.  
  63. commit feaa1ecbf0bafabf2ae29960c79be7d2150c5eb1
  64. Author: Karen Rustad <karen.rustad@gmail.com>
  65. Date: Sun Jun 19 10:19:34 2011 -0700
  66.  
  67. Made header tags normal weight in both FF and Chrome
  68.  
  69. commit 6f05dee7ca5528c89da192527d0d76a4f700a4b3
  70. Merge: f3837b5 1dd57df
  71. Author: Alan Palazzolo <github@zzolo.org>
  72. Date: Sun Jun 19 10:18:53 2011 -0700
  73.  
  74. Merge branch 'master' of github.com:hackforchange/Safehood
  75.  
  76. commit f3837b5cb72bbed1e4de7cf942782b4d2ae81e22
  77. Author: Alan Palazzolo <github@zzolo.org>
  78. Date: Sun Jun 19 10:18:43 2011 -0700
  79.  
  80. Fixed message explorer page.
  81.  
  82. commit 1dd57df5a7d80156bf705507f5a6b1142ea5cf9b
  83. Author: Karen Rustad <karen.rustad@gmail.com>
  84. Date: Sun Jun 19 10:16:28 2011 -0700
  85.  
  86. added separator line between header and content
  87.  
  88. commit 03836fef7537a0f2614feff9b3a8e53cc88762fb
  89. Author: Alan Palazzolo <github@zzolo.org>
  90. Date: Sun Jun 19 10:09:30 2011 -0700
  91.  
  92. Minor edit top box.
  93.  
  94. commit 98346233e1e6970939f87714738d21d872a5b693
  95. Merge: 19ebe23 89e9f7b
  96. Author: Alan Palazzolo <github@zzolo.org>
  97. Date: Sun Jun 19 10:07:56 2011 -0700
  98.  
  99. Merge branch 'master' of github.com:hackforchange/Safehood
  100.  
  101. commit 19ebe23814c16b49cdab40a9209b5a46ad441668
  102. Author: Alan Palazzolo <github@zzolo.org>
  103. Date: Sun Jun 19 10:07:46 2011 -0700
  104.  
  105. RE-adding some style changes.
  106.  
  107. commit 89e9f7b1fe953757aad2186dff314caa74ae7456
  108. Merge: dc65086 3ee3313
  109. Author: T S <YenTheFirst@gmail.com>
  110. Date: Sun Jun 19 10:04:14 2011 -0700
  111.  
  112. Merge branch 'master' of github.com:hackforchange/Safehood
  113.  
  114. commit dc650864c91fe250209f0bc03fc50590762f6565
  115. Author: T S <YenTheFirst@gmail.com>
  116. Date: Sun Jun 19 10:04:04 2011 -0700
  117.  
  118. do the helper in the controller
  119.  
  120. commit 3ee3313a96b6c53b8bb99c5345f784d3cb46693a
  121. Author: Karen Rustad <karen.rustad@gmail.com>
  122. Date: Sun Jun 19 10:02:38 2011 -0700
  123.  
  124. made location-finding help text appear
  125.  
  126. commit 3a7252b79008a9dbd6ebf330a0cdace03aa9345a
  127. Merge: be5d853 375da2d
  128. Author: Karen Rustad <karen.rustad@gmail.com>
  129. Date: Sun Jun 19 09:57:43 2011 -0700
  130.  
  131. Merge branch 'master' of github.com:hackforchange/Safehood
  132.  
  133. commit 375da2ddc65064392927c35915c9190bf1bb5a12
  134. Merge: 9dfc08d fe0e9cc
  135. Author: Alan Palazzolo <github@zzolo.org>
  136. Date: Sun Jun 19 09:52:36 2011 -0700
  137.  
  138. Merge branch 'master' of github.com:hackforchange/Safehood
  139.  
  140. commit 9dfc08dcb5239fcabad22f145b3032fd141cc755
  141. Author: Alan Palazzolo <github@zzolo.org>
  142. Date: Sun Jun 19 09:52:31 2011 -0700
  143.  
  144. Finished geocoding input for home page.
  145.  
  146. commit fe0e9ccdcf18a356753539f847ce013693fcd35c
  147. Merge: f47a26d bdefe53
  148. Author: Michelle Koeth <michelle@codeforamerica.org>
  149. Date: Sun Jun 19 09:52:14 2011 -0700
  150.  
  151. Merge branch 'master' of github.com:hackforchange/Safehood
  152.  
  153. commit f47a26db8bca0900db7f6a6d03889c25dc157f3c
  154. Author: Michelle Koeth <michelle@codeforamerica.org>
  155. Date: Sun Jun 19 09:52:02 2011 -0700
  156.  
  157. copy for commands page
  158.  
  159. commit be5d853f1fdae65adefbbb789d7a473b0f516de7
  160. Author: Karen Rustad <karen.rustad@gmail.com>
  161. Date: Sun Jun 19 09:47:57 2011 -0700
  162.  
  163. made footer badger smaller
  164.  
  165. commit a4886f3949c374764a846599a8c7bd21a3c19cf7
  166. Merge: 33f3ab3 bdefe53
  167. Author: Karen Rustad <karen.rustad@gmail.com>
  168. Date: Sun Jun 19 09:46:07 2011 -0700
  169.  
  170. Merge branch 'master' of github.com:hackforchange/Safehood
  171.  
  172. commit bdefe53445c2fe77808a0f59602cbf8ac0b15d35
  173. Merge: 1d4c688 70faeed
  174. Author: T S <YenTheFirst@gmail.com>
  175. Date: Sun Jun 19 09:41:10 2011 -0700
  176.  
  177. Merge branch 'master' of github.com:hackforchange/Safehood
  178.  
  179. commit 1d4c688c2c2eb2a316877d7ea6f4ef3e8ae30908
  180. Author: T S <YenTheFirst@gmail.com>
  181. Date: Sun Jun 19 09:40:59 2011 -0700
  182.  
  183. actually send #help correctly
  184.  
  185. commit 33f3ab38692df72ea2d3e102bb304a76c043a0b5
  186. Author: Karen Rustad <karen.rustad@gmail.com>
  187. Date: Sun Jun 19 09:40:37 2011 -0700
  188.  
  189. added cyborg badger to about page
  190.  
  191. commit 41931a9b9ebd7fd8afd17a0a4bf96697f731ca2a
  192. Author: Karen Rustad <karen.rustad@gmail.com>
  193. Date: Sun Jun 19 09:34:03 2011 -0700
  194.  
  195. added cyborg badger's shadow
  196.  
  197. commit 70faeedd97f0e0bd368fb62cbb8bc17f8082142f
  198. Merge: 1726ceb 87844c8
  199. Author: Michelle Koeth <michelle@codeforamerica.org>
  200. Date: Sun Jun 19 09:33:34 2011 -0700
  201.  
  202. Merge branch 'master' of github.com:hackforchange/Safehood
  203.  
  204. commit 1726ceb012da1e26b75040e11a67f9f07195b652
  205. Author: Michelle Koeth <michelle@codeforamerica.org>
  206. Date: Sun Jun 19 09:33:21 2011 -0700
  207.  
  208. add view for commands documentation'
  209.  
  210. commit 87844c8accc7a87b09ec5d58e7ac11d5fb6e73dd
  211. Author: Karen Rustad <karen.rustad@gmail.com>
  212. Date: Sun Jun 19 09:28:28 2011 -0700
  213.  
  214. Fixed footer centering; added cyborg badgers
  215.  
  216. commit d79f1857104eb51dc1ebfba936b312241adf1dcf
  217. Author: Karen Rustad <karen.rustad@gmail.com>
  218. Date: Sun Jun 19 09:16:40 2011 -0700
  219.  
  220. moved styling to cool-blurb instead of its paragraphs
  221.  
  222. commit 457690a8f54ac58b86a7e24e404c028609a1b891
  223. Merge: 87d35ab 1cfe45b
  224. Author: Alan Palazzolo <github@zzolo.org>
  225. Date: Sun Jun 19 09:24:46 2011 -0700
  226.  
  227. Merge branch 'master' of github.com:hackforchange/Safehood
  228.  
  229. commit 87d35ab659a97831918bed139e9be5de8bdcda89
  230. Author: Alan Palazzolo <github@zzolo.org>
  231. Date: Sun Jun 19 09:24:38 2011 -0700
  232.  
  233. Made geolocating more smooth and sexy.
  234.  
  235. commit 1cfe45b31f98b48d06a5c13c352b34fddd0e9bcd
  236. Author: T S <YenTheFirst@gmail.com>
  237. Date: Sun Jun 19 09:24:17 2011 -0700
  238.  
  239. fix per_page
  240.  
  241. commit 80c559f7189edd56718af7d13a699d683eccbc63
  242. Merge: 72c12ec 5daa115
  243. Author: Michelle Koeth <michelle@codeforamerica.org>
  244. Date: Sun Jun 19 09:14:53 2011 -0700
  245.  
  246. Merge branch 'master' of github.com:hackforchange/Safehood
  247.  
  248. commit 72c12ec8d7670633b31bc13aa5e653b75b5a5364
  249. Author: Michelle Koeth <michelle@codeforamerica.org>
  250. Date: Sun Jun 19 09:14:41 2011 -0700
  251.  
  252. Limit displayed messages on homepage to 10
  253.  
  254. commit 7b0a886c5faed5ebb3c3c3eb8b4ead8bdec0eb3c
  255. Author: Alan Palazzolo <github@zzolo.org>
  256. Date: Sun Jun 19 09:12:17 2011 -0700
  257.  
  258. Added bolded anonymous in home.
  259.  
  260. commit 5daa11588928a77db109a2be73c5b25423f114b5
  261. Author: Alan Palazzolo <github@zzolo.org>
  262. Date: Sun Jun 19 09:08:29 2011 -0700
  263.  
  264. Minor styling changes.
  265.  
  266. commit 7b18f969627edd7116c29d519e09554baa0b4797
  267. Merge: bf93f13 ce0a253
  268. Author: Michelle Koeth <michelle@codeforamerica.org>
  269. Date: Sun Jun 19 08:58:28 2011 -0700
  270.  
  271. Merge branch 'master' of github.com:hackforchange/Safehood
  272.  
  273. Conflicts:
  274. app/views/application/index.html.erb
  275.  
  276. commit bf93f137f74e42b664863e0fc6947340ae157094
  277. Author: Michelle Koeth <michelle@codeforamerica.org>
  278. Date: Sun Jun 19 08:55:43 2011 -0700
  279.  
  280. updated copy
  281.  
  282. commit d80d084891a4752096d7898c1df632b37f70ad81
  283. Author: Michelle Koeth <michelle@codeforamerica.org>
  284. Date: Sun Jun 19 08:00:53 2011 -0700
  285.  
  286. Added phone number to view
  287.  
  288. commit ce0a25392c0c94bb95bee30cafc7806a12d7d70e
  289. Author: Alan Palazzolo <github@zzolo.org>
  290. Date: Sun Jun 19 07:53:33 2011 -0700
  291.  
  292. Minor copy edit.
  293.  
  294. commit 312e7e48ddf8f7755b9f42328157d80cbb7f98a3
  295. Author: Alan Palazzolo <github@zzolo.org>
  296. Date: Sun Jun 19 07:52:49 2011 -0700
  297.  
  298. Updated messages title on front page.
  299.  
  300. commit cbb4794ca381fda7ae44e2704c0dacfaa17e79fb
  301. Author: T S <YenTheFirst@gmail.com>
  302. Date: Sun Jun 19 03:57:54 2011 -0700
  303.  
  304. fix 'change address' pattern
  305.  
  306. commit 46557a597c788ee2836ccdc5be079ca13e84b756
  307. Author: T S <YenTheFirst@gmail.com>
  308. Date: Sun Jun 19 03:31:07 2011 -0700
  309.  
  310. added a 'fuzzy' lat/lon, to return from API calls. this will be rounded down, and appended with a random value, to anonymize a geolocation
  311.  
  312. commit 7e3968ae97ce0b49cc83ca2fcc6bd7ecb5857544
  313. Author: T S <YenTheFirst@gmail.com>
  314. Date: Sun Jun 19 02:26:05 2011 -0700
  315.  
  316. actually, page=all is pretty silly. allow a custom per_page, with a limit of 1k
  317.  
  318. commit 37211c19a27e5d38c1c518eb2a4baf6bf2c56a5d
  319. Author: T S <YenTheFirst@gmail.com>
  320. Date: Sun Jun 19 02:20:23 2011 -0700
  321.  
  322. added support for "page=all" to API
  323.  
  324. commit 65035db1c5a6fdb2feb4ef6b80e8245a33ea2e74
  325. Author: T S <YenTheFirst@gmail.com>
  326. Date: Sun Jun 19 02:16:18 2011 -0700
  327.  
  328. adde support for date_min and _max methods on API
  329.  
  330. commit 6120b33a43d6d29bf7bf5e5c9a1217b83e4edaa4
  331. Author: T S <YenTheFirst@gmail.com>
  332. Date: Sun Jun 19 02:02:47 2011 -0700
  333.  
  334. catch invalid 'commands'
  335.  
  336. commit 77fe7a7264761b567854723d187bf5638fae6727
  337. Author: T S <YenTheFirst@gmail.com>
  338. Date: Sun Jun 19 01:58:09 2011 -0700
  339.  
  340. address hidden lat/lon fields correctly
  341.  
  342. commit ca89af6fe944e50b3b3cf085877fe5f6f1734d5f
  343. Author: T S <YenTheFirst@gmail.com>
  344. Date: Sun Jun 19 01:53:16 2011 -0700
  345.  
  346. write the form rails style
  347.  
  348. commit c45ce0cdb2722e0ddaed7914303484ca3c172f9e
  349. Author: T S <YenTheFirst@gmail.com>
  350. Date: Sun Jun 19 01:53:06 2011 -0700
  351.  
  352. fix up the create_user
  353.  
  354. commit 8ee697be712ca900d4512bbe540ca5fd0c693ca3
  355. Author: T S <YenTheFirst@gmail.com>
  356. Date: Sun Jun 19 01:35:01 2011 -0700
  357.  
  358. prettier routes
  359.  
  360. commit c8be93f635d4c66ee596761c6c90943888564d72
  361. Author: T S <YenTheFirst@gmail.com>
  362. Date: Sun Jun 19 01:34:41 2011 -0700
  363.  
  364. add create_user route
  365.  
  366. commit ae89f370ac6ab6299e8aa84b4bdb75cfeefee651
  367. Author: T S <YenTheFirst@gmail.com>
  368. Date: Sun Jun 19 01:31:33 2011 -0700
  369.  
  370. route pretty
  371.  
  372. commit 6be4a4db14018ea1916bcb53beafafcf7925971f
  373. Author: T S <YenTheFirst@gmail.com>
  374. Date: Sun Jun 19 01:30:47 2011 -0700
  375.  
  376. added web signup/confirmation workflow
  377.  
  378. commit af74dd1345933a0e5ef3da01eb88900fed6c7321
  379. Author: T S <YenTheFirst@gmail.com>
  380. Date: Sun Jun 19 01:18:45 2011 -0700
  381.  
  382. only fetch active users
  383.  
  384. commit 29d5ed8c0e7a02d26110de2b1847f59138b165f5
  385. Author: T S <YenTheFirst@gmail.com>
  386. Date: Sun Jun 19 01:08:34 2011 -0700
  387.  
  388. added text search and bounding box to message list API
  389.  
  390. commit e5e4e141f2cd6555a9d0615375d87142f6664548
  391. Merge: 75abee0 5ceb297
  392. Author: T S <YenTheFirst@gmail.com>
  393. Date: Sun Jun 19 00:53:30 2011 -0700
  394.  
  395. Merge branch 'master' of github.com:hackforchange/Safehood
  396.  
  397. commit 75abee0742959098e9bcb6269cb33b036f222e39
  398. Author: T S <YenTheFirst@gmail.com>
  399. Date: Sun Jun 19 00:53:15 2011 -0700
  400.  
  401. added mute and unmute methods
  402.  
  403. commit 416d0317d561cbc217d8b1db8469d3713d16fe16
  404. Author: T S <YenTheFirst@gmail.com>
  405. Date: Sun Jun 19 00:48:07 2011 -0700
  406.  
  407. factored out subscription requirements for text processing
  408.  
  409. commit 8ae0eb9105b318376c71852759887247de224678
  410. Author: T S <YenTheFirst@gmail.com>
  411. Date: Sun Jun 19 00:32:51 2011 -0700
  412.  
  413. added 'help' and 'num' methods
  414.  
  415. commit 5ceb2976bfb8cbb29a0ef9229e89b82521634ec8
  416. Merge: d1249a5 2b609d8
  417. Author: Michelle Koeth <michelle@codeforamerica.org>
  418. Date: Sat Jun 18 22:55:14 2011 -0700
  419.  
  420. Merge branch 'master' of github.com:hackforchange/Safehood
  421.  
  422. commit d1249a5d2faf7a62930f95883e0fdd82fc2a0b7a
  423. Author: Michelle Koeth <michelle@codeforamerica.org>
  424. Date: Sat Jun 18 22:55:03 2011 -0700
  425.  
  426. text to indicate what is voice transcription
  427.  
  428. commit 7877d57b2a91b638f6a12dc46ecf34d18e9d0cb6
  429. Author: T S <YenTheFirst@gmail.com>
  430. Date: Sat Jun 18 22:52:21 2011 -0700
  431.  
  432. added basic pagination support
  433.  
  434. commit 2b609d8fb7c9a7c6e5146c451c4b0ceb018c7a82
  435. Author: T S <YenTheFirst@gmail.com>
  436. Date: Sat Jun 18 22:41:29 2011 -0700
  437.  
  438. string.to_a doesn't work on heroku, make everything an array
  439.  
  440. commit bf8a24649a5004decf26e305039e225674046207
  441. Author: T S <YenTheFirst@gmail.com>
  442. Date: Sat Jun 18 22:39:47 2011 -0700
  443.  
  444. make command matching case insensitive
  445.  
  446. commit 6ba00d9c54d407d5a2ad36e50a375060b3920dad
  447. Merge: 54856b0 8abf422
  448. Author: Michelle Koeth <michelle@codeforamerica.org>
  449. Date: Sat Jun 18 22:20:37 2011 -0700
  450.  
  451. Merge branch 'master' of github.com:hackforchange/Safehood
  452.  
  453. commit 54856b0c26c3ca14516fae6dd2392135a86788ed
  454. Author: Michelle Koeth <michelle@codeforamerica.org>
  455. Date: Sat Jun 18 22:20:23 2011 -0700
  456.  
  457. Added more to voice function
  458.  
  459. commit 8abf4226b44ef7b98616023db443ce92fea69aa0
  460. Author: T S <YenTheFirst@gmail.com>
  461. Date: Sat Jun 18 22:10:37 2011 -0700
  462.  
  463. only javascript the actual items yo yeah wooo I am up late
  464.  
  465. commit b44ff146283f9d57acec162bbbc05e3719dc4a51
  466. Author: T S <YenTheFirst@gmail.com>
  467. Date: Sat Jun 18 21:51:58 2011 -0700
  468.  
  469. factor out safe field selection
  470.  
  471. commit 34ff6a652b45730bea8109d0e6ee29ead7bd4ecd
  472. Author: T S <YenTheFirst@gmail.com>
  473. Date: Sat Jun 18 21:49:40 2011 -0700
  474.  
  475. only show necessary fields
  476.  
  477. commit 0da37357d89ff7510441bc4c7606c5d07d5ca1bd
  478. Author: T S <YenTheFirst@gmail.com>
  479. Date: Sat Jun 18 21:47:48 2011 -0700
  480.  
  481. factor out common message list code
  482.  
  483. commit b3056fb8a8d608a5652176a93f2e8c648f54f94f
  484. Author: T S <YenTheFirst@gmail.com>
  485. Date: Sat Jun 18 21:45:24 2011 -0700
  486.  
  487. modify map to make live JSON call against messages
  488.  
  489. commit 4f62ea554585c31f5dec52f36ff1a84412f7e175
  490. Author: T S <YenTheFirst@gmail.com>
  491. Date: Sat Jun 18 21:45:12 2011 -0700
  492.  
  493. add JSON output to message index
  494.  
  495. commit cb05b80cb8ce1fa2d4eff91eb459566ade6ccdd1
  496. Author: T S <YenTheFirst@gmail.com>
  497. Date: Sat Jun 18 21:44:49 2011 -0700
  498.  
  499. factored message into a partial; display actual messages on pages
  500.  
  501. commit d5510b08456a84c076c17eff88cb248c8cfc7a7b
  502. Merge: 46de8dd 2704a22
  503. Author: Michelle Koeth <michelle@codeforamerica.org>
  504. Date: Sat Jun 18 21:17:05 2011 -0700
  505.  
  506. Merge branch 'master' of github.com:hackforchange/Safehood
  507.  
  508. commit 2704a22be7c2db254a7bd81e45e079c74d237aa9
  509. Merge: 6567d54 79a5259
  510. Author: Alan Palazzolo <github@zzolo.org>
  511. Date: Sat Jun 18 21:16:40 2011 -0700
  512.  
  513. Merge branch 'master' of github.com:hackforchange/Safehood
  514.  
  515. commit 46de8dd14630ab60552b53b4652e297cc03f1fa5
  516. Author: Michelle Koeth <michelle@codeforamerica.org>
  517. Date: Sat Jun 18 21:16:39 2011 -0700
  518.  
  519. added beginning of voice handling
  520.  
  521. commit 6567d54f2b72241301674d69ffb9655237785d10
  522. Author: Alan Palazzolo <github@zzolo.org>
  523. Date: Sat Jun 18 21:16:27 2011 -0700
  524.  
  525. Added help for map input.
  526.  
  527. commit 79a52591c7f12f2bac48f03f77474f25561d641e
  528. Author: Karen Rustad <karen.rustad@gmail.com>
  529. Date: Sat Jun 18 21:13:25 2011 -0700
  530.  
  531. badger logo exists in images folder
  532.  
  533. commit e87dc956974663ca1899b3df93d38d156aff7680
  534. Author: Alan Palazzolo <github@zzolo.org>
  535. Date: Sat Jun 18 21:08:04 2011 -0700
  536.  
  537. Minor CSS fix.
  538.  
  539. commit 2301e22390c126df4eded7297920ead9c129fcb3
  540. Merge: 917ab98 885edf5
  541. Author: Alan Palazzolo <github@zzolo.org>
  542. Date: Sat Jun 18 21:06:15 2011 -0700
  543.  
  544. Merge branch 'master' of github.com:hackforchange/Safehood
  545.  
  546. commit 917ab9808ba11abf13955acba8eba9146e4aceef
  547. Author: Alan Palazzolo <github@zzolo.org>
  548. Date: Sat Jun 18 21:06:09 2011 -0700
  549.  
  550. Added reverse geocoding to input map.
  551.  
  552. commit 885edf56d34d4b249afa8caa1c9392f7f416e381
  553. Author: Karen Rustad <karen.rustad@gmail.com>
  554. Date: Sat Jun 18 20:37:40 2011 -0700
  555.  
  556. Added fake 'messages' to front page
  557.  
  558. commit 63b501dac00762909bce3ac95ef78df6e67748bb
  559. Author: Alan Palazzolo <github@zzolo.org>
  560. Date: Sat Jun 18 20:31:17 2011 -0700
  561.  
  562. Fixed leaflet attribution styles.
  563.  
  564. commit c6f2ece6d23cbebca28763117fcdd0474b0fce41
  565. Author: Karen Rustad <karen.rustad@gmail.com>
  566. Date: Sat Jun 18 20:30:03 2011 -0700
  567.  
  568. made all single-column headers h1s
  569.  
  570. commit 1d4dd1ccc229c49d0b24b73f827669d1546645ad
  571. Author: Karen Rustad <karen.rustad@gmail.com>
  572. Date: Sat Jun 18 20:29:23 2011 -0700
  573.  
  574. added : to messages/ header
  575.  
  576. commit 337cb2dd0438ac3e24e5c52d075af1028ad5bdf4
  577. Author: Karen Rustad <karen.rustad@gmail.com>
  578. Date: Sat Jun 18 20:27:47 2011 -0700
  579.  
  580. added single-column and module div wrappers
  581.  
  582. commit 633e9a349f95b36c996c42f49970d51f7f6fa155
  583. Merge: ed5d0ed 891c252
  584. Author: Alan Palazzolo <github@zzolo.org>
  585. Date: Sat Jun 18 20:26:33 2011 -0700
  586.  
  587. Merge branch 'master' of github.com:hackforchange/Safehood
  588.  
  589. commit ed5d0ed9eee06fc9768e828bb1446701a35b2326
  590. Author: Alan Palazzolo <github@zzolo.org>
  591. Date: Sat Jun 18 20:26:25 2011 -0700
  592.  
  593. Added modernizr and ability to gelocate via HTML5.
  594.  
  595. commit 891c25252f85c9bd1f99419b5452695ccbdbd184
  596. Merge: f2f3d95 73d9522
  597. Author: T S <YenTheFirst@gmail.com>
  598. Date: Sat Jun 18 20:25:47 2011 -0700
  599.  
  600. Merge branch 'master' of github.com:hackforchange/Safehood
  601.  
  602. commit f2f3d952d97fd5a93f5e692a62aa9fd2aa7871d6
  603. Author: T S <YenTheFirst@gmail.com>
  604. Date: Sat Jun 18 20:25:23 2011 -0700
  605.  
  606. filled in change address
  607.  
  608. commit 73d9522a4f2c7ae3e320fedd6468f30e954a2df6
  609. Author: Karen Rustad <karen.rustad@gmail.com>
  610. Date: Sat Jun 18 20:23:36 2011 -0700
  611.  
  612. Optimized bricks background picture to make file size smaller
  613.  
  614. commit 903c1a2572acd1979be61d45747bd2fccd3cace9
  615. Merge: 8187c40 201275b
  616. Author: T S <YenTheFirst@gmail.com>
  617. Date: Sat Jun 18 20:21:08 2011 -0700
  618.  
  619. Merge branch 'master' of github.com:hackforchange/Safehood
  620.  
  621. commit 8187c40ca98b0530fdf9ad18bc80643e85a646ce
  622. Author: T S <YenTheFirst@gmail.com>
  623. Date: Sat Jun 18 20:20:56 2011 -0700
  624.  
  625. handle alias'd commands correctly
  626.  
  627. commit 55c331e1b6602672a6c82719d2552be6dcb27448
  628. Author: T S <YenTheFirst@gmail.com>
  629. Date: Sat Jun 18 20:19:09 2011 -0700
  630.  
  631. fill in 'unsubscribe' method
  632.  
  633. commit 201275b7914e8d2b5786100ed38134b95a5b016b
  634. Author: Karen Rustad <karen.rustad@gmail.com>
  635. Date: Sat Jun 18 20:16:07 2011 -0700
  636.  
  637. Wrote basic privacy page copy
  638.  
  639. commit 71629bc14bfb3b7cede178a4b5d3b15a0a7ee2b0
  640. Merge: b097593 f139e1a
  641. Author: T S <YenTheFirst@gmail.com>
  642. Date: Sat Jun 18 20:11:20 2011 -0700
  643.  
  644. Merge branch 'master' of github.com:hackforchange/Safehood
  645.  
  646. commit b097593218ef56b4e8748dd35e9e33f9f9f59d64
  647. Author: T S <YenTheFirst@gmail.com>
  648. Date: Sat Jun 18 20:11:01 2011 -0700
  649.  
  650. factor out message sending, and add logging
  651.  
  652. commit 9ee5ad078ae432744d37de7fca27babd68aeffe2
  653. Author: T S <YenTheFirst@gmail.com>
  654. Date: Sat Jun 18 20:08:39 2011 -0700
  655.  
  656. added better failure modes for signup
  657.  
  658. commit f139e1a99e997a74e63b5e76b2354056f0c3bb42
  659. Author: Karen Rustad <karen.rustad@gmail.com>
  660. Date: Sat Jun 18 20:05:49 2011 -0700
  661.  
  662. added about and privacy pages, made logo a link to home page
  663.  
  664. commit 661259b089160877b117e03400dc59c06d2dadad
  665. Author: T S <YenTheFirst@gmail.com>
  666. Date: Sat Jun 18 20:05:39 2011 -0700
  667.  
  668. generalized sms functions
  669.  
  670. commit f41967ea640ccd7a6d057da15077265972c583f7
  671. Merge: f4cbd88 f97497b
  672. Author: Alan Palazzolo <github@zzolo.org>
  673. Date: Sat Jun 18 19:44:55 2011 -0700
  674.  
  675. Merge branch 'master' of github.com:hackforchange/Safehood
  676.  
  677. commit f4cbd88a983955735210762b5ef957b7cc48d1a6
  678. Author: Alan Palazzolo <github@zzolo.org>
  679. Date: Sat Jun 18 19:44:48 2011 -0700
  680.  
  681. Added map to front page.
  682.  
  683. commit f97497baa3120c2573ea91e4d5a96c88204da177
  684. Merge: ae24acd fcae7b6
  685. Author: T S <YenTheFirst@gmail.com>
  686. Date: Sat Jun 18 19:37:13 2011 -0700
  687.  
  688. Merge branch 'master' of github.com:hackforchange/Safehood
  689.  
  690. commit ae24acd5430a2127bc937114f78f567701f81454
  691. Author: T S <YenTheFirst@gmail.com>
  692. Date: Sat Jun 18 19:36:54 2011 -0700
  693.  
  694. phone must be unique
  695.  
  696. commit fcae7b6d79e56912a9421ed3f8f6fb5b84cb01a3
  697. Author: Karen Rustad <karen.rustad@gmail.com>
  698. Date: Sat Jun 18 19:36:33 2011 -0700
  699.  
  700. added transparency to front page signup button to match
  701.  
  702. commit 47868e33491f690242885eb2801b23da47a20184
  703. Merge: 2588fa7 72cad34
  704. Author: Alan Palazzolo <github@zzolo.org>
  705. Date: Sat Jun 18 19:34:33 2011 -0700
  706.  
  707. Merge branch 'master' of github.com:hackforchange/Safehood
  708.  
  709. commit 2588fa729a68a8636732c1de5a721a1fd66859cd
  710. Author: Alan Palazzolo <github@zzolo.org>
  711. Date: Sat Jun 18 19:34:29 2011 -0700
  712.  
  713. slight css update.
  714.  
  715. commit 72cad348407401da1634161f76fb3e1435e07826
  716. Author: Karen Rustad <karen.rustad@gmail.com>
  717. Date: Sat Jun 18 19:30:22 2011 -0700
  718.  
  719. awesome swirly side borders
  720.  
  721. commit 235bc6aff20c61206a954349db2a69836dd0c35e
  722. Author: T S <YenTheFirst@gmail.com>
  723. Date: Sat Jun 18 19:22:56 2011 -0700
  724.  
  725. bugfix
  726.  
  727. commit 1b3e85c13d05173f690243ab9be836d95dc84e01
  728. Author: T S <YenTheFirst@gmail.com>
  729. Date: Sat Jun 18 19:16:02 2011 -0700
  730.  
  731. actually remove geokit's geocoder
  732.  
  733. commit f4181aa831cd7d1fa0222016c142edab5d0cee1e
  734. Merge: e176a8f 142bdfe
  735. Author: T S <YenTheFirst@gmail.com>
  736. Date: Sat Jun 18 19:14:25 2011 -0700
  737.  
  738. Merge branch 'master' of github.com:hackforchange/Safehood
  739.  
  740. commit e176a8f2be7e863c09f376ac3f9b36428579d8e8
  741. Author: T S <YenTheFirst@gmail.com>
  742. Date: Sat Jun 18 19:13:51 2011 -0700
  743.  
  744. use 'geocoder' instead of stupidness geokit
  745.  
  746. commit 142bdfe1da2b56be000e67dd49c9523cbd446d6f
  747. Author: Alan Palazzolo <github@zzolo.org>
  748. Date: Sat Jun 18 19:11:46 2011 -0700
  749.  
  750. Updated home page subscription input form.
  751.  
  752. commit f18a1ad0b1c5e9a066dc1dc054e247e813f6484b
  753. Merge: a594ca5 3401af6
  754. Author: Alan Palazzolo <github@zzolo.org>
  755. Date: Sat Jun 18 18:46:35 2011 -0700
  756.  
  757. Merge branch 'master' of github.com:hackforchange/Safehood
  758.  
  759. commit a594ca5bf0fba0e47d4fdc2f5d0ca081dca935a2
  760. Author: Alan Palazzolo <github@zzolo.org>
  761. Date: Sat Jun 18 18:46:30 2011 -0700
  762.  
  763. Added fake messages.
  764.  
  765. commit 3401af629af9cfcc24ad2e95b6d6da0b53fea067
  766. Merge: 31ddd2a 60295b0
  767. Author: Michelle Koeth <michelle@codeforamerica.org>
  768. Date: Sat Jun 18 18:42:10 2011 -0700
  769.  
  770. Merge branch 'master' of github.com:hackforchange/Safehood
  771.  
  772. commit 31ddd2a047638987ed7088de0c2e4e754d272344
  773. Author: Michelle Koeth <michelle@codeforamerica.org>
  774. Date: Sat Jun 18 18:41:46 2011 -0700
  775.  
  776. Added signup method
  777.  
  778. commit 60295b0e7b6641a293d85f9b7e2308cc5c1868f9
  779. Author: Karen Rustad <karen.rustad@gmail.com>
  780. Date: Sat Jun 18 18:38:13 2011 -0700
  781.  
  782. Copy changes; made address form long enough; credited brick photograph in site header
  783.  
  784. commit 327cb58ad24296739d802429d1196323ec7cc7dd
  785. Merge: d127c4d e845190
  786. Author: T S <YenTheFirst@gmail.com>
  787. Date: Sat Jun 18 18:29:50 2011 -0700
  788.  
  789. Merge branch 'master' of github.com:hackforchange/Safehood
  790.  
  791. commit d127c4dbeb17dd73831ffa482e087f1ddcda5cea
  792. Author: T S <YenTheFirst@gmail.com>
  793. Date: Sat Jun 18 18:29:29 2011 -0700
  794.  
  795. wrote a useful-ish nearby_users methodo
  796.  
  797. commit e845190b8690eb95db5582835ce485c8bbde3c32
  798. Merge: 194a237 3632953
  799. Author: Alan Palazzolo <github@zzolo.org>
  800. Date: Sat Jun 18 18:26:44 2011 -0700
  801.  
  802. Merge branch 'master' of github.com:hackforchange/Safehood
  803.  
  804. commit 194a2372eb3fd17720599360b75b1ffe013380f1
  805. Author: Alan Palazzolo <github@zzolo.org>
  806. Date: Sat Jun 18 18:26:38 2011 -0700
  807.  
  808. Added test data to map.
  809.  
  810. commit 36329534bfafe68b0e2d8b3c268da14f5c4c3880
  811. Author: Karen Rustad <karen.rustad@gmail.com>
  812. Date: Sat Jun 18 18:26:10 2011 -0700
  813.  
  814. added link hover color, tweaked footer link color
  815.  
  816. commit 98435b2e7a5a6e8dae63e3ebce1dab2543834e76
  817. Author: Karen Rustad <karen.rustad@gmail.com>
  818. Date: Sat Jun 18 18:20:30 2011 -0700
  819.  
  820. Added space for messages to appear
  821.  
  822. commit fff4644977a2b646add53791bbbbc3ce11f8720d
  823. Author: Karen Rustad <karen.rustad@gmail.com>
  824. Date: Sat Jun 18 18:06:53 2011 -0700
  825.  
  826. Changed style colors, added fake subscribe form, added bricks
  827.  
  828. commit 45ea53f86c1b982742802b2baa25343e6d088615
  829. Author: Alan Palazzolo <github@zzolo.org>
  830. Date: Sat Jun 18 17:55:11 2011 -0700
  831.  
  832. Updated map to center around HfC.
  833.  
  834. commit b86addbe638dbc56afc1f043866d6158c72fa625
  835. Author: Alan Palazzolo <github@zzolo.org>
  836. Date: Sat Jun 18 17:47:43 2011 -0700
  837.  
  838. Updated html and css for messages page.
  839.  
  840. commit 09d3379d3981d3558d56684c1ae065d40e821c50
  841. Author: Alan Palazzolo <github@zzolo.org>
  842. Date: Sat Jun 18 17:42:00 2011 -0700
  843.  
  844. Added CSS clearfix.
  845.  
  846. commit 2cf47afc864023a8fc98b6e42520f95b250e57dd
  847. Author: Alan Palazzolo <github@zzolo.org>
  848. Date: Sat Jun 18 17:41:25 2011 -0700
  849.  
  850. Updated layout of messages page.
  851.  
  852. commit dc7a6df85ae189aa52168c520ddbe681f6ee49e2
  853. Author: Alan Palazzolo <github@zzolo.org>
  854. Date: Sat Jun 18 17:33:19 2011 -0700
  855.  
  856. Updated map JS to check for DOM element.
  857.  
  858. commit 300c2b2441936426030bdad7f2719de169eb0702
  859. Merge: 8fd580c 8c0080e
  860. Author: Alan Palazzolo <github@zzolo.org>
  861. Date: Sat Jun 18 17:33:01 2011 -0700
  862.  
  863. Merged style sheet.
  864.  
  865. commit 8fd580c3e69ff52ea47b25e85bed34f5bf4b80da
  866. Author: Alan Palazzolo <github@zzolo.org>
  867. Date: Sat Jun 18 17:29:14 2011 -0700
  868.  
  869. Updated markup for messages and added styles.
  870.  
  871. commit b6dc079d1c2b958146fbaa994d9969c6fbe7f75b
  872. Author: Alan Palazzolo <github@zzolo.org>
  873. Date: Sat Jun 18 17:28:41 2011 -0700
  874.  
  875. Added jquery and basic leaflet map.
  876.  
  877. commit 8c0080ec5239140215b3d9d0a4358071d3f3a071
  878. Author: T S <YenTheFirst@gmail.com>
  879. Date: Sat Jun 18 17:27:07 2011 -0700
  880.  
  881. added app index
  882.  
  883. commit ebf96fd3bc3c7e4854901c4028a5c881b3ce3525
  884. Author: T S <YenTheFirst@gmail.com>
  885. Date: Sat Jun 18 17:22:37 2011 -0700
  886.  
  887. refactor signup method
  888.  
  889. commit 01be5ae54621f366f3215e341c9edacfbc1a274c
  890. Merge: a93e574 0c6b7e5
  891. Author: T S <YenTheFirst@gmail.com>
  892. Date: Sat Jun 18 17:15:05 2011 -0700
  893.  
  894. Merge branch 'master' of github.com:hackforchange/Safehood
  895.  
  896. commit a93e57450bf35bcb41a2a1ca987626a5e6bc6fd4
  897. Author: T S <YenTheFirst@gmail.com>
  898. Date: Sat Jun 18 17:14:26 2011 -0700
  899.  
  900. have a return value, and save phone numbers
  901.  
  902. commit 0c6b7e5f6f50d8868b72a0bca67eaed7c27d828e
  903. Author: Karen Rustad <karen.rustad@gmail.com>
  904. Date: Sat Jun 18 17:13:23 2011 -0700
  905.  
  906. Beginning styling
  907.  
  908. commit e292c47948366e2a33f75d5d3bf9ddfd4ef5a378
  909. Merge: d0fddd7 c4ffca8
  910. Author: T S <YenTheFirst@gmail.com>
  911. Date: Sat Jun 18 17:07:42 2011 -0700
  912.  
  913. Merge branch 'master' of github.com:hackforchange/Safehood
  914.  
  915. commit d0fddd767161094793f54503f53773dadfcfe3f2
  916. Author: T S <YenTheFirst@gmail.com>
  917. Date: Sat Jun 18 17:07:20 2011 -0700
  918.  
  919. actually add a /messages/receive route
  920.  
  921. commit c4ffca8c2b34c15bfd32bbc2def34695d8ae30fc
  922. Merge: ded0977 5e511fd
  923. Author: Alan Palazzolo <github@zzolo.org>
  924. Date: Sat Jun 18 16:53:47 2011 -0700
  925.  
  926. Merge branch 'master' of github.com:hackforchange/Safehood
  927.  
  928. commit 5e511fda50cc35bc333dd69f88b01981ad601d6f
  929. Author: T S <YenTheFirst@gmail.com>
  930. Date: Sat Jun 18 16:52:33 2011 -0700
  931.  
  932. remove unecessary send_nearby method
  933.  
  934. commit ded09776f038950cb6c31f00aad25e71144ce675
  935. Author: Alan Palazzolo <github@zzolo.org>
  936. Date: Sat Jun 18 16:49:51 2011 -0700
  937.  
  938. Added leaflet library.
  939.  
  940. commit 5d9fc317260137970cf772cff7dbfafc67842724
  941. Author: T S <YenTheFirst@gmail.com>
  942. Date: Sat Jun 18 16:44:39 2011 -0700
  943.  
  944. pin rake to 0.8.7, to deal with rake stupidity
  945.  
  946. commit 3fc3a727803772b0636795866224ea5f6a00fe49
  947. Author: T S <YenTheFirst@gmail.com>
  948. Date: Sat Jun 18 16:33:33 2011 -0700
  949.  
  950. define $app_phone
  951.  
  952. commit b593300a6459db9cadf557f3a7edc48d116663f2
  953. Author: T S <YenTheFirst@gmail.com>
  954. Date: Sat Jun 18 16:32:19 2011 -0700
  955.  
  956. refactor how we send messages to multiple nearby users
  957.  
  958. commit 527c881071d593d4bf1d1bb69dc03c1391ddeba1
  959. Author: T S <YenTheFirst@gmail.com>
  960. Date: Sat Jun 18 16:28:01 2011 -0700
  961.  
  962. correct flocky syntax
  963.  
  964. commit e6f82b89fa3cb688b3555f356a6b63b1f8d45c9f
  965. Merge: 299221b 8e83cc3
  966. Author: T S <YenTheFirst@gmail.com>
  967. Date: Sat Jun 18 16:23:35 2011 -0700
  968.  
  969. Merge branch 'master' of github.com:hackforchange/Safehood
  970.  
  971. Conflicts:
  972. app/models/message.rb
  973.  
  974. commit 299221b42c93eeead8a4a2645254557f494c7ee0
  975. Author: T S <YenTheFirst@gmail.com>
  976. Date: Sat Jun 18 16:22:09 2011 -0700
  977.  
  978. refactored and expanded 'receive' to account for signups, and backlogged messages
  979.  
  980. commit 8ebb731ff3c781390c71cde0e5eee717c8ad0ece
  981. Author: T S <YenTheFirst@gmail.com>
  982. Date: Sat Jun 18 16:17:31 2011 -0700
  983.  
  984. added 'backlogged' method to messages, for a phone number
  985.  
  986. commit 4c2a49fd22e59a9d4607104b5a58fa1e933bcd50
  987. Author: T S <YenTheFirst@gmail.com>
  988. Date: Sat Jun 18 16:14:17 2011 -0700
  989.  
  990. added plaintext phone to the messages model
  991.  
  992. commit 8e83cc3f639bafb5a9b25740de8138b4902659e3
  993. Author: Aaron Bannert <aaron@codemass.com>
  994. Date: Sat Jun 18 16:12:43 2011 -0700
  995.  
  996. add geokit support to our Message model class
  997.  
  998. commit 7c71474e306d92eeea58ae6213d67cd2c9a92af0
  999. Merge: 2c60612 461f631
  1000. Author: Aaron Bannert <aaron@codemass.com>
  1001. Date: Sat Jun 18 16:12:03 2011 -0700
  1002.  
  1003. Merge branch 'master' of github.com:hackforchange/Safehood
  1004.  
  1005. commit 2c60612e467582c3968d670c0edea7bef51e9ad3
  1006. Merge: 5a1517c 9e0f726
  1007. Author: Aaron Bannert <aaron@codemass.com>
  1008. Date: Sat Jun 18 16:11:48 2011 -0700
  1009.  
  1010. Merge branch 'master' of github.com:hackforchange/Safehood
  1011.  
  1012. Conflicts:
  1013. Gemfile
  1014. Gemfile.lock
  1015.  
  1016. commit 461f63178154b6033f46bd6aceaa0727ff0bdc50
  1017. Merge: 059e4f9 9e0f726
  1018. Author: T S <YenTheFirst@gmail.com>
  1019. Date: Sat Jun 18 16:01:41 2011 -0700
  1020.  
  1021. Merge branch 'master' of github.com:hackforchange/Safehood
  1022.  
  1023. commit 059e4f953aabfe32db2902ecebd99fcb3c41ccdf
  1024. Author: T S <YenTheFirst@gmail.com>
  1025. Date: Sat Jun 18 16:01:14 2011 -0700
  1026.  
  1027. remove 'edit' links
  1028.  
  1029. commit 5a1517cae328c11a95a304d86bf1d22a840b7edc
  1030. Author: Aaron Bannert <aaron@codemass.com>
  1031. Date: Sat Jun 18 15:57:38 2011 -0700
  1032.  
  1033. add geokit and geokit rails
  1034.  
  1035. commit 0df5546d7a71c63435168655484e0e5398af7b76
  1036. Author: Aaron Bannert <aaron@codemass.com>
  1037. Date: Sat Jun 18 15:57:29 2011 -0700
  1038.  
  1039. add geokit and geokit rails
  1040.  
  1041. commit 9e0f72691c18f8043e97bd4fa321b07a84213d53
  1042. Author: Karen Rustad <karen.rustad@gmail.com>
  1043. Date: Sat Jun 18 15:53:21 2011 -0700
  1044.  
  1045. omg our logo appears on our index page (plus some structural <div>ing)
  1046.  
  1047. commit c523ad562906f052b20941a6715436dae673054f
  1048. Author: T S <YenTheFirst@gmail.com>
  1049. Date: Sat Jun 18 15:52:26 2011 -0700
  1050.  
  1051. add geokit
  1052.  
  1053. commit e6990c699c2fec81c6501e95864868cde5ca9092
  1054. Merge: 3dc5e4b 5f96fa5
  1055. Author: T S <YenTheFirst@gmail.com>
  1056. Date: Sat Jun 18 15:50:48 2011 -0700
  1057.  
  1058. Merge branch 'master' of github.com:hackforchange/Safehood
  1059.  
  1060. commit 3dc5e4b75ebf965808ef6371579f5ab9f61c84f5
  1061. Author: T S <YenTheFirst@gmail.com>
  1062. Date: Sat Jun 18 15:50:38 2011 -0700
  1063.  
  1064. define 'receive' method for SMS
  1065.  
  1066. commit 5f96fa58114e3205184edcb3d4fadaed38f03a9f
  1067. Author: Karen Rustad <karen.rustad@gmail.com>
  1068. Date: Sat Jun 18 15:19:25 2011 -0700
  1069.  
  1070. Added basic logo image
  1071.  
  1072. commit 3a8fe48ec78441e478079bf5af07db96dd309eb1
  1073. Author: Alan Palazzolo <github@zzolo.org>
  1074. Date: Sat Jun 18 15:13:34 2011 -0700
  1075.  
  1076. Updated readme.
  1077.  
  1078. commit 1b5b8cea4f001f58fceabdb402c7d0067ffa25ad
  1079. Merge: 7c63af8 a097cfe
  1080. Author: T S <YenTheFirst@gmail.com>
  1081. Date: Sat Jun 18 15:08:01 2011 -0700
  1082.  
  1083. Merge branch 'master' of github.com:hackforchange/Safehood
  1084.  
  1085. Conflicts:
  1086. README
  1087.  
  1088. commit 7c63af85407f8ca48b75fc760f867533e6d81cd2
  1089. Author: T S <YenTheFirst@gmail.com>
  1090. Date: Sat Jun 18 15:07:10 2011 -0700
  1091.  
  1092. added flocky for SMS
  1093.  
  1094. commit a097cfef0e3457e74eac67af797c38b726c66be7
  1095. Author: jerseycoder <michelle@codeforamerica.org>
  1096. Date: Sat Jun 18 14:55:22 2011 -0700
  1097.  
  1098. Edited README via GitHub
  1099.  
  1100. commit a122f68c92c0524016f8300cc308f0a8ae00126e
  1101. Merge: 218aefc 47c40b8
  1102. Author: T S <YenTheFirst@gmail.com>
  1103. Date: Sat Jun 18 14:44:07 2011 -0700
  1104.  
  1105. Merge branch 'master' of github.com:hackforchange/Safehood
  1106.  
  1107. commit 218aefc6e5b3a533137598b48080886b49abc62f
  1108. Author: T S <YenTheFirst@gmail.com>
  1109. Date: Sat Jun 18 14:41:22 2011 -0700
  1110.  
  1111. remove auto-generated comments
  1112.  
  1113. commit 2a9bbdf2322d961453f23f7be5a096c047de0603
  1114. Author: T S <YenTheFirst@gmail.com>
  1115. Date: Sat Jun 18 14:41:01 2011 -0700
  1116.  
  1117. set default route
  1118.  
  1119. commit 016244f41b32c39b264ea5724d042ec06206e682
  1120. Author: T S <YenTheFirst@gmail.com>
  1121. Date: Sat Jun 18 14:38:07 2011 -0700
  1122.  
  1123. added messages scaffold
  1124.  
  1125. commit 47c40b86413a5a4900448aa8492c60f9125f863b
  1126. Author: jerseycoder <michelle@codeforamerica.org>
  1127. Date: Sat Jun 18 14:34:32 2011 -0700
  1128.  
  1129. Edited README via GitHub
  1130.  
  1131. commit d5efcf70e928c8046a32f0d9b3afcc282252f9cd
  1132. Author: T S <YenTheFirst@gmail.com>
  1133. Date: Sat Jun 18 14:24:22 2011 -0700
  1134.  
  1135. set up relationships
  1136.  
  1137. commit 88e3a8b7deb4be97e0fc2576ee7dfae82564dcc0
  1138. Author: T S <YenTheFirst@gmail.com>
  1139. Date: Sat Jun 18 14:23:44 2011 -0700
  1140.  
  1141. add users and messages to the database
  1142.  
  1143. commit 6fe428c894e36522d4bd95d97f5ffc57a93d1cbe
  1144. Author: T S <YenTheFirst@gmail.com>
  1145. Date: Sat Jun 18 13:42:50 2011 -0700
  1146.  
  1147. initial rails commit
  1148.  
  1149. commit 96ed518fce8fef3ee40b171cc0399dc71ef9df52
  1150. Author: Karen Rustad <karen.rustad@gmail.com>
  1151. Date: Sat Jun 18 12:50:30 2011 -0700
  1152.  
  1153. first commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement