-
- Téléchargements
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- public/javascripts/view.js 4 ajouts, 4 suppressionspublic/javascripts/view.js
- public/stylesheets/application.css 1 ajout, 1 suppressionpublic/stylesheets/application.css
- public/stylesheets/sass/application.sass 23 ajouts, 23 suppressionspublic/stylesheets/sass/application.sass
- public/stylesheets/sass/sessions.sass 2 ajouts, 2 suppressionspublic/stylesheets/sass/sessions.sass
- script/cucumber 10 ajouts, 0 suppressionscript/cucumber
- script/rails 1 ajout, 1 suppressionscript/rails
- spec/controllers/albums_controller_spec.rb 11 ajouts, 2 suppressionsspec/controllers/albums_controller_spec.rb
- spec/controllers/aspects_controller_spec.rb 1 ajout, 3 suppressionsspec/controllers/aspects_controller_spec.rb
- spec/controllers/dev_utilities_controller_spec.rb 42 ajouts, 0 suppressionspec/controllers/dev_utilities_controller_spec.rb
- spec/controllers/people_controller_spec.rb 1 ajout, 3 suppressionsspec/controllers/people_controller_spec.rb
- spec/controllers/publics_controller_spec.rb 1 ajout, 3 suppressionsspec/controllers/publics_controller_spec.rb
- spec/controllers/requests_controller_spec.rb 0 ajout, 23 suppressionsspec/controllers/requests_controller_spec.rb
- spec/controllers/sockets_controller_spec.rb 3 ajouts, 5 suppressionsspec/controllers/sockets_controller_spec.rb
- spec/factories.rb 15 ajouts, 15 suppressionsspec/factories.rb
- spec/fixtures/evan_hcard 1 ajout, 1 suppressionspec/fixtures/evan_hcard
- spec/fixtures/hcard_response 40 ajouts, 40 suppressionsspec/fixtures/hcard_response
- spec/fixtures/host_xrd 1 ajout, 1 suppressionspec/fixtures/host_xrd
- spec/helpers/application_helper_spec.rb 1 ajout, 5 suppressionsspec/helpers/application_helper_spec.rb
- spec/helpers/publics_helper_spec.rb 1 ajout, 4 suppressionsspec/helpers/publics_helper_spec.rb
- spec/helpers/requests_helper_spec.rb 13 ajouts, 6 suppressionsspec/helpers/requests_helper_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter