Jonne Haß 0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments ... [Ready to review & merge] Add permalinks for comments Conflicts: app/assets/stylesheets/application.css.sass		2014-01-22 11:24:42 +01:00
..
app	Merge pull request #4577 from svbergerem/2302-permalink-comments	2014-01-22 11:24:42 +01:00
helpers	Make I18n systems more robust against missing keys in pluralization data	2013-08-30 19:31:48 +02:00
pages	Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop	2013-04-10 18:24:47 +02:00
widgets	Switched to using rails-timeago to make keeping on top of new versions of plugin easier	2014-01-20 09:33:35 +08:00
aspect-edit-pane.js	Change icon when adding, fix #4568	2013-11-07 12:55:50 -08:00
aspect-sorting.js
aspects-dropdown.js
bootstrap-scrollspy-custom.js
clear-form.js
contact-edit.js
contact-list.js
diaspora.js
finder.js
friend-finder.js
home.js
ie.js
inbox.js	remove participants popover + improve conversations menu	2014-01-01 21:58:56 +01:00
jasmine-load-all.js	Locator feature	2013-05-02 17:31:53 -05:00
login.js
mailchimp.js
main.js	Switched to using rails-timeago to make keeping on top of new versions of plugin easier	2014-01-20 09:33:35 +08:00
mentions.js
mobile.js	Put preloads into gon.preloads	2013-07-06 12:45:23 +02:00
osmlocator.js	Locator feature	2013-05-02 17:31:53 -05:00
people.js	move ui feedback into success callback	2013-09-04 14:47:28 +02:00
photo-show.js
photos.js
profile.js	Adding ignore user icon	2013-09-04 14:47:23 +02:00
templates.js
validation.js
view.js	Move facebox configuration into the initialization of the Backbone app	2013-07-29 12:20:05 +02:00