nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10527 commits 4 branches 0 tags 121 MiB
Commit graph

2764 commits

Author SHA1 Message Date
Dennis Collinson
870ad3d9f7 DC DG; some fixes, mentioning works. 2012-01-23 19:32:15 -08:00
danielgrippi
3a76490640 window.app.user() doesn't return attributes nested in a key; added a comment_view spec 2012-01-22 23:37:13 -08:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna 
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
 2012-01-22 22:15:14 -08:00
danielgrippi
5d15c53f6b Revert "Revert "now using handlebars for client side templates" for now" 
This reverts commit 5f9c469b12.
 2012-01-22 22:01:57 -08:00
Dennis Collinson
5f9c469b12 Revert "now using handlebars for client side templates" for now 
This reverts commit 4692055d8a.
 2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a now using handlebars for client side templates 2012-01-22 16:59:44 -08:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
Sarah Mei
872a96dc71 Refactor services controller spec 2012-01-22 08:28:23 -08:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
danielgrippi
cc1ac843cc re-added widget; fixed tests; use _.throttle instead of depricated custom debounce 2012-01-21 20:23:00 -08:00
danielgrippi
c3b9bb9a9a expanding likes works again 2012-01-21 18:55:07 -08:00
danielgrippi
9e3521396d clear new comment on submit; include the newer autoexpander in jasmine 2012-01-20 21:58:07 -08:00
danielgrippi
25d0f0d87f updated jquery autoResize; comment boxes now expand 2012-01-20 21:45:55 -08:00
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
356494b78b DG DC; $("window") doesn't actually work in the binding scenario 2012-01-19 17:16:58 -08:00
danielgrippi
750e26e8fb Merge branch 'stream-js-cleanup' 
Conflicts:
	public/javascripts/app/models/stream.js
 2012-01-19 17:07:17 -08:00
danielgrippi
b583a7a444 Put dennis's changes back in 
Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd52.

Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0ebd4.
 2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
0ce0e47ff8 fix #2698; allow a user to delete a reshare of a deleted post 2012-01-19 15:24:07 -08:00
Maxwell Salzberg
838da1fd52 Revert "refactoring backbone urls" 
This reverts commit 4ad58bdf2f.
 2012-01-19 14:20:31 -08:00
Maxwell Salzberg
2a69c0ebd4 revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection) 2012-01-19 11:18:13 -08:00
Dennis Collinson
9b1d64bb76 stream model has a posts collection 2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f refactoring backbone urls 2012-01-18 19:08:36 -08:00
danielgrippi
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -08:00
Maxwell Salzberg
38ad76d9c7 rewrite webfinger client and specs; now this is much easier to maintain. 2012-01-18 01:21:28 -08:00
Maxwell Salzberg
392e317962 fix person spec 2012-01-17 22:10:03 -08:00
Maxwell Salzberg
bfde0514bf fix webfinger specs 2012-01-17 21:43:46 -08:00
Maxwell Salzberg
22bd70664f fix post spec 2012-01-17 21:12:47 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
Dennis Collinson
9cde06a628 You can now like "reshares", stream is polymorphic 2012-01-17 17:22:56 -08:00
Steven Fuchs
36fd43db4c incorporated improvements from @maxwell from last pull request. 2012-01-17 19:27:48 -05:00
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
danielgrippi
fdc0b681eb remove unused api serializers (cruft) 2012-01-17 16:03:24 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08:00
Dennis Collinson
66d71a217e you should be able to reshare reshares again, first pass 2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802 TT MS; fix a bug when the mention string is not actually in the mentions 2012-01-16 15:59:40 -08:00
danielgrippi
8150d32b86 using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app 2012-01-15 18:28:58 -08:00
danielgrippi
177f608276 fix oembed issues in backbone land 2012-01-15 15:56:34 -08:00
danielgrippi
9d2b1e9415 actually clear photos from the publisher. also, i hate the photo uploader we're using. 2012-01-14 15:40:44 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
Jonne Haß
5d0223601b fallback to english pluralization rule if none is found 2012-01-14 21:26:01 +01:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
danielgrippi
240d595714 removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...) 2012-01-13 23:33:59 -08:00
Maxwell Salzberg
a955f06762 try loading app config in spec_helper to prevent bad fixtures from being generated 2012-01-13 23:15:32 -08:00
Maxwell Salzberg
9dbe644b25 fix app_config spec 2012-01-13 15:03:44 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Jonne Haß
9a9cc8d826 remove spec for aspect_memberships#update too (move_contact) 2012-01-13 22:46:32 +01:00