Daniel Grippi
|
7a774661bb
|
Merge pull request #2777 from stwf/tweak-twitter-truncation
take url shortening into effect before truncating twitter posts
|
2012-02-29 22:49:46 -08:00 |
|
danielgrippi
|
61b4e77bde
|
Merge branch 'profiles'
|
2012-02-28 10:29:17 -08:00 |
|
Maxwell Salzberg
|
d80afc64ec
|
fix ordering for logged out users
|
2012-02-27 19:16:05 -08:00 |
|
Maxwell Salzberg
|
879b3d135a
|
title now updates with switch
|
2012-02-27 18:40:56 -08:00 |
|
Maxwell Salzberg
|
22cda15aa8
|
presenter now has a title
|
2012-02-27 18:11:41 -08:00 |
|
Dennis Collective
|
7abbe4a642
|
Merge pull request #2925 from diasp/2833-conversations-should-return-json
Conversations should return json #2833
|
2012-02-27 17:34:10 -08:00 |
|
Dennis Collective
|
f5ef1e8c14
|
Merge pull request #2814 from stwf/aspects-javascript-fixes
update aspect name in aspects listing after editing.
|
2012-02-27 17:19:05 -08:00 |
|
danielgrippi
|
0112285985
|
Merge branch 'master' into profiles
Conflicts:
lib/diaspora/shareable.rb
|
2012-02-27 14:27:05 -08:00 |
|
Maxwell Salzberg
|
c85e2a9b5d
|
Merge pull request #2935 from Raven24/host-meta
adapt host-meta document to RFC 6415
|
2012-02-25 17:11:06 -08:00 |
|
Maxwell Salzberg
|
27a4c1bf2d
|
introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor
|
2012-02-25 16:57:14 -08:00 |
|
Maxwell Salzberg
|
49b0a44738
|
removing estates builder, as we are now using a template
|
2012-02-25 16:55:26 -08:00 |
|
Maxwell Salzberg
|
a1f39398be
|
Merge pull request #2902 from JMSilla/master
Fix atom feed bug (bug mash 7) [ci skip]
|
2012-02-25 16:47:13 -08:00 |
|
JMSilla
|
8178e0712c
|
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
|
2012-02-25 22:24:43 +00:00 |
|
Florian Staudacher
|
6a9a0e61f9
|
adapt host-meta document to RFC 6415
|
2012-02-25 16:56:34 +01:00 |
|
danielgrippi
|
73f224e690
|
don't render page-viewer twice; last_post should actually get the last post posted, not the first one
|
2012-02-24 21:48:37 -08:00 |
|
danielgrippi
|
dc0b5db0ac
|
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
|
2012-02-24 20:14:26 -08:00 |
|
Dennis Collinson
|
b28508ecbc
|
MS DC show last post and show page works unauthenticated
phasing out app.user() for app.currentUser
|
2012-02-24 19:09:00 -08:00 |
|
David Morley
|
33fada305c
|
put all the elements back on the page and make facebook inviter usable again
|
2012-02-24 20:46:27 -06:00 |
|
danielgrippi
|
39d31d5888
|
Merge branch 'master' of github.com:diaspora/diaspora into profiles
|
2012-02-24 14:36:18 -08:00 |
|
Dennis Collinson
|
6e55d6c011
|
DC MS DG; un-namespace single post JSON responses
|
2012-02-24 13:30:16 -08:00 |
|
Maxwell Salzberg
|
0db2bd9e40
|
Merge pull request #2908 from diasporg/adminclean
clean up admin page [ci skip]
|
2012-02-24 10:44:52 -08:00 |
|
Florian Staudacher
|
663a5a0e7c
|
escape all passed params in js - fixes #2922
|
2012-02-24 14:15:08 +01:00 |
|
Diaspora Europe
|
89179ecbd3
|
conversations should return JSON #2833
|
2012-02-24 09:39:40 +01:00 |
|
Dennis Collinson
|
9769dfb303
|
cukes passing
|
2012-02-23 17:24:19 -08:00 |
|
danielgrippi
|
b4923a77f0
|
add keybinding to the viewer
|
2012-02-22 19:19:24 -08:00 |
|
danielgrippi
|
8f3cc6769c
|
update reshare count when resharing; return PostPresenter for reshare root in the success response
|
2012-02-22 18:02:08 -08:00 |
|
danielgrippi
|
846b14fac6
|
DG MS; you can comment from show pages. killer tofu.
|
2012-02-22 17:42:51 -08:00 |
|
danielgrippi
|
8f4fed8c0e
|
add participants to info pane on post viewer
|
2012-02-22 13:15:54 -08:00 |
|
Maxwell Salzberg
|
cd274cad0d
|
adding likes, reshares and comments in a naive presenter way
|
2012-02-21 22:13:46 -08:00 |
|
Maxwell Salzberg
|
7755c254fb
|
some basic tests for post presenter; added user.reshare!
|
2012-02-21 21:56:11 -08:00 |
|
danielgrippi
|
3ec7755c83
|
update reshare count when resharing; return PostPresenter for reshare root in the success response
|
2012-02-21 21:51:40 -08:00 |
|
danielgrippi
|
899136d0e5
|
display proper counts after feedback actions; modified destroy responses to return PostPresenter objects
|
2012-02-21 21:44:44 -08:00 |
|
danielgrippi
|
ebcde41e69
|
display original author if post is a reshare
|
2012-02-21 15:23:30 -08:00 |
|
danielgrippi
|
6965d6da24
|
fix feedback views. use gross callbacks for now
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
a1fe55fcb7
|
mark icons colored if user has interacted with a post.
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
f31418feb3
|
pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
2815885bcf
|
add user_like to PostPresenter; use proper inheritance for feedback views
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
ca8f136cec
|
fixed back/forward
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
f83b82902c
|
markdownify text; better folder structure for photo-viewer templates
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
3d1ac7ed55
|
added basic reshare attribution
|
2012-02-21 15:23:29 -08:00 |
|
danielgrippi
|
c0eeb7680b
|
pages wip
|
2012-02-21 15:23:28 -08:00 |
|
danielgrippi
|
7acbfe1b78
|
refactored some js to make sense of how we're going to attack the post show page with a js Page
|
2012-02-21 15:23:28 -08:00 |
|
danielgrippi
|
30de08b340
|
fix post presenter / arrow ordering
|
2012-02-21 15:23:28 -08:00 |
|
danielgrippi
|
ead286bf99
|
DG RY; moved actions to the bottom of the show pages; fixed arrows
|
2012-02-21 15:23:28 -08:00 |
|
Maxwell Salzberg
|
653e93fb11
|
fix the query to only cycle thru the current authors posts
|
2012-02-21 15:23:28 -08:00 |
|
Maxwell Salzberg
|
25cf776059
|
the previous and next posts are now supplied in json of the presenter; give the template creator a default value
|
2012-02-21 15:23:28 -08:00 |
|
danielgrippi
|
cc0e04ea3f
|
DG MS; fix user controls
|
2012-02-21 15:23:28 -08:00 |
|
danielgrippi
|
691bdb96cd
|
DG MS; post vitals on top left; user action placeholder on top right
|
2012-02-21 15:23:28 -08:00 |
|
Maxwell Salzberg
|
a3e8ced6a1
|
haha more arrow controlz
|
2012-02-21 15:23:28 -08:00 |
|
Maxwell Salzberg
|
e0b29048f4
|
haxy auto comment functionality; try me and then revert me"
|
2012-02-21 15:23:27 -08:00 |
|