Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MS DG update copyright

  • Loading branch information...
commit 91e649977c435e4381c1d7fa019a8ffcd4a8e9c6 1 parent c6502a7
@danielgrippi danielgrippi authored
Showing with 300 additions and 300 deletions.
  1. +1 −1  Capfile
  2. +1 −1  Rakefile
  3. +1 −1  app/controllers/activity_streams/photos_controller.rb
  4. +1 −1  app/controllers/application_controller.rb
  5. +1 −1  app/controllers/aspect_memberships_controller.rb
  6. +1 −1  app/controllers/aspects_controller.rb
  7. +1 −1  app/controllers/comments_controller.rb
  8. +1 −1  app/controllers/contacts_controller.rb
  9. +1 −1  app/controllers/conversation_visibilities_controller.rb
  10. +1 −1  app/controllers/home_controller.rb
  11. +1 −1  app/controllers/invitations_controller.rb
  12. +1 −1  app/controllers/likes_controller.rb
  13. +1 −1  app/controllers/messages_controller.rb
  14. +1 −1  app/controllers/notifications_controller.rb
  15. +1 −1  app/controllers/people_controller.rb
  16. +1 −1  app/controllers/photos_controller.rb
  17. +1 −1  app/controllers/post_visibilities_controller.rb
  18. +1 −1  app/controllers/posts_controller.rb
  19. +1 −1  app/controllers/profiles_controller.rb
  20. +1 −1  app/controllers/publics_controller.rb
  21. +1 −1  app/controllers/registrations_controller.rb
  22. +1 −1  app/controllers/services_controller.rb
  23. +1 −1  app/controllers/sessions_controller.rb
  24. +1 −1  app/controllers/sockets_controller.rb
  25. +1 −1  app/controllers/status_messages_controller.rb
  26. +1 −1  app/controllers/tags_controller.rb
  27. +1 −1  app/controllers/users_controller.rb
  28. +1 −1  app/controllers/vanna_controller.rb
  29. +1 −1  app/helpers/application_helper.rb
  30. +1 −1  app/helpers/aspect_global_helper.rb
  31. +1 −1  app/helpers/aspects_helper.rb
  32. +1 −1  app/helpers/comments_helper.rb
  33. +1 −1  app/helpers/error_messages_helper.rb
  34. +1 −1  app/helpers/getting_started_helper.rb
  35. +1 −1  app/helpers/layout_helper.rb
  36. +1 −1  app/helpers/likes_helper.rb
  37. +1 −1  app/helpers/markdownify_helper.rb
  38. +1 −1  app/helpers/people_helper.rb
  39. +1 −1  app/helpers/photos_helper.rb
  40. +1 −1  app/helpers/profiles_helper.rb
  41. +1 −1  app/helpers/publics_helper.rb
  42. +1 −1  app/helpers/sockets_helper.rb
  43. +1 −1  app/helpers/status_messages_helper.rb
  44. +1 −1  app/helpers/stream_helper.rb
  45. +1 −1  app/helpers/tags_helper.rb
  46. +1 −1  app/models/activity_streams/photo.rb
  47. +1 −1  app/models/app_config.rb
  48. +1 −1  app/models/aspect.rb
  49. +1 −1  app/models/aspect_membership.rb
  50. +1 −1  app/models/aspect_visibility.rb
  51. +1 −1  app/models/comment.rb
  52. +1 −1  app/models/contact.rb
  53. +1 −1  app/models/invitation.rb
  54. +1 −1  app/models/job/delete_account.rb
  55. +1 −1  app/models/job/http_multi.rb
  56. +1 −1  app/models/job/http_post.rb
  57. +1 −1  app/models/job/mail/invite_user_by_email.rb
  58. +1 −1  app/models/job/mail/mentioned.rb
  59. +1 −1  app/models/job/mail/private_message.rb
  60. +1 −1  app/models/job/mail/started_sharing.rb
  61. +1 −1  app/models/job/notify_local_users.rb
  62. +1 −1  app/models/job/post_to_service.rb
  63. +1 −1  app/models/job/process_photo.rb
  64. +1 −1  app/models/job/publish_to_hub.rb
  65. +1 −1  app/models/job/receive.rb
  66. +1 −1  app/models/job/receive_local_batch.rb
  67. +1 −1  app/models/job/receive_public_salmon.rb
  68. +1 −1  app/models/job/receive_salmon.rb
  69. +1 −1  app/models/job/resend_invitation.rb
  70. +1 −1  app/models/job/socket_webfinger.rb
  71. +1 −1  app/models/job/update_service_users.rb
  72. +1 −1  app/models/like.rb
  73. +1 −1  app/models/mention.rb
  74. +1 −1  app/models/notification.rb
  75. +1 −1  app/models/notification_actor.rb
  76. +1 −1  app/models/person.rb
  77. +1 −1  app/models/post.rb
  78. +1 −1  app/models/post_visibility.rb
  79. +1 −1  app/models/profile.rb
  80. +1 −1  app/models/relayable_retraction.rb
  81. +1 −1  app/models/request.rb
  82. +1 −1  app/models/retraction.rb
  83. +1 −1  app/models/service.rb
  84. +1 −1  app/models/signed_retraction.rb
  85. +1 −1  app/models/status_message.rb
  86. +1 −1  app/models/user.rb
  87. +1 −1  app/uploaders/processed_image.rb
  88. +1 −1  app/uploaders/unprocessed_image.rb
  89. +1 −1  app/views/apps/show.html.haml
  90. +1 −1  app/views/aspect_memberships/_add_to_aspect.haml
  91. +1 −1  app/views/aspect_memberships/_remove_from_aspect.haml
  92. +1 −1  app/views/aspect_memberships/add_to_aspect.js.haml
  93. +1 −1  app/views/aspect_memberships/create.js.erb
  94. +1 −1  app/views/aspect_memberships/destroy.js.erb
  95. +1 −1  app/views/aspect_memberships/remove_from_aspect.js.haml
  96. +1 −1  app/views/aspects/_aspect_contacts.haml
  97. +1 −1  app/views/aspects/_aspect_list_item.haml
  98. +1 −1  app/views/aspects/_aspect_listings.haml
  99. +1 −1  app/views/aspects/_aspect_stream.haml
  100. +1 −1  app/views/aspects/_no_contacts_message.haml
  101. +1 −1  app/views/aspects/_no_posts_message.haml
  102. +1 −1  app/views/aspects/create.js.erb
  103. +1 −1  app/views/aspects/edit.html.haml
  104. +1 −1  app/views/aspects/index.html.haml
  105. +1 −1  app/views/aspects/index.mobile.haml
  106. +1 −1  app/views/aspects/new.haml
  107. +1 −1  app/views/authorizations/index.html.haml
  108. +1 −1  app/views/authorizations/index.mobile.haml
  109. +1 −1  app/views/comments/_comment.html.haml
  110. +1 −1  app/views/comments/_comment.mobile.haml
  111. +1 −1  app/views/comments/_comments.haml
  112. +1 −1  app/views/comments/_new_comment.html.haml
  113. +1 −1  app/views/comments/_new_comment.mobile.haml
  114. +1 −1  app/views/contacts/_aspect_listings.haml
  115. +1 −1  app/views/contacts/featured.haml
  116. +1 −1  app/views/contacts/index.html.haml
  117. +1 −1  app/views/contacts/index.mobile.haml
  118. +1 −1  app/views/contacts/sharing.haml
  119. +1 −1  app/views/conversations/_conversation.haml
  120. +1 −1  app/views/conversations/_show.haml
  121. +1 −1  app/views/conversations/index.haml
  122. +1 −1  app/views/conversations/new.haml
  123. +1 −1  app/views/conversations/show.haml
  124. +1 −1  app/views/home/show.html.haml
  125. +1 −1  app/views/home/show.mobile.haml
  126. +1 −1  app/views/invitations/edit.mobile.haml
  127. +1 −1  app/views/js/_websocket_js.haml
  128. +1 −1  app/views/layouts/_header.html.haml
  129. +1 −1  app/views/layouts/application.html.haml
  130. +1 −1  app/views/layouts/application.mobile.haml
  131. +1 −1  app/views/layouts/popup.html.haml
  132. +1 −1  app/views/likes/_likes.haml
  133. +1 −1  app/views/likes/_likes_container.haml
  134. +1 −1  app/views/messages/_message.haml
  135. +1 −1  app/views/notifications/_popup.haml
  136. +1 −1  app/views/people/_aspect_list.haml
  137. +1 −1  app/views/people/_person.html.haml
  138. +1 −1  app/views/people/_person.mobile.haml
  139. +1 −1  app/views/people/_profile_photo_upload.html.haml
  140. +1 −1  app/views/people/_profile_sidebar.html.haml
  141. +1 −1  app/views/people/contacts.haml
  142. +1 −1  app/views/people/index.html.haml
  143. +1 −1  app/views/people/index.mobile.haml
  144. +1 −1  app/views/people/show.html.haml
  145. +1 −1  app/views/people/show.mobile.haml
  146. +1 −1  app/views/photos/_index.html.haml
  147. +1 −1  app/views/photos/_new_photo.haml
  148. +1 −1  app/views/photos/_new_profile_photo.haml
  149. +1 −1  app/views/photos/_photo.haml
  150. +1 −1  app/views/photos/edit.html.haml
  151. +1 −1  app/views/photos/show.html.haml
  152. +1 −1  app/views/photos/show.mobile.haml
  153. +1 −1  app/views/posts/_photo.html.haml
  154. +1 −1  app/views/posts/show.html.haml
  155. +1 −1  app/views/posts/show.mobile.haml
  156. +1 −1  app/views/profiles/_edit.haml
  157. +1 −1  app/views/profiles/_edit_public.haml
  158. +1 −1  app/views/profiles/edit.haml
  159. +1 −1  app/views/requests/_new_request_to_person.haml
  160. +1 −1  app/views/requests/_new_request_with_aspect_to_person.haml
  161. +1 −1  app/views/reshares/_reshare.haml
  162. +1 −1  app/views/reshares/_reshare.mobile.haml
  163. +1 −1  app/views/services/finder.html.haml
  164. +1 −1  app/views/services/index.html.haml
  165. +1 −1  app/views/sessions/new.haml
  166. +1 −1  app/views/sessions/new.mobile.haml
  167. +1 −1  app/views/shared/_add_remove_services.haml
  168. +1 −1  app/views/shared/_aspect_dropdown.html.haml
  169. +1 −1  app/views/shared/_contact_list.html.haml
  170. +1 −1  app/views/shared/_contact_sidebar.html.haml
  171. +1 −1  app/views/shared/_public_explain.haml
  172. +1 −1  app/views/shared/_publisher.html.haml
  173. +1 −1  app/views/shared/_publisher.mobile.haml
  174. +1 −1  app/views/shared/_right_sections.html.haml
  175. +1 −1  app/views/shared/_stream.haml
  176. +1 −1  app/views/shared/_stream_element.html.haml
  177. +1 −1  app/views/shared/_stream_element.mobile.haml
  178. +1 −1  app/views/status_messages/_status_message.haml
  179. +1 −1  app/views/status_messages/bookmarklet.html.haml
  180. +1 −1  app/views/status_messages/new.haml
  181. +1 −1  app/views/tags/_followed_tags_listings.haml
  182. +1 −1  app/views/tags/show.haml
  183. +1 −1  app/views/users/edit.html.haml
  184. +1 −1  app/views/users/getting_started.haml
  185. +1 −1  chef/cookbooks/diaspora/templates/default/nginx.conf.erb
  186. +1 −1  config.ru
  187. +1 −1  config/application.rb
  188. +1 −1  config/application.yml.example
  189. +1 −1  config/boot.rb
  190. +1 −1  config/deploy.rb
  191. +1 −1  config/deploy_config.yml.example
  192. +1 −1  config/environment.rb
  193. +1 −1  config/environments/development.rb
  194. +1 −1  config/environments/integration_1.rb
  195. +1 −1  config/environments/integration_2.rb
  196. +1 −1  config/environments/production.rb
  197. +1 −1  config/environments/staging.rb
  198. +1 −1  config/environments/test.rb
  199. +1 −1  config/initializers/_before_load_services.rb
  200. +1 −1  config/initializers/_load_app_config.rb
  201. +1 −1  config/initializers/backtrace_silencers.rb
  202. +1 −1  config/initializers/carrierwave.rb
  203. +1 −1  config/initializers/devise.rb
  204. +1 −1  config/initializers/direction_detector.rb
  205. +1 −1  config/initializers/faraday.rb
  206. +1 −1  config/initializers/git_info.rb
  207. +1 −1  config/initializers/ignore_ssl_in_development.rb
  208. +1 −1  config/initializers/inflections.rb
  209. +1 −1  config/initializers/locale.rb
  210. +1 −1  config/initializers/mailer_config.rb
  211. +1 −1  config/initializers/mime_types.rb
  212. +1 −1  config/initializers/omniauth.rb
  213. +1 −1  config/initializers/patch_openssl_pkey.rb
  214. +1 −1  config/initializers/rspec_generator.rb
  215. +1 −1  config/initializers/session_store.rb
  216. +1 −1  config/initializers/version_header.rb
  217. +1 −1  config/locales/devise/devise.ar.yml
  218. +1 −1  config/locales/devise/devise.bg.yml
  219. +1 −1  config/locales/devise/devise.br.yml
  220. +1 −1  config/locales/devise/devise.cs.yml
  221. +1 −1  config/locales/devise/devise.cy.yml
  222. +1 −1  config/locales/devise/devise.da.yml
  223. +1 −1  config/locales/devise/devise.de.yml
  224. +1 −1  config/locales/devise/devise.el.yml
  225. +1 −1  config/locales/devise/devise.en_pirate.yml
  226. +1 −1  config/locales/devise/devise.en_shaw.yml
  227. +1 −1  config/locales/devise/devise.eo.yml
  228. +1 −1  config/locales/devise/devise.es-AR.yml
  229. +1 −1  config/locales/devise/devise.es-CL.yml
  230. +1 −1  config/locales/devise/devise.es.yml
  231. +1 −1  config/locales/devise/devise.eu.yml
  232. +1 −1  config/locales/devise/devise.fi.yml
  233. +1 −1  config/locales/devise/devise.fr.yml
  234. +1 −1  config/locales/devise/devise.ga.yml
  235. +1 −1  config/locales/devise/devise.gl.yml
  236. +1 −1  config/locales/devise/devise.he.yml
  237. +1 −1  config/locales/devise/devise.hu.yml
  238. +1 −1  config/locales/devise/devise.id.yml
  239. +1 −1  config/locales/devise/devise.is.yml
  240. +1 −1  config/locales/devise/devise.it.yml
  241. +1 −1  config/locales/devise/devise.ja.yml
  242. +1 −1  config/locales/devise/devise.ko.yml
  243. +1 −1  config/locales/devise/devise.lt.yml
  244. +1 −1  config/locales/devise/devise.mk.yml
  245. +1 −1  config/locales/devise/devise.ml.yml
  246. +1 −1  config/locales/devise/devise.nb.yml
  247. +1 −1  config/locales/devise/devise.nl.yml
  248. +1 −1  config/locales/devise/devise.pa.yml
  249. +1 −1  config/locales/devise/devise.pl.yml
  250. +1 −1  config/locales/devise/devise.pt-BR.yml
  251. +1 −1  config/locales/devise/devise.pt-PT.yml
  252. +1 −1  config/locales/devise/devise.ro.yml
  253. +1 −1  config/locales/devise/devise.ru.yml
  254. +1 −1  config/locales/devise/devise.sk.yml
  255. +1 −1  config/locales/devise/devise.sl.yml
  256. +1 −1  config/locales/devise/devise.sv.yml
  257. +1 −1  config/locales/devise/devise.tr.yml
  258. +1 −1  config/locales/devise/devise.zh-CN.yml
  259. +1 −1  config/locales/devise/devise.zh-TW.yml
  260. +1 −1  config/locales/diaspora/ar.yml
  261. +1 −1  config/locales/diaspora/bg.yml
  262. +1 −1  config/locales/diaspora/br.yml
  263. +1 −1  config/locales/diaspora/cs.yml
  264. +1 −1  config/locales/diaspora/cy.yml
  265. +1 −1  config/locales/diaspora/da.yml
  266. +1 −1  config/locales/diaspora/de.yml
  267. +1 −1  config/locales/diaspora/el.yml
  268. +1 −1  config/locales/diaspora/en-AU.yml
  269. +1 −1  config/locales/diaspora/en-GB.yml
  270. +1 −1  config/locales/diaspora/en-US.yml
  271. +1 −1  config/locales/diaspora/en.yml
  272. +1 −1  config/locales/diaspora/en_pirate.yml
  273. +1 −1  config/locales/diaspora/en_shaw.yml
  274. +1 −1  config/locales/diaspora/eo.yml
  275. +1 −1  config/locales/diaspora/es-AR.yml
  276. +1 −1  config/locales/diaspora/es-CL.yml
  277. +1 −1  config/locales/diaspora/es.yml
  278. +1 −1  config/locales/diaspora/eu.yml
  279. +1 −1  config/locales/diaspora/fi.yml
  280. +1 −1  config/locales/diaspora/fr.yml
  281. +1 −1  config/locales/diaspora/ga.yml
  282. +1 −1  config/locales/diaspora/gl.yml
  283. +1 −1  config/locales/diaspora/he.yml
  284. +1 −1  config/locales/diaspora/hu.yml
  285. +1 −1  config/locales/diaspora/id.yml
  286. +1 −1  config/locales/diaspora/is.yml
  287. +1 −1  config/locales/diaspora/it.yml
  288. +1 −1  config/locales/diaspora/ja.yml
  289. +1 −1  config/locales/diaspora/ko.yml
  290. +1 −1  config/locales/diaspora/lt.yml
  291. +1 −1  config/locales/diaspora/mk.yml
  292. +1 −1  config/locales/diaspora/ml.yml
  293. +1 −1  config/locales/diaspora/nb.yml
  294. +1 −1  config/locales/diaspora/nl.yml
  295. +1 −1  config/locales/diaspora/pa.yml
  296. +1 −1  config/locales/diaspora/pl.yml
  297. +1 −1  config/locales/diaspora/pt-BR.yml
  298. +1 −1  config/locales/diaspora/pt-PT.yml
  299. +1 −1  config/locales/diaspora/ro.yml
  300. +1 −1  config/locales/diaspora/ru.yml
Sorry, we could not display the entire diff because too many files (532) changed.
View
2  Capfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  Rakefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/activity_streams/photos_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/application_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/aspect_memberships_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#
View
2  app/controllers/aspects_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/comments_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/contacts_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/conversation_visibilities_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#
View
2  app/controllers/home_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/invitations_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/likes_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/messages_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/notifications_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/people_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/photos_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/post_visibilities_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#
View
2  app/controllers/posts_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/profiles_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/publics_controller.rb
@@ -1,4 +1,4 @@
- # Copyright (c) 2010, Diaspora Inc. This file is
+ # Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/registrations_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/services_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file.
class ServicesController < ApplicationController
View
2  app/controllers/sessions_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/sockets_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/status_messages_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/tags_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/controllers/vanna_controller.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/application_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/aspect_global_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/aspects_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/comments_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/error_messages_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/getting_started_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/layout_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/likes_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/markdownify_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/people_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/photos_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/profiles_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/publics_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/sockets_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/status_messages_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/stream_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/helpers/tags_helper.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/activity_streams/photo.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/app_config.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
require 'uri'
View
2  app/models/aspect.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/aspect_membership.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/aspect_visibility.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/comment.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/contact.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/invitation.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/delete_account.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/http_multi.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/http_post.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/mail/invite_user_by_email.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/mail/mentioned.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/mail/private_message.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/mail/started_sharing.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/notify_local_users.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/post_to_service.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#
View
2  app/models/job/process_photo.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/publish_to_hub.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/receive.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/receive_local_batch.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/receive_public_salmon.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
require File.join(Rails.root, 'lib/postzord/receiver/private')
View
2  app/models/job/receive_salmon.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/resend_invitation.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/socket_webfinger.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/job/update_service_users.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/like.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/mention.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/notification.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
#
View
2  app/models/notification_actor.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/person.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/post.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/post_visibility.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/profile.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/relayable_retraction.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/request.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/retraction.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/service.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/signed_retraction.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/status_message.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/models/user.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/uploaders/processed_image.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/uploaders/unprocessed_image.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Diaspora Inc. This file is
+# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
View
2  app/views/apps/show.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspect_memberships/_add_to_aspect.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspect_memberships/_remove_from_aspect.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspect_memberships/add_to_aspect.js.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspect_memberships/create.js.erb
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, Diaspora Inc. This file is
+// Copyright (c) 2010-2011, Diaspora Inc. This file is
// licensed under the Affero General Public License version 3 or later. See
// the COPYRIGHT file.
View
2  app/views/aspect_memberships/destroy.js.erb
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, Diaspora Inc. This file is
+// Copyright (c) 2010-2011, Diaspora Inc. This file is
// licensed under the Affero General Public License version 3 or later. See
// the COPYRIGHT file.
View
2  app/views/aspect_memberships/remove_from_aspect.js.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_aspect_contacts.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_aspect_list_item.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_aspect_listings.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_aspect_stream.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_no_contacts_message.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/_no_posts_message.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/create.js.erb
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, Diaspora Inc. This file is
+// Copyright (c) 2010-2011, Diaspora Inc. This file is
// licensed under the Affero General Public License version 3 or later. See
// the COPYRIGHT file.
View
2  app/views/aspects/edit.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/index.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/aspects/new.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/authorizations/index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/authorizations/index.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/comments/_comment.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/comments/_comment.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/comments/_comments.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.comment_stream
View
2  app/views/comments/_new_comment.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/comments/_new_comment.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/contacts/_aspect_listings.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/contacts/featured.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/contacts/index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/contacts/index.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/contacts/sharing.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2011, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/conversations/_conversation.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/conversations/_show.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/conversations/index.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/conversations/new.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/conversations/show.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/home/show.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/home/show.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/invitations/edit.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2011, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/js/_websocket_js.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/layouts/_header.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/layouts/application.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/layouts/application.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/layouts/popup.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/likes/_likes.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/likes/_likes_container.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/messages/_message.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/notifications/_popup.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.notification
View
2  app/views/people/_aspect_list.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/_person.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/_person.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/_profile_photo_upload.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/_profile_sidebar.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/contacts.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/index.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/show.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/people/show.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/_index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/_new_photo.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/_new_profile_photo.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/_photo.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/edit.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/show.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/photos/show.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/posts/_photo.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/posts/show.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/posts/show.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/profiles/_edit.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/profiles/_edit_public.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/profiles/edit.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/requests/_new_request_to_person.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/requests/_new_request_with_aspect_to_person.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/reshares/_reshare.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/reshares/_reshare.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/services/finder.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/services/index.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/sessions/new.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/sessions/new.mobile.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2011, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_add_remove_services.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_aspect_dropdown.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2011, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_contact_list.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_contact_sidebar.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_public_explain.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2  app/views/shared/_publisher.html.haml
@@ -1,4 +1,4 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
+-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
View
2