Maxwell Salzberg
|
0d93227f07
|
hopefully make travis happy:
|
2012-02-28 17:52:13 -08:00 |
|
danielgrippi
|
61b4e77bde
|
Merge branch 'profiles'
|
2012-02-28 10:29:17 -08:00 |
|
danielgrippi
|
74cdc91bb1
|
fix likes and comment loading in the stream
|
2012-02-27 20:38:59 -08:00 |
|
Maxwell Salzberg
|
22cda15aa8
|
presenter now has a title
|
2012-02-27 18:11:41 -08:00 |
|
danielgrippi
|
0df179c514
|
fix specs
|
2012-02-27 17:56:52 -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 |
|
Steven Fuchs
|
66afb7baff
|
use a stub instead of creating a post to simpy supply text
|
2012-02-25 23:59:02 -05:00 |
|
Maxwell Salzberg
|
42a93f9490
|
remove weird monkey patch in sessions controller #wtf
|
2012-02-25 17:41:46 -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 |
|
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 |
|
danielgrippi
|
39d31d5888
|
Merge branch 'master' of github.com:diaspora/diaspora into profiles
|
2012-02-24 14:36:18 -08:00 |
|
danielgrippi
|
2c0cfa53dc
|
don't show left-right nav when idle
|
2012-02-24 13:31:17 -08:00 |
|
Diaspora Europe
|
57de352238
|
added some specs for json response
|
2012-02-24 10:22:16 +01:00 |
|
Dennis Collinson
|
9769dfb303
|
cukes passing
|
2012-02-23 17:24:19 -08:00 |
|
danielgrippi
|
806487a5ff
|
namespace view folder with folders
|
2012-02-23 11:12:20 -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
|
8f4fed8c0e
|
add participants to info pane on post viewer
|
2012-02-22 13:15:54 -08:00 |
|
Florian Staudacher
|
412853bfcc
|
make lightbox work for photos page (+tests)
|
2012-02-22 14:45:43 +01:00 |
|
Maxwell Salzberg
|
7755c254fb
|
some basic tests for post presenter; added user.reshare!
|
2012-02-21 21:56:11 -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
|
37981b71fe
|
MS; DG; adding cucumbers for post templates
|
2012-02-21 17:31:26 -08:00 |
|
danielgrippi
|
b1cbd0f4a9
|
fix all but 2 jasmine specs
|
2012-02-21 15:23:30 -08:00 |
|
danielgrippi
|
3db133a3a7
|
be less agressive when re-rendering on feedback actions
|
2012-02-21 15:23:30 -08:00 |
|
Maxwell Salzberg
|
0ab8ef1d08
|
basic support for activity streams photos
|
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
|
ff875a5b3c
|
DG MS; determine what template to use on the client from the server
|
2012-02-21 15:23:27 -08:00 |
|
Maxwell Salzberg
|
0a49cfd866
|
Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3
Go to root page if deleting post from the show page
|
2012-02-18 17:14:42 -08:00 |
|
Maxwell Salzberg
|
7aba1ce1f7
|
Merge branch 'Raven24-user-photos'
Conflicts:
public/javascripts/app/router.js
public/stylesheets/sass/application.sass
|
2012-02-18 17:12:14 -08:00 |
|
Joe Bivins
|
76c11b8d37
|
Add test case for when a user removes their own post from the show page.
Adjust redirection logic.
|
2012-02-18 19:47:25 -05:00 |
|
Maxwell Salzberg
|
1e2b912bd6
|
remove multi server spec files
|
2012-02-18 16:26:18 -08:00 |
|
danielgrippi
|
a0e8f161f5
|
fix notifications controller. yay.
|
2012-02-18 16:26:18 -08:00 |
|
danielgrippi
|
ceb8497e49
|
Revert "attempt to make travis happy" [ci skip]
This reverts commit 8507dc864f.
|
2012-02-18 16:26:17 -08:00 |
|
danielgrippi
|
5fd0ab7951
|
attempt to make travis happy
|
2012-02-18 16:26:17 -08:00 |
|
Dennis Collinson
|
32d58e8a9b
|
toggle all nsfw posts
|
2012-02-18 16:26:17 -08:00 |
|
danielgrippi
|
debdd6cb6b
|
change routes to properly reflect page names (activity/stream).
|
2012-02-18 16:26:16 -08:00 |
|
Florian Staudacher
|
8249847e9c
|
bookmarklet now is a complete html document (+test)
it auto-expands to the size of the text that was selected
it self-closes after posting again
|
2012-02-18 16:26:15 -08:00 |
|
danielgrippi
|
2f7465450e
|
you can now follow / unfollow a post from the stream; fixed cukes.
|
2012-02-18 16:26:15 -08:00 |
|
danielgrippi
|
431a04b0a8
|
made nsfw shield nicer and more condensed [ci skip]
|
2012-02-18 16:26:14 -08:00 |
|
Dennis Collinson
|
d6fd5cdb20
|
federated generators take a user
|
2012-02-18 16:26:12 -08:00 |
|
Dennis Collinson
|
a0ca983c57
|
Participate stream query uses participations
|
2012-02-18 16:26:12 -08:00 |
|
Dennis Collinson
|
c9487ee12f
|
move user modules into user namespace.
|
2012-02-18 16:26:12 -08:00 |
|
Dennis Collinson
|
b0e81af1fa
|
Refactor Relayable Creation
|
2012-02-18 16:26:12 -08:00 |
|
Dennis Collinson
|
8ae6303a91
|
Participations are a federated, relayable model :)
|
2012-02-18 16:26:12 -08:00 |
|
danielgrippi
|
a1df9fe8db
|
fix jasmine
|
2012-02-18 16:26:11 -08:00 |
|
Maxwell Salzberg
|
10bdf52ef7
|
mock out slow things that our tests dont need for speed
|
2012-02-18 16:26:10 -08:00 |
|
Maxwell Salzberg
|
ebeff6c8e6
|
fix for some crazy lack-of-stubbing on some http requests...
|
2012-02-18 16:26:10 -08:00 |
|
danielgrippi
|
173894d926
|
stubbornella media and img dom structure FTW! major css deletion <3
|
2012-02-18 16:26:10 -08:00 |
|
Diaspora Europe
|
92b29d31db
|
added user_is_following method, added 2 model specs
|
2012-02-18 16:26:10 -08:00 |
|
Diaspora Europe
|
55cb328fe2
|
tags should be case insensitive
|
2012-02-18 16:26:10 -08:00 |
|
Florian Staudacher
|
0222e4b2ee
|
added intentionally failing specs, because dirty input breaks bookmarklet
see also #2741 #2751 #2800
|
2012-02-18 16:26:09 -08:00 |
|
Maxwell Salzberg
|
4f2783487d
|
Merge pull request #2881 from beardedninja/master
Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792
|
2012-02-18 16:12:39 -08:00 |
|
Florian Staudacher
|
dc01515aac
|
a little too much copy&paste...
|
2012-02-18 18:59:52 +01:00 |
|
Maxwell Salzberg
|
326103adb6
|
remove multi server spec files
|
2012-02-14 16:40:11 -08:00 |
|
danielgrippi
|
a5debd795d
|
fix notifications controller. yay.
|
2012-02-14 15:59:51 -08:00 |
|
danielgrippi
|
52c8540091
|
Revert "attempt to make travis happy" [ci skip]
This reverts commit 8507dc864f.
|
2012-02-14 15:05:28 -08:00 |
|
danielgrippi
|
8507dc864f
|
attempt to make travis happy
|
2012-02-14 15:00:59 -08:00 |
|
Dennis Collinson
|
e16a20e18c
|
toggle all nsfw posts
|
2012-02-14 14:15:24 -08:00 |
|
danielgrippi
|
f3f2b8ca44
|
change routes to properly reflect page names (activity/stream).
|
2012-02-14 11:16:41 -08:00 |
|
Florian Staudacher
|
4263797099
|
bookmarklet now is a complete html document (+test)
it auto-expands to the size of the text that was selected
it self-closes after posting again
|
2012-02-14 18:57:30 +01:00 |
|
Daniel Grippi
|
1638f32042
|
Merge pull request #2841 from Raven24/bookmarklet-specs
intentionally failing specs - dirty input breaks bookmarklet (+fix)
|
2012-02-13 21:14:56 -08:00 |
|
danielgrippi
|
32f93a0391
|
you can now follow / unfollow a post from the stream; fixed cukes.
|
2012-02-13 19:13:43 -08:00 |
|
danielgrippi
|
f1c119452a
|
made nsfw shield nicer and more condensed [ci skip]
|
2012-02-13 14:12:14 -08:00 |
|
Alex Harrison
|
763f8465eb
|
Added test for adding target=_blank to autolinks
|
2012-02-12 22:43:52 +01:00 |
|
Dennis Collinson
|
04bd507025
|
federated generators take a user
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
5e26a7e6bb
|
Participate stream query uses participations
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
14b9f5dc5b
|
move user modules into user namespace.
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
f3c1eff3e9
|
Refactor Relayable Creation
|
2012-02-09 19:01:00 -08:00 |
|
Dennis Collinson
|
9e1816dc12
|
Participations are a federated, relayable model :)
|
2012-02-09 19:01:00 -08:00 |
|
danielgrippi
|
535c39ae7b
|
fix jasmine
|
2012-02-09 18:21:51 -08:00 |
|
Maxwell Salzberg
|
7109cf6c67
|
mock out slow things that our tests dont need for speed
|
2012-02-09 17:44:32 -08:00 |
|
Maxwell Salzberg
|
3d569cc4bc
|
fix for some crazy lack-of-stubbing on some http requests...
|
2012-02-09 16:20:22 -08:00 |
|
danielgrippi
|
e6e49bbf1f
|
stubbornella media and img dom structure FTW! major css deletion <3
|
2012-02-09 14:29:01 -08:00 |
|
Florian Staudacher
|
cab953848f
|
added tests for photos page
|
2012-02-09 23:12:39 +01:00 |
|
Diaspora Europe
|
8eda9aaf52
|
added user_is_following method, added 2 model specs
|
2012-02-09 14:17:43 +01:00 |
|
Diaspora Europe
|
47f7e10860
|
tags should be case insensitive
|
2012-02-09 14:17:43 +01:00 |
|
Maxwell Salzberg
|
062204e963
|
Merge pull request #2848 from beardedninja/master
#2847 Users can now toggle nsfw on and off
|
2012-02-08 17:21:29 -08:00 |
|
Maxwell Salzberg
|
a9b6426323
|
Merge pull request #2839 from diasp/2036-fix-private-messages-navigation
#2036 Fix private messages are sometimes displayed without navigation
|
2012-02-08 16:59:50 -08:00 |
|
danielgrippi
|
84eb313e20
|
updated routes to reflect page titles (explore/participate)
|
2012-02-08 14:40:28 -08:00 |
|
Alex Harrison
|
0cbdf51e6a
|
#2847 Users can now toggle nsfw on and off
|
2012-02-08 23:01:02 +01:00 |
|
danielgrippi
|
8fb3ad710f
|
fix jasmine
|
2012-02-08 10:34:21 -08:00 |
|
Diaspora Europe
|
e4e1362ff5
|
added spec for redirect to conversations_controller_spec
|
2012-02-08 16:53:48 +01:00 |
|
danielgrippi
|
a819f38b99
|
touch interacted_at on Post#after_create
|
2012-02-07 21:32:10 -08:00 |
|
Dennis Collinson
|
a72a09a24c
|
posts made by nsfw people are marked nsfw by default
|
2012-02-07 19:37:38 -08:00 |
|
Dennis Collinson
|
558ceec92a
|
a user can mark themselves as nsfw
|
2012-02-07 19:03:20 -08:00 |
|
Maxwell Salzberg
|
cb23b2d5b7
|
make jasmine happy, by just refrencing the template package we already create
|
2012-02-07 15:35:42 -08:00 |
|
Maxwell Salzberg
|
f141537d0d
|
jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch
|
2012-02-07 14:07:50 -08:00 |
|
Florian Staudacher
|
d965016cf6
|
added intentionally failing specs, because dirty input breaks bookmarklet
see also #2741 #2751 #2800
|
2012-02-07 21:47:53 +01:00 |
|
danielgrippi
|
fafa74a222
|
fix spec, mustache scoping issue in partial.
|
2012-02-05 21:23:45 -08:00 |
|
danielgrippi
|
7d60d96132
|
set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip]
|
2012-02-05 21:18:34 -08:00 |
|
danielgrippi
|
39ff47150b
|
allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.
|
2012-02-04 15:50:36 -08:00 |
|
Dennis Collinson
|
3991903b56
|
MS DG DC Participate stream that has things bubble to the top
|
2012-02-03 17:23:57 -08:00 |
|
danielgrippi
|
a3e13e3c0e
|
User#like! method.
|
2012-02-03 14:42:03 -08:00 |
|
Steven Fuchs
|
ef7dc1c017
|
update aspect name in page listing after editing.
|
2012-02-03 08:37:35 -05:00 |
|