danielgrippi
b94b5240a8
added block user functionality to the stream
2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d
remove js resposne for likes, do it in backbone with json responses instead
2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f
added api response for likes; cleaned up view logic; specify like collection url from parent model (Post)
2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb
don't use Diaspora widget system or stream.js when backbone is active;
...
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
2012-01-07 14:23:22 -08:00
danielgrippi
cd1d25dc30
remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts)
2012-01-07 14:23:22 -08:00
danielgrippi
dc82316f13
bind Twipsy in stream_element_view.js
2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977
comment and post deletion now works on the backbone stream
2012-01-07 14:23:22 -08:00
danielgrippi
46b1567622
added loader gif when 'more' is clicked in stream; fixed nsfw positioning
2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85
added more jasmine spec; NSFW wip
2012-01-07 14:23:22 -08:00
danielgrippi
cec2d27204
ported likes logic for the stream over from old branch
2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e
reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again
2012-01-07 14:23:22 -08:00
danielgrippi
414fb8d454
corrected template views; status message now includes oembed; updated post.rb api to supply oembed and object_url
2012-01-07 14:23:21 -08:00
danielgrippi
e6d4ec2dc8
added as::photo view
2012-01-07 14:23:21 -08:00
danielgrippi
34e3403e2e
jasmine green again; template switching in place, defaulting to displaying post text
2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe
make jasmine view tests work, load templates, party
2012-01-07 14:23:21 -08:00
danielgrippi
4883c70ae2
move templates into app/views/templates/_templates.haml
2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240
DC DG; test stream view WIP
2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e
DH DG; create comments via backbone
2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581
introduce comments
2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014
Use routers, remove some hacks
2012-01-07 14:23:21 -08:00
Daniel Grippi
dca3581ae2
added likes to the stream element underscore partial
2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591
add current user to body tag data field (hackity hack). add comment links to posts
2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad
serialize current user json into body tag for now
2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0
DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now).
2012-01-07 14:23:20 -08:00
danielgrippi
aa7343d759
add profile streams to backbone. this breaks hovercards, atm.
2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b
backbone all the streams, besides user. don't use the acts_as_api way for now.
2012-01-07 14:23:20 -08:00
danielgrippi
91ba6447d0
add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip
2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773
DG DH; pagination on backbone stream
2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11
DG DH; backbone stream now sort-of renders on multis_controller; wip
2012-01-07 14:23:20 -08:00
Maxwell Salzberg
91c21f5d92
MS SM; removed seemingly unused(?) layout file
2012-01-07 12:56:32 -08:00
Maxwell Salzberg
2422bdab46
MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes
2012-01-07 12:55:46 -08:00
Maxwell Salzberg
523a960d94
peace troll
2012-01-05 18:53:27 -08:00
Maxwell Salzberg
d9c2b0d4b5
make cdn jquery http/s agnostic
2012-01-04 23:57:28 -08:00
Maxwell Salzberg
fdea2f94ff
remove icky analytics code from layouts, move to middleware
2012-01-04 23:54:48 -08:00
Maxwell Salzberg
7cc6e3ed68
uncomment cdn line.. whoops
2012-01-04 22:19:37 -08:00
Jonne Haß
52c75a7ad4
Revert "Revert "auto follow back feature""
...
This reverts commit 6408105917 .
Conflicts:
db/schema.rb
2012-01-04 13:49:56 +01:00
Maxwell Salzberg
34e4c027d0
small typo
2012-01-03 22:47:10 -08:00
Maxwell Salzberg
4e574c3fef
fixed loading jquery from the CDN, and the fallback to the local copy still works
2012-01-03 20:02:52 -08:00
Maxwell Salzberg
63cdd93afc
the websocket has been completely removed, and replaced for a stub until
...
we find a better way to reimpliment it in a more sane way
2012-01-03 18:39:54 -08:00
danielgrippi
6ab03d33b4
hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions)
2011-12-30 23:51:13 -05:00
danielgrippi
0f42c98a7b
merge Pistos's reshare branch into master
2011-12-20 14:42:18 -08:00
Pistos
f83e56e5f3
Added a counter cache for the number of reshares of a post.
2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c
Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary.
2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44
Always show "Reshare original" for link. Show number of reshares in the post_initial_info div.
...
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared. Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares". Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
2011-12-19 17:12:17 -05:00
Lennart Prelle
20a39714bf
added translation for close account
2011-12-15 15:35:30 +01:00
Jonne Hass
05be43e21a
fix #2504
2011-12-10 12:44:55 +01:00
Maxwell Salzberg
8f8769aab5
basic NSFW filtering for authors who say their post is nsfw
2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64
translated close account
2011-12-08 16:32:20 -08:00
danielgrippi
342593988b
MS DG; fixed close account cukes
2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5
basic page for deleting account with temporary text and cute cat picture
2011-12-08 16:32:20 -08:00