Permalink
Browse files

Merge branch 'release/0.0.1.0'

  • Loading branch information...
2 parents f45c5be + b56ef50 commit 91a39dfefd80dbcd213e670cd4eec45598198e14 @jhass jhass committed Oct 7, 2012
Showing with 4,573 additions and 2,926 deletions.
  1. +2 −6 .gitignore
  2. +1 −1 .rspec
  3. +2 −7 .rvmrc
  4. +6 −6 .travis.yml
  5. +69 −0 Changelog.md
  6. +8 −20 Gemfile
  7. +43 −89 Gemfile.lock
  8. +0 −5 Procfile
  9. +5 −8 README.md
  10. +62 −0 app/assets/javascripts/app/views/publisher/aspects_selector.js
  11. +65 −0 app/assets/javascripts/app/views/publisher/getting_started.js
  12. +51 −0 app/assets/javascripts/app/views/publisher/services.js
  13. +90 −16 app/assets/javascripts/app/views/publisher_view.js
  14. +2 −2 app/assets/javascripts/app/views/stream_post_views.js
  15. +1 −1 app/assets/javascripts/aspects-dropdown.js
  16. +1 −1 app/assets/javascripts/home.js
  17. +0 −221 app/assets/javascripts/publisher.js
  18. +36 −0 app/assets/stylesheets/new_styles/_base.scss
  19. +5 −1 app/assets/stylesheets/new_styles/_interactions.scss
  20. +3 −3 app/assets/stylesheets/ui.css.sass
  21. +9 −5 app/controllers/application_controller.rb
  22. +5 −5 app/controllers/conversations_controller.rb
  23. +1 −1 app/controllers/invitations_controller.rb
  24. +1 −1 app/controllers/messages_controller.rb
  25. +1 −1 app/controllers/people_controller.rb
  26. +1 −1 app/controllers/photos_controller.rb
  27. +1 −1 app/controllers/profiles_controller.rb
  28. +0 −6 app/controllers/publics_controller.rb
  29. +2 −2 app/controllers/registrations_controller.rb
  30. +1 −1 app/controllers/reshares_controller.rb
  31. +4 −4 app/controllers/services_controller.rb
  32. +2 −2 app/controllers/users_controller.rb
  33. +4 −4 app/helpers/analytics_helper.rb
  34. +4 −4 app/helpers/application_helper.rb
  35. +3 −3 app/helpers/contacts_helper.rb
  36. +1 −1 app/helpers/invitation_codes_helper.rb
  37. +1 −1 app/helpers/layout_helper.rb
  38. +3 −3 app/helpers/mobile_helper.rb
  39. +1 −1 app/helpers/notifications_helper.rb
  40. +2 −2 app/helpers/open_graph_helper.rb
  41. +1 −1 app/helpers/people_helper.rb
  42. +4 −4 app/helpers/posts_helper.rb
  43. +1 −1 app/helpers/sessions_helper.rb
  44. +1 −1 app/mailers/diaspora_devise_mailer.rb
  45. +3 −2 app/mailers/notification_mailers/also_commented.rb
  46. +7 −3 app/mailers/notification_mailers/base.rb
  47. +2 −2 app/mailers/notification_mailers/comment_on_post.rb
  48. +1 −1 app/mailers/notification_mailers/confirm_email.rb
  49. +2 −1 app/mailers/notification_mailers/liked.rb
  50. +2 −1 app/mailers/notification_mailers/mentioned.rb
  51. +1 −1 app/mailers/notification_mailers/private_message.rb
  52. +3 −1 app/mailers/notification_mailers/reshared.rb
  53. +5 −5 app/mailers/notifier.rb
  54. +0 −193 app/models/app_config.rb
  55. +3 −1 app/models/block.rb
  56. +4 −0 app/models/comment.rb
  57. +4 −1 app/models/contact.rb
  58. +5 −3 app/models/invitation_code.rb
  59. +1 −1 app/models/jobs/publish_to_hub.rb
  60. +2 −0 app/models/message.rb
  61. +3 −1 app/models/person.rb
  62. +2 −3 app/models/photo.rb
  63. +1 −3 app/models/profile.rb
  64. +2 −1 app/models/reshare.rb
  65. +0 −16 app/models/role.rb
  66. +1 −1 app/models/service.rb
  67. +2 −2 app/models/services/facebook.rb
  68. +2 −2 app/models/services/tumblr.rb
  69. +2 −2 app/models/services/twitter.rb
  70. +4 −0 app/models/status_message.rb
  71. +12 −20 app/models/user.rb
  72. +4 −4 app/presenters/o_embed_presenter.rb
  73. +4 −4 app/presenters/person_presenter.rb
  74. +1 −1 app/presenters/post_presenter.rb
  75. +1 −1 app/views/admins/_admin_bar.haml
  76. +1 −1 app/views/community_spotlight/_user.html.haml
  77. +2 −2 app/views/contacts/index.html.haml
  78. +2 −2 app/views/contacts/sharing.haml
  79. +2 −2 app/views/contacts/spotlight.haml
  80. +1 −1 app/views/devise/shared/_links.haml
  81. +0 −1 app/views/layouts/application.html.haml
  82. +0 −1 app/views/layouts/blank.haml
  83. +1 −1 app/views/layouts/notifier.html.erb
  84. +0 −1 app/views/layouts/post.haml
  85. +1 −1 app/views/notifications/_notify_popup_item.haml
  86. +2 −2 app/views/notifier/also_commented.markerb
  87. +1 −1 app/views/notifier/comment_on_post.markerb
  88. +3 −3 app/views/notifier/confirm_email.markerb
  89. +3 −3 app/views/notifier/liked.markerb
  90. +1 −1 app/views/notifier/mentioned.markerb
  91. +2 −2 app/views/notifier/reshared.markerb
  92. +2 −2 app/views/notifier/started_sharing.markerb
  93. +8 −8 app/views/people/_profile_sidebar.html.haml
  94. +1 −1 app/views/people/_sub_header.html.haml
  95. +3 −3 app/views/photos/_new_photo.haml
  96. +1 −1 app/views/photos/_photo.haml
  97. +1 −1 app/views/posts/_photo.html.haml
  98. +5 −5 app/views/publics/hcard.haml
  99. +1 −1 app/views/publics/host_meta.erb
  100. +2 −2 app/views/sessions/new.html.erb
  101. +1 −1 app/views/shared/_contact_sidebar.html.haml
  102. +1 −1 app/views/shared/_donatepod.html.haml
  103. +1 −1 app/views/shared/_photo_area.mobile.haml
  104. +2 −2 app/views/shared/_publisher.html.haml
  105. +3 −3 app/views/shared/_right_sections.html.haml
  106. +1 −1 app/views/shared/_stream_element.mobile.haml
  107. +1 −1 app/views/status_messages/_status_message.mobile.haml
  108. +3 −2 app/views/status_messages/bookmarklet.html.haml
  109. +8 −6 app/views/status_messages/new.html.haml
  110. +1 −1 app/views/users/getting_started.haml
  111. +1 −1 app/views/users/privacy_settings.html.haml
  112. +7 −7 app/views/users/public.atom.builder
  113. +0 −7 config/application.rb
  114. +0 −280 config/application.yml.example
  115. +1 −1 config/boot.rb
  116. +12 −8 config/database.yml.example
  117. +124 −0 config/defaults.yml
  118. +1 −2 config/deploy.rb
  119. +279 −0 config/diaspora.yml.example
  120. +4 −1 config/environment.rb
  121. +4 −6 config/environments/production.rb
  122. +0 −17 config/heroku.yml.example
  123. +0 −5 config/initializers/1_intialize_app_config.rb
  124. +0 −18 config/initializers/2_before_load_services.rb
  125. +0 −1 config/initializers/3_setup_app_config.rb
  126. +0 −12 config/initializers/airbrake.rb
  127. +28 −0 config/initializers/asset_sync.rb
  128. +1 −1 config/initializers/{static_assets.rb → assets.rb}
  129. +7 −7 config/initializers/carrierwave.rb
  130. +6 −1 config/initializers/check_session_secret.rb
  131. +3 −3 config/initializers/devise.rb
  132. +1 −1 config/initializers/enforce_ssl.rb
  133. +1 −1 config/initializers/faraday.rb
  134. +0 −15 config/initializers/fetch_featured_users.rb
  135. +1 −1 config/initializers/ignore_ssl_in_development.rb
  136. +5 −4 config/initializers/load_analyitics.rb
  137. +31 −33 config/initializers/mailer_config.rb
  138. +0 −7 config/initializers/newrelic.rb
  139. +0 −12 config/initializers/oink.rb
  140. +8 −7 config/initializers/omniauth.rb
  141. +6 −6 config/initializers/resque.rb
  142. +4 −4 config/initializers/set_up_image_redirects.rb
  143. +1 −9 config/initializers/version_header.rb
  144. +41 −0 config/load_config.rb
  145. +1 −0 config/locale_settings.yml
  146. +5 −3 config/locales/cldr/plurals.rb
  147. +85 −23 config/locales/devise/devise.hy.yml
  148. +48 −15 config/locales/devise/devise.lt.yml
  149. +2 −2 config/locales/devise/devise.vi.yml
  150. +4 −4 config/locales/diaspora/hu.yml
  151. +690 −2 config/locales/diaspora/hy.yml
  152. +428 −0 config/locales/diaspora/ia.yml
  153. +342 −135 config/locales/diaspora/lt.yml
  154. +1 −1 config/locales/diaspora/nl.yml
  155. +17 −17 config/locales/diaspora/pt-BR.yml
  156. +5 −5 config/locales/diaspora/sk.yml
  157. +1 −0 config/locales/diaspora/sl.yml
  158. +48 −29 config/locales/diaspora/vi.yml
  159. +0 −9 config/locales/javascript/javascript.br.yml
  160. +1 −12 config/locales/javascript/javascript.el.yml
  161. +1 −0 config/locales/javascript/javascript.en.yml
  162. +1 −0 config/locales/javascript/javascript.es-AR.yml
  163. +1 −0 config/locales/javascript/javascript.es-MX.yml
  164. +1 −3 config/locales/javascript/javascript.es.yml
  165. +0 −3 config/locales/javascript/javascript.eu.yml
  166. +0 −3 config/locales/javascript/javascript.fr.yml
  167. +2 −5 config/locales/javascript/javascript.hu.yml
  168. +100 −7 config/locales/javascript/javascript.hy.yml
  169. +0 −8 config/locales/javascript/javascript.id.yml
  170. +0 −8 config/locales/javascript/javascript.ko.yml
  171. +114 −0 config/locales/javascript/javascript.lt.yml
  172. +0 −9 config/locales/javascript/javascript.nb.yml
  173. +0 −3 config/locales/javascript/javascript.nl.yml
  174. +0 −9 config/locales/javascript/javascript.nn.yml
  175. +1 −2 config/locales/javascript/javascript.pl.yml
  176. +2 −10 config/locales/javascript/javascript.pt-BR.yml
  177. +5 −4 config/locales/javascript/javascript.pt-PT.yml
  178. +0 −1 config/locales/javascript/javascript.ru.yml
  179. +0 −2 config/locales/javascript/javascript.sk.yml
  180. +0 −4 config/locales/javascript/javascript.sl.yml
  181. +1 −6 config/locales/javascript/javascript.sv.yml
  182. +0 −3 config/locales/javascript/javascript.te.yml
  183. +0 −12 config/locales/javascript/javascript.tr.yml
  184. +2 −1 config/locales/javascript/javascript.vi.yml
  185. +1 −16 config/locales/javascript/javascript.zh-CN.yml
  186. +0 −227 config/newrelic.yml
  187. +0 −9 config/oauth_keys.yml.example
  188. +1 −8 config/routes.rb
  189. +9 −1 config/unicorn.rb
  190. +7 −8 db/seeds.rb
  191. +2 −5 features/mentions_from_profile_page.feature
  192. +10 −2 features/step_definitions/custom_web_steps.rb
  193. +0 −7 features/step_definitions/uri-step.rb
  194. +0 −8 features/support/env.rb
  195. +2 −2 features/support/publishing_cuke_helpers.rb
  196. 0 {vendor → lib}/assets/javascripts/jquery.autoresize.js
  197. +1 −1 lib/collect_user_photos.rb
  198. +69 −0 lib/configuration.rb
  199. +65 −0 lib/configuration/lookup_chain.rb
  200. +115 −0 lib/configuration/methods.rb
  201. +19 −0 lib/configuration/provider.rb
  202. +24 −0 lib/configuration/provider/dynamic.rb
  203. +14 −0 lib/configuration/provider/env.rb
  204. +52 −0 lib/configuration/provider/yaml.rb
  205. +76 −0 lib/configuration/proxy.rb
  206. +2 −2 lib/diaspora/exporter.rb
  207. +3 −2 lib/diaspora/relayable.rb
  208. +2 −1 lib/diaspora/shareable.rb
  209. +1 −1 lib/email_inviter.rb
  210. +0 −54 lib/environment_configuration.rb
  211. +1 −1 lib/messagebus/mailer.rb
  212. +3 −3 lib/postzord/dispatcher.rb
  213. +2 −2 lib/postzord/receiver/local_batch.rb
  214. +1 −1 lib/postzord/receiver/private.rb
  215. +3 −3 lib/postzord/receiver/public.rb
  216. +1 −1 lib/rack/chrome_frame.rb
  217. +2 −2 lib/rake_helpers.rb
  218. +2 −6 lib/stream/base.rb
  219. +1 −1 lib/stream/multi.rb
  220. +0 −14 lib/tasks/after_deploy.rake
  221. +0 −21 lib/tasks/before_deploy.rake
  222. +9 −42 lib/tasks/ci.rake
  223. +1 −1 lib/tasks/db.rake
  224. +0 −36 lib/tasks/heroku.rake
  225. +3 −3 lib/tasks/migrations.rake
  226. +0 −40 lib/tasks/stats.rake
  227. +0 −32 script/ci/before.sh
  228. +3 −12 script/ci/before_install.sh
  229. +13 −0 script/ci/build.sh
  230. +0 −28 script/ci/xvfb
  231. +3 −0 script/env/ensure_right_rubygems
  232. +3 −0 script/env/ruby_env
  233. +8 −11 script/get_config.rb
  234. +29 −20 script/install.sh
  235. +6 −6 script/server
  236. +10 −4 spec/controllers/application_controller_spec.rb
  237. +4 −4 spec/controllers/invitations_controller_spec.rb
  238. +3 −2 spec/controllers/people_controller_spec.rb
  239. +3 −3 spec/controllers/registrations_controller_spec.rb
  240. +0 −16 spec/controllers/streams_controller_spec.rb
  241. +2 −2 spec/factories.rb
  242. +0 −108 spec/fixtures/config/old_style_app.yml
  243. +7 −0 spec/helper_methods.rb
  244. +12 −7 spec/helpers/application_helper_spec.rb
  245. +1 −1 spec/helpers/people_helper_spec.rb
  246. +242 −50 spec/javascripts/app/views/publisher_view_spec.js
  247. +3 −2 spec/javascripts/bookmarklet-spec.js
  248. +0 −177 spec/javascripts/publisher-spec.js
  249. +67 −0 spec/lib/configuration/lookup_chain_spec.rb
  250. +166 −0 spec/lib/configuration/methods_spec.rb
  251. +23 −0 spec/lib/configuration/provider/dynamic_spec.rb
  252. +32 −0 spec/lib/configuration/provider/env_spec.rb
  253. +72 −0 spec/lib/configuration/provider/yaml_spec.rb
  254. +18 −0 spec/lib/configuration/provider_spec.rb
  255. +56 −0 spec/lib/configuration/proxy_spec.rb
  256. +25 −0 spec/lib/configuration_spec.rb
  257. +47 −0 spec/lib/rack/chrome_frame_spec.rb
  258. +3 −3 spec/lib/rake_helper_spec.rb
  259. +1 −1 spec/lib/webfinger_spec.rb
  260. +3 −3 spec/mailers/notifier_spec.rb
  261. +0 −257 spec/models/app_config_spec.rb
  262. +4 −4 spec/models/invitation_code_spec.rb
  263. +1 −1 spec/models/jobs/publish_to_hub_spec.rb
  264. +2 −4 spec/models/person_spec.rb
  265. +1 −1 spec/models/profile_spec.rb
  266. +48 −0 spec/models/user_spec.rb
  267. +0 −2 spec/parallel_spec.opts
  268. +1 −1 spec/presenters/post_presenter_spec.rb
  269. +0 −6 spec/spec_helper.rb
  270. +1 −1 spec/support/user_methods.rb
View
@@ -4,13 +4,9 @@ app/assets/images/custom/*
# Configuration files
-config/app_config.yml
-config/app.yml
-config/application.yml
+config/diaspora.yml
config/heroku.yml
-config/script_server*.yml
-config/fb_config.yml
-config/oauth_keys.yml
+config/script_server.yml
config/initializers/secret_token.rb
config/redis.conf
config/deploy_config.yml
View
2 .rspec
@@ -3,4 +3,4 @@
--color
--tag ~performance
--order random
---drb
+--drb
View
9 .rvmrc
@@ -1,8 +1,6 @@
#!/bin/bash
-rubygems_version="1.8.24"
-ruby_version="1.9.3-p194"
-gemset="diaspora"
+source ./script/env/ruby_env
if [ -e '.rvmrc.local' ]; then
source .rvmrc.local;
@@ -18,7 +16,4 @@ else
fi
fi
-
-if [ "$(gem --version)" != "$rubygems_version" ]; then
- rvm rubygems "$rubygems_version"
-fi
+source ./script/env/ensure_right_rubygems
View
@@ -1,26 +1,26 @@
branches:
only:
- 'master'
-
+ - 'develop'
+
language: ruby
rvm:
- 1.9.3
+
env:
- DB=postgres BUILD_TYPE=other
- DB=mysql BUILD_TYPE=other
- DB=postgres BUILD_TYPE=cucumber
- DB=mysql BUILD_TYPE=cucumber
-before_install:
- - "./script/ci/before_install.sh"
bundler_args: "--without development production heroku"
-before_script: "./script/ci/before.sh"
-script: "bundle exec rake travis"
+before_install: "./script/ci/before_install.sh"
+script: "./script/ci/build.sh"
notifications:
irc:
channels:
- - 'irc.freenode.org:6667#diaspora-dev'
+ - "irc.freenode.org:6667#diaspora-dev"
View
@@ -0,0 +1,69 @@
+# 0.0.1.0
+
+## New configuration system!
+
+Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](https://github.com/diaspora/diaspora/wiki/Installing-on-heroku).
+
+The new configuration system allows all possible settings to be overriden by environment variables. This makes it possible to deploy heroku without checking any credentials into git. Read the top of `config/diaspora.yml.example` for an explanation on how to convert the setting names to environment variables.
+
+### Environment variable changes:
+
+#### deprectated
+
+* REDISTOGO_URL in favour of REDIS_URL or ENVIRONMENT_REDIS
+
+#### removed
+
+* application_yml - Obsolete, all settings are settable via environment variables now
+
+#### renamed
+
+* SINGLE_PROCESS_MODE -> ENVIRONMENT_SINGLE_PROCESS_MODE
+* SINGLE_PROCESS -> ENVIRONMENT_SINGLE_PROCESS_MODE
+* NO_SSL -> ENVIRONMENT_REQUIRE_SSL
+* ASSET_HOST -> ENVIRONMENT_ASSETS_HOST
+
+
+## Gem changes
+
+### Updated gems
+
+* omniauth-tumblr 1.0 -> 1.1
+* rails_admin git -> 0.1.1
+* activerecord-import 0.2.10 -> 0.2.11
+* fog 1.4.0 -> 1.6.0
+* asset_sync 0.4.2 -> 0.5.0
+* jquery-rails 2.0.2 -> 2.1.3
+
+### Removed gems
+
+The following gems and their related files were removed as they aren't widely enough used to justify maintenance for them by the core developers. If you use them please maintain them in your fork.
+
+* airbrake
+* newrelic_rpm
+* rpm_contrib
+* heroku_san
+
+The following gems were removed because their are neither used in daily development or are just CLI tools that aren't required to be loaded from the code:
+
+* heroku
+* oink
+* yard
+
+
+## Publisher
+
+Refactoring of the JavaScript code; it is now completely rewritten to make use of Backbone.js.
+This paves the way for future improvements such as post preview or edit toolbar/help.
+
+
+## Removal of 'beta' code
+
+The feature-flag on users and all the code in connection with experimental UX changes got removed/reverted. Those are the parts that became Makr.io.
+The single-post view will also be revamped/reverted, but that didn't make it into this release.
+
+
+## JS lib updates
+
+
+## Cleanup in maintenance scripts and automated build environment
View
28 Gemfile
@@ -1,7 +1,6 @@
source 'http://rubygems.org'
gem 'bundler', '> 1.1.0'
-ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.8'
@@ -22,7 +21,7 @@ gem 'remotipart', '1.0.2'
gem 'omniauth', '1.1.1'
gem 'omniauth-facebook', '1.3.0'
-gem 'omniauth-tumblr', '1.0'
+gem 'omniauth-tumblr', '1.1'
gem 'omniauth-twitter', '0.0.11'
gem 'twitter', '2.0.2'
@@ -31,32 +30,28 @@ gem 'twitter', '2.0.2'
gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
gem 'messagebus_ruby_api', '1.0.3'
-gem 'airbrake', '3.1.0'
-gem 'newrelic_rpm', '3.3.5'
-gem "rpm_contrib", '2.1.11'
group :production do # we don't install these on travis to speed up test runs
- gem 'rails_admin', :git => 'git://github.com/halida/rails_admin.git'
+ gem 'rails_admin', '0.1.1'
gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
gem 'rack-rewrite', '1.2.1', :require => false
# analytics
gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
gem 'rack-piwik', '0.1.3', :require => 'rack/piwik', :require => false
+
end
# configuration
group :heroku do
- gem 'pg', '0.14.1'
gem 'unicorn', '4.3.1', :require => false
end
-gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
# database
-gem "activerecord-import", "0.2.10"
+gem "activerecord-import", "0.2.11"
gem 'foreigner', '1.2.1'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
@@ -65,7 +60,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading
gem 'carrierwave', '0.6.2'
-gem 'fog', '1.4.0'
+gem 'fog', '1.6.0'
gem 'mini_magick', '3.4'
# JSON and API
@@ -76,7 +71,7 @@ gem 'acts_as_api', '0.4.1 '
# localization
gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n'
+gem 'rails-i18n', :git => "https://github.com/svenfuchs/rails-i18n.git"
# parsing
@@ -125,11 +120,10 @@ group :assets do
gem 'handlebars_assets', '0.6.5'
gem 'uglifier', '1.3.0'
- # asset_sync is required as needed by application.rb
- gem "asset_sync", '0.4.2', :require => nil
+ gem "asset_sync", '0.5.0', :require => false
end
-gem 'jquery-rails', '2.0.2'
+gem 'jquery-rails', '2.1.3'
# web
@@ -170,13 +164,7 @@ group :test, :development do
end
group :development do
- gem 'heroku', '2.28.12'
- gem 'heroku_san', '3.0.4'
gem 'capistrano', '2.12.0', :require => false
gem 'capistrano_colors', '0.5.5', :require => false
gem 'capistrano-ext', '1.2.1', :require => false
- gem 'yard', '0.8.2.1', :require => false
-
- # for tracing AR object instantiation and memory usage per request
- gem 'oink', '0.9.3'
end
Oops, something went wrong.

0 comments on commit 91a39df

Please sign in to comment.