nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/assets/javascripts
History
Juan Manuel Azambuja 1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
..
app decode tag name before passing it into TagFollowingAction, fixes #4027 2013-03-08 13:47:55 +01:00
helpers
pages Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
widgets Merge branch 'hotfix/0.0.2.4' into develop 2013-02-01 22:24:37 +01:00
aspect-edit-pane.js [WIP] aspect membership dropdown Backbone.js rework 2013-02-17 13:40:10 +01:00
aspect-sorting.js
aspects-dropdown.js WIP backbone-ify publisher, get rid of weird old POJsO 2012-09-16 14:35:59 +02:00
bootstrap-scrollspy-custom.js add our changes back to bootstrap custom 2012-05-30 16:58:21 -07:00
clear-form.js
contact-edit.js [WIP] aspect membership dropdown Backbone.js rework 2013-02-17 13:40:10 +01:00
contact-list.js
diaspora.js re-add hovercards 2012-12-28 22:37:13 +01:00
finder.js
friend-finder.js
home.js WIP backbone-ify publisher, get rid of weird old POJsO 2012-09-16 14:35:59 +02:00
ie.js
inbox.js added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00
jasmine-load-all.js
login.js
mailchimp.js
main.js was too long awake last commit, here are the files back we still need 2012-09-12 12:55:57 +02:00
mentions.js update jquery.mentionsInput to latest version 2012-07-10 20:37:57 +02:00
mobile.js * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 2013-03-10 15:02:18 +01:00
people.js Stream form on profile page 2013-01-31 00:15:27 -03:00
photo-show.js
photos.js
profile.js
templates.js
validation.js DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
view.js let closelabel.png and loading.gif respect the asset host 2012-10-16 16:56:08 +02:00