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
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
Maxwell Salzberg
2282fd35d1
kill no longer used youtube titles code with fire
2011-12-08 16:16:57 -08:00
Jonne Hass
a892ea41eb
refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471
2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f
Include "Looking For #link" under params[:q] blank else branch
2011-12-03 21:23:39 -02:00
Daniel Grippi
71354a1673
Merge pull request #2469 from geckoxx/comment_stream_new
...
better commented_posts_stream
2011-12-02 10:42:36 -08:00
Johannes Hackel
4b25545e82
fix sql error
2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c
change upload photo alt text
2011-12-01 10:22:35 +04:00
Pistos
aa0aaa2f92
Revert "Merge pull request #2428 from geckoxx/comment_stream"
...
This reverts commit 8a2756827331ef2d60f7
2011-11-30 22:22:32 -05:00
Johannes Hackel
23fa7a0a3e
like stream new
2011-11-29 17:27:09 +01:00
Daniel Grippi
161d9d527c
Merge pull request #2270 from fermionic/allow-photo-views-in-mobile
...
re-enable photo viewing on mobile
2011-11-28 11:03:13 -08:00
Daniel Grippi
a4027f3d22
Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2
...
Issue #2284 : simple fix
2011-11-28 09:32:41 -08:00
Daniel Grippi
8a27568273
Merge pull request #2428 from geckoxx/comment_stream
...
comment_stream
2011-11-28 09:05:45 -08:00
Vittorio Cuculo
fdd52782d2
show diaspora_handle on profile [mobile]
2011-11-24 09:42:15 +01:00
Jonne Hass
a40fbc9617
Merge pull request #2403 from gandaro/outdated-information-cubbies
...
deleted tokens:show:login_with_diaspora_is_comming
2011-11-23 13:07:10 -08:00
Michael Sofaer
2b8d07f94b
Censorship point has been made ... for now.
2011-11-22 15:54:50 -08:00
Johannes Hackel
7368bb9e62
comment_stream
2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f
Fix lightbox for non-logged-in user
2011-11-19 21:45:31 -08:00
Jake Peryl
07f05ebead
Issue #2284 : simple fix
2011-11-17 01:22:01 +01:00
danielgrippi
cc4531f73c
stop censorship. sopa
2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441
translate Email in the sidebar
2011-11-16 21:55:09 +01:00
Jonne Hass
09bad3a7f6
Merge pull request #2314 from Pistos/svg-to-png
...
Converted all [used] SVG graphics to PNG.
2011-11-16 10:45:33 -08:00
Jakob Kramer
3f3dbf0c6c
deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now
2011-11-15 14:42:47 +01:00
danielgrippi
8e55fc158b
use root_path in header if not logged in
2011-11-14 19:04:27 -08:00
danielgrippi
6be778b9b2
change root_path and root_url to multi_path
2011-11-14 18:01:09 -08:00
danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf
2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85
Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
...
Get rid of 500 error on the "view this invitation in your browser" link
2011-11-14 17:02:13 -08:00
