Merge branch 'master' of github.com:diaspora/diaspora
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 1 ajout, 0 suppression.gitignore
- Gemfile 4 ajouts, 0 suppressionGemfile
- Gemfile.lock 55 ajouts, 0 suppressionGemfile.lock
- app/controllers/application_controller.rb 0 ajout, 13 suppressionsapp/controllers/application_controller.rb
- app/controllers/aspects_controller.rb 0 ajout, 12 suppressionsapp/controllers/aspects_controller.rb
- app/controllers/services_controller.rb 31 ajouts, 26 suppressionsapp/controllers/services_controller.rb
- app/controllers/status_messages_controller.rb 7 ajouts, 11 suppressionsapp/controllers/status_messages_controller.rb
- app/controllers/users_controller.rb 0 ajout, 3 suppressionsapp/controllers/users_controller.rb
- app/helpers/application_helper.rb 0 ajout, 5 suppressionsapp/helpers/application_helper.rb
- app/models/fb_status.rb 0 ajout, 29 suppressionsapp/models/fb_status.rb
- app/models/service.rb 15 ajouts, 0 suppressionapp/models/service.rb
- app/models/user.rb 20 ajouts, 10 suppressionsapp/models/user.rb
- app/views/services/index.html.haml 28 ajouts, 0 suppressionapp/views/services/index.html.haml
- app/views/shared/_aspect_friends.haml 0 ajout, 5 suppressionsapp/views/shared/_aspect_friends.haml
- app/views/shared/_public_explain.haml 8 ajouts, 4 suppressionsapp/views/shared/_public_explain.haml
- app/views/shared/_publisher.haml 17 ajouts, 15 suppressionsapp/views/shared/_publisher.haml
- app/views/users/_services.haml 0 ajout, 26 suppressionsapp/views/users/_services.haml
- app/views/users/edit.html.haml 1 ajout, 4 suppressionsapp/views/users/edit.html.haml
- config/deploy.rb 4 ajouts, 4 suppressionsconfig/deploy.rb
- config/fb_config.yml 0 ajout, 4 suppressionsconfig/fb_config.yml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter