Merge branch 'master' into HEAD
Conflicts: app/models/post.rb app/models/user.rb config/initializers/socket.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 1 ajout, 0 suppression.gitignore
- COPYRIGHT 23 ajouts, 1 suppressionCOPYRIGHT
- Gemfile 4 ajouts, 1 suppressionGemfile
- Gemfile.lock 10 ajouts, 0 suppressionGemfile.lock
- README.md 41 ajouts, 199 suppressionsREADME.md
- app/controllers/albums_controller.rb 26 ajouts, 13 suppressionsapp/controllers/albums_controller.rb
- app/controllers/aspects_controller.rb 36 ajouts, 20 suppressionsapp/controllers/aspects_controller.rb
- app/controllers/comments_controller.rb 1 ajout, 6 suppressionsapp/controllers/comments_controller.rb
- app/controllers/dev_utilities_controller.rb 0 ajout, 18 suppressionsapp/controllers/dev_utilities_controller.rb
- app/controllers/people_controller.rb 4 ajouts, 2 suppressionsapp/controllers/people_controller.rb
- app/controllers/photos_controller.rb 38 ajouts, 15 suppressionsapp/controllers/photos_controller.rb
- app/controllers/publics_controller.rb 6 ajouts, 4 suppressionsapp/controllers/publics_controller.rb
- app/controllers/registrations_controller.rb 1 ajout, 3 suppressionsapp/controllers/registrations_controller.rb
- app/controllers/requests_controller.rb 12 ajouts, 8 suppressionsapp/controllers/requests_controller.rb
- app/controllers/sockets_controller.rb 1 ajout, 1 suppressionapp/controllers/sockets_controller.rb
- app/controllers/status_messages_controller.rb 14 ajouts, 3 suppressionsapp/controllers/status_messages_controller.rb
- app/controllers/users_controller.rb 17 ajouts, 11 suppressionsapp/controllers/users_controller.rb
- app/helpers/albums_helper.rb 4 ajouts, 4 suppressionsapp/helpers/albums_helper.rb
- app/helpers/application_helper.rb 6 ajouts, 7 suppressionsapp/helpers/application_helper.rb
- app/helpers/aspects_helper.rb 8 ajouts, 0 suppressionapp/helpers/aspects_helper.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter