-
- Téléchargements
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/controllers/application_controller.rb 2 ajouts, 2 suppressionsapp/controllers/application_controller.rb
- app/controllers/aspects_controller.rb 70 ajouts, 0 suppressionapp/controllers/aspects_controller.rb
- app/controllers/dev_utilities_controller.rb 3 ajouts, 3 suppressionsapp/controllers/dev_utilities_controller.rb
- app/controllers/people_controller.rb 3 ajouts, 3 suppressionsapp/controllers/people_controller.rb
- app/controllers/requests_controller.rb 10 ajouts, 10 suppressionsapp/controllers/requests_controller.rb
- app/controllers/status_messages_controller.rb 1 ajout, 1 suppressionapp/controllers/status_messages_controller.rb
- app/helpers/application_helper.rb 2 ajouts, 2 suppressionsapp/helpers/application_helper.rb
- app/helpers/aspects_helper.rb 5 ajouts, 0 suppressionapp/helpers/aspects_helper.rb
- app/helpers/groups_helper.rb 0 ajout, 5 suppressionsapp/helpers/groups_helper.rb
- app/models/aspect.rb 2 ajouts, 2 suppressionsapp/models/aspect.rb
- app/models/request.rb 2 ajouts, 2 suppressionsapp/models/request.rb
- app/models/user.rb 48 ajouts, 48 suppressionsapp/models/user.rb
- app/views/albums/index.html.haml 1 ajout, 1 suppressionapp/views/albums/index.html.haml
- app/views/albums/show.html.haml 1 ajout, 1 suppressionapp/views/albums/show.html.haml
- app/views/aspects/_new_aspect.haml 2 ajouts, 2 suppressionsapp/views/aspects/_new_aspect.haml
- app/views/aspects/edit.html.haml 12 ajouts, 12 suppressionsapp/views/aspects/edit.html.haml
- app/views/aspects/index.html.haml 1 ajout, 1 suppressionapp/views/aspects/index.html.haml
- app/views/aspects/new.html.haml 14 ajouts, 0 suppressionapp/views/aspects/new.html.haml
- app/views/aspects/show.html.haml 1 ajout, 1 suppressionapp/views/aspects/show.html.haml
- app/views/js/_websocket_js.haml 9 ajouts, 9 suppressionsapp/views/js/_websocket_js.haml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter