Permalink
Browse files

Fixes #292, removes a lot of dead/unused apps and connectors, updates…

… all references to jquery 1.6.1 to point to 1.6.2 instead.
  • Loading branch information...
1 parent a5fb017 commit 786155cf943054565d67d9492a77eee15b54892c @ctide ctide committed Oct 13, 2011
Showing with 33 additions and 11,907 deletions.
  1. +7 −7 Apps/Dashboard/dashboard.html
  2. +2 −2 Apps/FoursquareMayors/static/index.html
  3. +3 −3 Apps/FoursquareStats/static/index.html
  4. +3 −3 Apps/HelloContacts/static/index.html
  5. +3 −3 Apps/HelloJournal/static/pickJournal.html
  6. +2 −2 Apps/HelloLinks/static/index.html
  7. +2 −2 Apps/HelloPhotos/static/index.html
  8. +1 −1 Apps/LinkaLatte/static/index.html
  9. +0 −18 Apps/PhotoMerge/README.md
  10. +0 −8 Apps/PhotoMerge/photomerge.app
  11. BIN Apps/PhotoMerge/static/images/bg_slice.png
  12. BIN Apps/PhotoMerge/static/images/full/001.jpg
  13. BIN Apps/PhotoMerge/static/images/full/002.jpg
  14. BIN Apps/PhotoMerge/static/images/full/003.jpg
  15. BIN Apps/PhotoMerge/static/images/full/004.jpg
  16. BIN Apps/PhotoMerge/static/images/full/005.jpg
  17. BIN Apps/PhotoMerge/static/images/full/006.jpg
  18. BIN Apps/PhotoMerge/static/images/full/007.jpg
  19. BIN Apps/PhotoMerge/static/images/full/008.jpg
  20. BIN Apps/PhotoMerge/static/images/full/009.jpg
  21. BIN Apps/PhotoMerge/static/images/full/010.jpg
  22. BIN Apps/PhotoMerge/static/images/full/011.jpg
  23. BIN Apps/PhotoMerge/static/images/full/012.jpg
  24. BIN Apps/PhotoMerge/static/images/full/013.jpg
  25. BIN Apps/PhotoMerge/static/images/full/014.jpg
  26. BIN Apps/PhotoMerge/static/images/full/015.jpg
  27. BIN Apps/PhotoMerge/static/images/full/016.jpg
  28. BIN Apps/PhotoMerge/static/images/full/017.jpg
  29. BIN Apps/PhotoMerge/static/images/full/018.jpg
  30. BIN Apps/PhotoMerge/static/images/full/019.jpg
  31. BIN Apps/PhotoMerge/static/images/full/020.jpg
  32. BIN Apps/PhotoMerge/static/images/gallery-icons.png
  33. BIN Apps/PhotoMerge/static/images/gallery-icons@2x.png
  34. BIN Apps/PhotoMerge/static/images/gallery-loader.gif
  35. BIN Apps/PhotoMerge/static/images/icons/facebook_icon.png
  36. BIN Apps/PhotoMerge/static/images/icons/flickr_icon.png
  37. BIN Apps/PhotoMerge/static/images/icons/insta_icon.png
  38. BIN Apps/PhotoMerge/static/images/icons/twitter_icon.png
  39. BIN Apps/PhotoMerge/static/images/merge_logo.png
  40. BIN Apps/PhotoMerge/static/images/thumb/001.jpg
  41. BIN Apps/PhotoMerge/static/images/thumb/002.jpg
  42. BIN Apps/PhotoMerge/static/images/thumb/003.jpg
  43. BIN Apps/PhotoMerge/static/images/thumb/004.jpg
  44. BIN Apps/PhotoMerge/static/images/thumb/005.jpg
  45. BIN Apps/PhotoMerge/static/images/thumb/006.jpg
  46. BIN Apps/PhotoMerge/static/images/thumb/007.jpg
  47. BIN Apps/PhotoMerge/static/images/thumb/008.jpg
  48. BIN Apps/PhotoMerge/static/images/thumb/009.jpg
  49. BIN Apps/PhotoMerge/static/images/thumb/010.jpg
  50. BIN Apps/PhotoMerge/static/images/thumb/011.jpg
  51. BIN Apps/PhotoMerge/static/images/thumb/012.jpg
  52. BIN Apps/PhotoMerge/static/images/thumb/013.jpg
  53. BIN Apps/PhotoMerge/static/images/thumb/014.jpg
  54. BIN Apps/PhotoMerge/static/images/thumb/015.jpg
  55. BIN Apps/PhotoMerge/static/images/thumb/016.jpg
  56. BIN Apps/PhotoMerge/static/images/thumb/017.jpg
  57. BIN Apps/PhotoMerge/static/images/thumb/018.jpg
  58. BIN Apps/PhotoMerge/static/images/thumb/019.jpg
  59. BIN Apps/PhotoMerge/static/images/thumb/020.jpg
  60. +0 −250 Apps/PhotoMerge/static/index.html
  61. +0 −552 Apps/PhotoMerge/static/iphone.css
  62. +0 −142 Apps/PhotoMerge/static/js/code-photoswipe-1.0.19.min.js
  63. +0 −824 Apps/PhotoMerge/static/js/jquery.flickable-1.0b3.js
  64. +0 −8,316 Apps/PhotoMerge/static/js/libs/jquery-1.5.1.js
  65. +0 −16 Apps/PhotoMerge/static/js/libs/jquery-1.5.1.min.js
  66. +0 −14 Apps/PhotoMerge/static/js/libs/modernizr-custom.js
  67. +0 −7 Apps/PhotoMerge/static/js/libs/respond.min.js
  68. +0 −5 Apps/PhotoMerge/static/js/libs/simple-inheritance.min.js
  69. +0 −147 Apps/PhotoMerge/static/js/mylibs/helper.js
  70. +0 −26 Apps/PhotoMerge/static/js/orientation.js
  71. 0 Apps/PhotoMerge/static/js/script.js
  72. BIN Apps/PhotoMerge/static/loading.png
  73. BIN Apps/PhotoMerge/static/pmicon.png
  74. +0 −21 Apps/Search/README.md
  75. +0 −188 Apps/Search/app.js
  76. +0 −21 Apps/Search/lib/clucene/index.js
  77. +0 −1 Apps/Search/lib/clucene/lucene_bindings.node
  78. +0 −1 Apps/Search/lib/elasticsearch/.gitignore
  79. +0 −63 Apps/Search/lib/elasticsearch/index.js
  80. +0 −30 Apps/Search/lib/elasticsearch/mapper-contacts.js
  81. +0 −30 Apps/Search/lib/elasticsearch/mapper-links.js
  82. +0 −39 Apps/Search/lib/elasticsearch/mapper-messages.js
  83. +0 −51 Apps/Search/lib/lockersearch/index.js
  84. +0 −9 Apps/Search/package.json
  85. +0 −6 Apps/Search/public/js/custom.js
  86. +0 −18 Apps/Search/public/js/jquery-1.6.2.min.js
  87. +0 −177 Apps/Search/public/stylesheets/style.css
  88. +0 −10 Apps/Search/search.app
  89. +0 −3 Apps/Search/views/index.jade
  90. +0 −8 Apps/Search/views/layout.jade
  91. 0 Apps/Search/views/partials/result.jade
  92. +0 −13 Apps/Search/views/partials/searchform.jade
  93. +0 −69 Apps/Search/views/search.jade
  94. +4 −4 Apps/UseUI/views/app.ejs
  95. +3 −3 Apps/Wakemate/static/index.html
  96. +3 −3 Apps/skeleton/static/index.html
  97. +0 −1 Connectors/ChromeHistory/.gitignore
  98. +0 −3 Connectors/ChromeHistory/README.rd
  99. +0 −8 Connectors/ChromeHistory/chromeHistory.connector
  100. +0 −212 Connectors/ChromeHistory/client.js
  101. +0 −103 Connectors/ChromeHistory/extension/background.html
  102. +0 −17 Connectors/ChromeHistory/extension/js/.svn/all-wcprops
  103. +0 −96 Connectors/ChromeHistory/extension/js/.svn/entries
  104. +0 −154 Connectors/ChromeHistory/extension/js/.svn/text-base/jquery-1.4.2.min.js.svn-base
  105. +0 −6 Connectors/ChromeHistory/extension/js/.svn/text-base/search.js.svn-base
  106. +0 −163 Connectors/ChromeHistory/extension/js/jquery-1.4.2.min.js
  107. +0 −10 Connectors/ChromeHistory/extension/manifest.json
  108. +0 −18 Ops/static/static/js/jquery-1.6.1.min.js
