-
- Téléchargements
Merge branch 'master' into follow
Conflicts: app/controllers/requests_controller.rb app/controllers/tags_controller.rb app/helpers/aspects_helper.rb app/views/notifications/index.html.haml config/routes.rb public/javascripts/aspect-edit.js public/javascripts/contact-list.js spec/integration/receiving_spec.rb spec/models/user/connecting_spec.rb spec/models/user/posting_spec.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 1 ajout, 1 suppression.gitignore
- Gemfile 3 ajouts, 1 suppressionGemfile
- Gemfile.lock 29 ajouts, 14 suppressionsGemfile.lock
- Sodfile 6 ajouts, 0 suppressionSodfile
- app/controllers/apis_controller.rb 7 ajouts, 7 suppressionsapp/controllers/apis_controller.rb
- app/controllers/application_controller.rb 2 ajouts, 0 suppressionapp/controllers/application_controller.rb
- app/controllers/aspect_memberships_controller.rb 1 ajout, 0 suppressionapp/controllers/aspect_memberships_controller.rb
- app/controllers/aspects_controller.rb 7 ajouts, 2 suppressionsapp/controllers/aspects_controller.rb
- app/controllers/contacts_controller.rb 1 ajout, 0 suppressionapp/controllers/contacts_controller.rb
- app/controllers/conversations_controller.rb 5 ajouts, 3 suppressionsapp/controllers/conversations_controller.rb
- app/controllers/notifications_controller.rb 1 ajout, 1 suppressionapp/controllers/notifications_controller.rb
- app/controllers/people_controller.rb 23 ajouts, 4 suppressionsapp/controllers/people_controller.rb
- app/controllers/photos_controller.rb 1 ajout, 0 suppressionapp/controllers/photos_controller.rb
- app/controllers/sockets_controller.rb 1 ajout, 0 suppressionapp/controllers/sockets_controller.rb
- app/controllers/status_messages_controller.rb 2 ajouts, 1 suppressionapp/controllers/status_messages_controller.rb
- app/controllers/tags_controller.rb 6 ajouts, 1 suppressionapp/controllers/tags_controller.rb
- app/controllers/users_controller.rb 1 ajout, 0 suppressionapp/controllers/users_controller.rb
- app/helpers/application_helper.rb 41 ajouts, 14 suppressionsapp/helpers/application_helper.rb
- app/helpers/aspects_helper.rb 3 ajouts, 10 suppressionsapp/helpers/aspects_helper.rb
- app/helpers/comments_helper.rb 1 ajout, 1 suppressionapp/helpers/comments_helper.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter