Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
No related branches found
No related tags found
Showing
- app/controllers/people_controller.rb 7 additions, 1 deletionapp/controllers/people_controller.rb
- app/helpers/layout_helper.rb 4 additions, 4 deletionsapp/helpers/layout_helper.rb
- app/models/post.rb 7 additions, 0 deletionsapp/models/post.rb
- app/presenters/post_presenter.rb 8 additions, 11 deletionsapp/presenters/post_presenter.rb
- app/views/layouts/application.html.haml 1 addition, 1 deletionapp/views/layouts/application.html.haml
- app/views/layouts/post.html.haml 3 additions, 1 deletionapp/views/layouts/post.html.haml
- app/views/people/_sub_header.html.haml 1 addition, 0 deletionsapp/views/people/_sub_header.html.haml
- config/application.rb 2 additions, 1 deletionconfig/application.rb
- config/locales/diaspora/en.yml 1 addition, 0 deletionsconfig/locales/diaspora/en.yml
- config/routes.rb 8 additions, 1 deletionconfig/routes.rb
- features/logged_out_browsing.feature 9 additions, 3 deletionsfeatures/logged_out_browsing.feature
- public/javascripts/app/app.js 5 additions, 1 deletionpublic/javascripts/app/app.js
- public/javascripts/app/models/user.js 5 additions, 0 deletionspublic/javascripts/app/models/user.js
- public/javascripts/app/pages/post-viewer.js 6 additions, 2 deletionspublic/javascripts/app/pages/post-viewer.js
- public/javascripts/app/router.js 3 additions, 8 deletionspublic/javascripts/app/router.js
- public/javascripts/app/views.js 1 addition, 1 deletionpublic/javascripts/app/views.js
- public/javascripts/app/views/comment_view.js 3 additions, 4 deletionspublic/javascripts/app/views/comment_view.js
- public/javascripts/app/views/feedback_view.js 3 additions, 3 deletionspublic/javascripts/app/views/feedback_view.js
- public/javascripts/app/views/post-viewer/interactions.js 3 additions, 3 deletionspublic/javascripts/app/views/post-viewer/interactions.js
- public/javascripts/app/views/post_view.js 4 additions, 4 deletionspublic/javascripts/app/views/post_view.js
Loading
Please register or sign in to comment