Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'flosolutions/master'

Conflicts:
	occupywallst/fixtures/verbiage.json
  • Loading branch information...
commit 3ae19b99e88deaa31fdfe3e6af43834777cd6dd8 2 parents 9b65d82 + f9f40fa
authored November 06, 2011

Showing 1 changed file with 5 additions and 5 deletions. Show diff stats Hide diff stats

  1. 10  occupywallst/fixtures/verbiage.json
10  occupywallst/fixtures/verbiage.json
@@ -23,7 +23,7 @@
23 23
     "pk": 4,
24 24
     "model": "occupywallst.verbiage",
25 25
     "fields": {
26  
-      "content": "# About\r\n\r\nOccupyWallSt.org is the **unofficial** *de facto* online resource for the ongoing protests happening on Wall Street. We are an affinity group committed to doing technical support work for resistance movements. We are not affiliated with Adbusters, anonymous or any other organization.\r\n\r\nThe leaders of this movement are the everyday people participating in the occupation. We use a tool called the \"General Assembly\" to facilitate open, participatory and horizontal organizing between members of the public. We welcome people from all colors, genders and beliefs to participate in our daily assemblies. Visit the [NYC General Assembly](http://nycga.cc/) website to learn how you can become involved, read updates/minutes, or find out how you can adopt NYCGA processes to organize your own community.\r\n\r\n## July Press Release\r\n\r\nOn 13 Jul 2011, the group Adbusters released this call: [Occupy Wall Street!](http://www.adbusters.org/blogs/adbusters-blog/occupywallstreet.html)\r\n\r\nIn Solidarity, and as a response to this call, a planning group was formed [[occupywallst.org](http://staging.occupywallst.org/)], and an info sharing site established. The participation of every person, and every organization, that has an interest in returning the US back into the hands of it's individual citizens is required.\r\n\r\nOur nation, our species and our world are in crisis. The US has an important role to play in the solution, but we can no longer afford to let corporate greed and corrupt politics set the policies if our nation.\r\n\r\nWe, the people of the United States of America, considering the crisis at hand, now reassert our sovereign control of our land.\r\n\r\nSolidarity Forever!",
  26
+      "content": "# About\r\n\r\nOccupyWallSt.org is the **unofficial** *de facto* online resource for the ongoing protests happening on Wall Street. We are an affinity group committed to doing technical support work for resistance movements. We are not affiliated with Adbusters, anonymous or any other organization.\r\n\r\nThe leaders of this movement are the everyday people participating in the occupation. We use a tool called the \"General Assembly\" to facilitate open, participatory and horizontal organizing between members of the public. We welcome people from all colors, genders and beliefs to participate in our daily assemblies. Visit the [NYC General Assembly](http://www.nycga.net/) website to learn how you can become involved, read updates/minutes, or find out how you can adopt NYCGA processes to organize your own community.\r\n\r\n## July Press Release\r\n\r\nOn 13 Jul 2011, the group Adbusters released this call: [Occupy Wall Street!](http://www.adbusters.org/blogs/adbusters-blog/occupywallstreet.html)\r\n\r\nIn Solidarity, and as a response to this call, a planning group was formed [[occupywallst.org](http://staging.occupywallst.org/)], and an info sharing site established. The participation of every person, and every organization, that has an interest in returning the US back into the hands of it's individual citizens is required.\r\n\r\nOur nation, our species and our world are in crisis. The US has an important role to play in the solution, but we can no longer afford to let corporate greed and corrupt politics set the policies if our nation.\r\n\r\nWe, the people of the United States of America, considering the crisis at hand, now reassert our sovereign control of our land.\r\n\r\nSolidarity Forever!",
27 27
       "use_markdown": true,
28 28
       "name": "about",
29 29
       "use_template": false
@@ -33,7 +33,7 @@
33 33
     "pk": 5,
34 34
     "model": "occupywallst.verbiage",
35 35
     "fields": {
36  
-      "content": "## Contact\r\n\r\n**Help & Directions**  \r\n+1 (877) 881-3020\r\n\r\n**General Inquiries**  \r\n<general@occupywallst.org>\r\n\r\n**Press Inquiries**  \r\n<press@occupywallst.org>\r\n\r\n**Inquiries Re: OccupyWallSt.org**  \r\n<info@occupywallst.org>  \r\n+1 (516) 708-4777\r\n\r\n## Links\r\n\r\n- [NYC General Assembly](http://www.nycga.cc/)\r\n- [Occupy Together](http://www.occupytogether.org/)\r\n- [We Are The 99%](http://wearethe99percent.tumblr.com/)\r\n- [Photos on Flickr](http://www.flickr.com/search/?w=all&q=occupywallstreet+&m=tags)\r\n- [Adbusters #OccupyWallStreet](http://www.adbusters.org/campaigns/occupywallstreet)\r\n- [Take The Square](http://takethesquare.net/)\r\n- [US Day of Rage](http://www.usdayofrage.org/)\r\n\r\n[![October2011](/media/img/october2011_plug.jpg \"October2011: Stop The Machine\")](http://october2011.org/)\r\n\r\n## Source Code\r\n\r\n- [OccupyWallSt](https://github.com/jart/occupywallst/) (GitHub)",
  36
+      "content": "## Contact\r\n\r\n**Help & Directions**  \r\n+1 (877) 881-3020\r\n\r\n**General Inquiries**  \r\n<general@occupywallst.org>\r\n\r\n**Press Inquiries**  \r\n<press@occupywallst.org>\r\n\r\n**Inquiries Re: OccupyWallSt.org**  \r\n<info@occupywallst.org>  \r\n+1 (516) 708-4777\r\n\r\n## Links\r\n\r\n- [NYC General Assembly](http://www.nycga.net/)\r\n- [Occupy Together](http://www.occupytogether.org/)\r\n- [We Are The 99%](http://wearethe99percent.tumblr.com/)\r\n- [Photos on Flickr](http://www.flickr.com/search/?w=all&q=occupywallstreet+&m=tags)\r\n- [Adbusters #OccupyWallStreet](http://www.adbusters.org/campaigns/occupywallstreet)\r\n- [Take The Square](http://takethesquare.net/)\r\n- [US Day of Rage](http://www.usdayofrage.org/)\r\n\r\n[![October2011](/media/img/october2011_plug.jpg \"October2011: Stop The Machine\")](http://october2011.org/)\r\n\r\n## Source Code\r\n\r\n- [OccupyWallSt](https://github.com/jart/occupywallst/) (GitHub)",
37 37
       "use_markdown": true,
38 38
       "name": "about_sidebar",
39 39
       "use_template": false
@@ -73,7 +73,7 @@
73 73
     "pk": 2,
74 74
     "model": "occupywallst.verbiage",
75 75
     "fields": {
76  
-      "content": "<div id=\"navbar\">\r\n  <ul>\r\n    <li class=\"item nav-news first\"><a class=\"fast\" title=\"News Articles\" href=\"/\">News</a></li>\r\n    <li class=\"item nav-livestream\"><a title=\"Watch the Protest Live\" href=\"http://www.occupystreams.org/\">LiveStream</a></li>\r\n    <li class=\"item nav-forum\"><a title=\"Public discussion board\" href=\"/forum/\">Forum</a></li>\r\n    <li class=\"item nav-chat\"><a class=\"fast\" title=\"Web-based chatroom\" href=\"/chat/\">Chat</a></li>\r\n    <li class=\"item nav-attendees\"><a class=\"fast\" title=\"Map of people involved\" href=\"/attendees/\">User Map</a></li>\r\n    <li class=\"item nav-nycga\"><a title=\"NYC General Assembly\" href=\"http://nycga.cc/\">NYCGA</a></li>\r\n    <li class=\"item nav-about\"><a class=\"fast\" title=\"About Us / Contact\" href=\"/about/\">About</a></li>\r\n    <li class=\"item nav-donate\"><a class=\"fast\" title=\"Solidarity Forever!\" href=\"/donate/\">Donate</a></li>\r\n    <li class=\"last\">\r\n      <a title=\"Facebook Event\" href=\"http://www.facebook.com/OccupyWallSt\"><img width=\"24\" height=\"24\" src=\"/media/img/facebook.png\" /></a>\r\n      <a title=\"Our Twitter Page\" href=\"https://twitter.com/#!/OccupyWallSt\"><img width=\"24\" height=\"24\" src=\"/media/img/twitter.png\" /></a>\r\n      <a title=\"Reddit\" href=\"http://www.reddit.com/r/occupywallstreet/\"><img width=\"24\" height=\"23\" style=\"padding-bottom:3px\" src=\"/media/img/reddit.png\" /></a>\r\n    </li>\r\n  </ul>\r\n</div>  \r\n",
  76
+      "content": "<div id=\"navbar\">\r\n  <ul>\r\n    <li class=\"item nav-news first\"><a class=\"fast\" title=\"News Articles\" href=\"/\">News</a></li>\r\n    <li class=\"item nav-livestream\"><a title=\"Watch the Protest Live\" href=\"http://www.occupystreams.org/\">LiveStream</a></li>\r\n    <li class=\"item nav-forum\"><a title=\"Public discussion board\" href=\"/forum/\">Forum</a></li>\r\n    <li class=\"item nav-chat\"><a class=\"fast\" title=\"Web-based chatroom\" href=\"/chat/\">Chat</a></li>\r\n    <li class=\"item nav-attendees\"><a class=\"fast\" title=\"Map of people involved\" href=\"/attendees/\">User Map</a></li>\r\n    <li class=\"item nav-nycga\"><a title=\"NYC General Assembly\" href=\"http://nycga.net/\">NYCGA</a></li>\r\n    <li class=\"item nav-about\"><a class=\"fast\" title=\"About Us / Contact\" href=\"/about/\">About</a></li>\r\n    <li class=\"item nav-donate\"><a class=\"fast\" title=\"Solidarity Forever!\" href=\"/donate/\">Donate</a></li>\r\n    <li class=\"last\">\r\n      <a title=\"Facebook Event\" href=\"http://www.facebook.com/OccupyWallSt\"><img width=\"24\" height=\"24\" src=\"/media/img/facebook.png\" /></a>\r\n      <a title=\"Our Twitter Page\" href=\"https://twitter.com/#!/OccupyWallSt\"><img width=\"24\" height=\"24\" src=\"/media/img/twitter.png\" /></a>\r\n      <a title=\"Reddit\" href=\"http://www.reddit.com/r/occupywallstreet/\"><img width=\"24\" height=\"23\" style=\"padding-bottom:3px\" src=\"/media/img/reddit.png\" /></a>\r\n    </li>\r\n  </ul>\r\n</div>  \r\n",
77 77
       "use_markdown": true,
78 78
       "name": "navbar",
79 79
       "use_template": false
@@ -83,7 +83,7 @@
83 83
     "pk": 6,
84 84
     "model": "occupywallst.verbiage",
85 85
     "fields": {
86  
-      "content": "**Where:** Liberty Square <small>([How to get there](http://nycga.cc/?page_id=399))</small>  \r\n**Help & Directions:** +1 (877) 881-3020  \r\n**General Inquiries:** <general@occupywallst.org>  \r\n**Press Inquiries:** <press@occupywallst.org>  \r\n**Watch:** This 10-Min Documentary  \r\n**Read:** Latest NYCGA Minutes\r\n\r\n**Mail**  \r\nThe UPS Store  \r\nRe: Occupy Wall Street  \r\n118A Fulton St. #205  \r\nNew York, NY 10038  \r\n<small>Money orders only please, cannot cash checks yet. Non-perishable goods only. We can accept packages of any size. We're currently low on food.</small>\r\n\r\n**Occupy Wall Street** is leaderless resistance movement with people of many colors, genders and political persuasions. The one thing we all have in common is that [We Are The 99%](http://wearethe99percent.tumblr.com/) that will no longer tolerate the greed and corruption of the 1%. We are using the revolutionary [Arab Spring](http://en.wikipedia.org/wiki/Arab_Spring) tactic to achieve our ends and encourage the use of nonviolence to maximize the safety of all participants.\r\n\r\n<iframe src=\"https://www.google.com/calendar/embed?title=Occupy%20Wall%20Street%20Agenda&amp;showNav=0&amp;showTabs=0&amp;showCalendars=0&amp;mode=AGENDA&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=9a24srhq8ugb2l5ovamo723i0g%40group.calendar.google.com&amp;color=%23856508&amp;ctz=America%2FNew_York\" style=\" border-width:0 \" width=\"300\" height=\"400\" frameborder=\"0\" scrolling=\"no\"></iframe>\r\n\r\n[Click here](http://nycga.cc/calendar/) for NYCGA committee meeting times.",
  86
+      "content": "**Where:** Liberty Square <small>([How to get there](http://www.nycga.net/how-to-get-to-liberty-plaza/))</small>  \r\n**Help & Directions:** +1 (877) 881-3020  \r\n**General Inquiries:** <general@occupywallst.org>  \r\n**Press Inquiries:** <press@occupywallst.org>  \r\n**Watch:** This 10-Min Documentary  \r\n**Read:** Latest NYCGA Minutes\r\n\r\n**Mail**  \r\nThe UPS Store  \r\nRe: Occupy Wall Street  \r\n118A Fulton St. #205  \r\nNew York, NY 10038  \r\n<small>Money orders only please, cannot cash checks yet. Non-perishable goods only. We can accept packages of any size. We're currently low on food.</small>\r\n\r\n**Occupy Wall Street** is leaderless resistance movement with people of many colors, genders and political persuasions. The one thing we all have in common is that [We Are The 99%](http://wearethe99percent.tumblr.com/) that will no longer tolerate the greed and corruption of the 1%. We are using the revolutionary [Arab Spring](http://en.wikipedia.org/wiki/Arab_Spring) tactic to achieve our ends and encourage the use of nonviolence to maximize the safety of all participants.\r\n\r\n<iframe src=\"https://www.google.com/calendar/embed?title=Occupy%20Wall%20Street%20Agenda&amp;showNav=0&amp;showTabs=0&amp;showCalendars=0&amp;mode=AGENDA&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=9a24srhq8ugb2l5ovamo723i0g%40group.calendar.google.com&amp;color=%23856508&amp;ctz=America%2FNew_York\" style=\" border-width:0 \" width=\"300\" height=\"400\" frameborder=\"0\" scrolling=\"no\"></iframe>\r\n\r\n[Click here](http://www.nycga.net/events/) for NYCGA committee meeting times.",
87 87
       "use_markdown": true,
88 88
       "name": "index_sidebar",
89 89
       "use_template": false
@@ -93,7 +93,7 @@
93 93
     "pk": 7,
94 94
     "model": "occupywallst.verbiage",
95 95
     "fields": {
96  
-      "content": "# Donations\r\n\r\nThe support we receive in the form of donations plays a crucial role in helping the #OWS movement succeed.  Below is a list of places to send money and/or supplies that we believe are legitimate.\r\n\r\n## Occupy Wall Street\r\n\r\n- **[NYCGA General Fund & Material Donations](http://nycga.cc/donate/) (~$150,000 raised, Recommended)**\r\n- [OccupyWallSt.org Fund](https://www.wepay.com/donate/ows) (~$4,500 raised, not accepting currently)\r\n- [OWSJ Print Newspaper Fund](http://www.kickstarter.com/projects/610964639/occupy-wall-street-media) (~$75,000 raised, currently overfunded)\r\n- [LiveStreaming Team](http://tinyurl.com/occupywslive) (unknown amount raised)\r\n\r\nThe public relations team is looking for an apartment in Manhattan's financial district with modest furnishings (like bunk beds) that can shelter/shower 6+ full-time members.  If you have the means to donate such a space, please email: <apartment@occupywallst.org>.\r\n\r\n## Other Occupations\r\n\r\n- [Occupy Boston](https://www.wepay.com/donate/needsofboston) (~$16,000 raised)\r\n- [Occupy DC](http://occupydc.org/donate/) (~$3,000 raised)\r\n- [Occupy Philly](http://occupyphilly.org/donations/) (unknown amount raised)",
  96
+      "content": "# Donations\r\n\r\nThe support we receive in the form of donations plays a crucial role in helping the #OWS movement succeed.  Below is a list of places to send money and/or supplies that we believe are legitimate.\r\n\r\n## Occupy Wall Street\r\n\r\n- **[NYCGA General Fund & Material Donations](http://www.nycga.net/how-to-help/) (~$150,000 raised, Recommended)**\r\n- [OccupyWallSt.org Fund](https://www.wepay.com/donate/ows) (~$4,500 raised, not accepting currently)\r\n- [OWSJ Print Newspaper Fund](http://www.kickstarter.com/projects/610964639/occupy-wall-street-media) (~$75,000 raised, currently overfunded)\r\n- [LiveStreaming Team](http://tinyurl.com/occupywslive) (unknown amount raised)\r\n\r\nThe public relations team is looking for an apartment in Manhattan's financial district with modest furnishings (like bunk beds) that can shelter/shower 6+ full-time members.  If you have the means to donate such a space, please email: <apartment@occupywallst.org>.\r\n\r\n## Other Occupations\r\n\r\n- [Occupy Boston](https://www.wepay.com/donate/needsofboston) (~$16,000 raised)\r\n- [Occupy DC](http://occupydc.org/donate/) (~$3,000 raised)\r\n- [Occupy Philly](http://occupyphilly.org/donations/) (unknown amount raised)",
97 97
       "use_markdown": true,
98 98
       "name": "donate",
99 99
       "use_template": false

0 notes on commit 3ae19b9

Please sign in to comment.
Something went wrong with that request. Please try again.