@@ -25,10 +25,10 @@
<!--<li id="servicesTab" data-section="services" class="tab">Services</li>-->
<li id="homeTab" data-section="home" class="tab">Home</li>
<li id="connectorsTab" data-section="connectors" class="tab">Connectors</li>
- <li id="collectionsTab" data-section="collections" class="tab" style="display: none;">Collections</li>
+ <li id="collectionsTab" data-section="collections" class="tab" style="display: none;">Collections</li>
<li id="appsTab" data-section="apps" class="tab">Apps</li>
<!--<li id="logsTab" data-section="logs" class="tab current">Log</li>-->
- </ul>
+ </ul>
</nav>
<nav id="secondary">
@@ -110,14 +110,14 @@
</header>
<section class="content">
-
+
Welcome to your personal locker. You can keep all sorts of
things here, including your addresses, photos, and links. In
the future, you will be able to get even more.
<br/><br/><br/>
-
+
<h2>Getting started:</h2>
<br/>
1. If you haven't already, <strong>Install a Connector</strong>
@@ -133,10 +133,10 @@
href="http://webchat.freenode.net?randomnick=1&channels=lockerproject"
target="_blank">#lockerproject or irc.freenode.net</a><br/><br/>
Docs: <a href="https://github.com/LockerProject/Locker/wiki"
- target="_blank">GitHub Wiki</a>
+ target="_blank">GitHub Wiki</a>
<br/><br/><br/>
-
+
<h2>Bugs?</h2>
<br/>
<a
@@ -290,7 +290,7 @@ <h1 id="appTitle">App Title</h1>
</footer>
<!-- backload javascript wherever possible -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
<script src="/static/js/extensions/date.js"></script>
<script src="/static/js/extensions/string.js"></script>
<script src="config.js"></script>
@@ -18,8 +18,8 @@
<link rel="stylesheet" href="css/style.css?v=2">
<script src="/static/js/boilerplate/libs/modernizr-1.7.min.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/foursquaremayors-client.js" type="text/javascript"> </script>
@@ -16,11 +16,11 @@
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<link rel="stylesheet" href="css/style.css?v=2">
- <link type="text/css" href="css/smoothness/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
+ <link type="text/css" href="css/smoothness/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
<script src="/static/js/boilerplate/libs/modernizr-1.7.min.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/foursquarestats-client.js" type="text/javascript"> </script>
@@ -37,8 +37,8 @@
</footer>
</div> <!-- eo #container -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/hellocontacts-client.js" type="text/javascript"> </script>
@@ -49,4 +49,4 @@
<![endif]-->
</body>
-</html>
+</html>
@@ -35,8 +35,8 @@
</footer>
</div> <!-- eo #container -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/hellojournal-client.js" type="text/javascript"> </script>
@@ -47,4 +47,4 @@
<![endif]-->
</body>
-</html>
+</html>
@@ -37,8 +37,8 @@
</footer>
</div> <!-- eo #container -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/hellolinks-client.js" type="text/javascript"> </script>
@@ -37,8 +37,8 @@
</footer>
</div> <!-- eo #container -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
- <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.1.min.js'>\x3C/script>")</script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
+ <script>window.jQuery || document.write("<script src='/static/js/jquery-1.6.2.min.js'>\x3C/script>")</script>
<script src="/static/js/boilerplate/plugins.js"></script>
<script src="js/hellophotos-client.js" type="text/javascript"> </script>
@@ -52,7 +52,7 @@
</footer>
</div> <!--! end of #container -->
- <script src="/static/js/jquery-1.6.1.min.js"></script>
+ <script src="/static/js/jquery-1.6.2.min.js"></script>
<script src="/static/js/extensions/string.js"></script>
<script src="/static/js/extensions/date.js"></script>
<script src="js/pure_min.js"></script>
View
@@ -1,18 +0,0 @@
-# PhotoMerge #
-
-Photo Merge is a proof of concept app that demos the functionality in the Contacts collection. The app is intended to run on iOS devices, as well as Firefox & Safari.
-
-Features:
- * Mobile support!
- * Segregation of photos by service
- * Fancy design
- * Swipey action
-
-Credits:
- * UI love - The Notorius http://thenotorio.us/
- * Glue - Singly
-
-Free for you to build off of, remix, reuse, or just play with :)
-
-Let us know if you do something cool based on this!
--> #lockerproject on irc.freenode.net
@@ -1,8 +0,0 @@
-{
- "title":"Photo Merge",
- "action":"View your photos!",
- "desc":"A fancy mobile interface to view your links by service (Flickr, Twitter, etc).",
- "status":"unstable",
- "static":"true",
- "handle":"photomerge"
-}
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Oops, something went wrong.

0 comments on commit 786155c

Please sign in to comment.