danielgrippi
|
ecdbd1bb26
|
remove joindiaspora specific home page from repo [ci skip]
|
2012-02-10 15:45:48 -08:00 |
|
danielgrippi
|
5ecb3e8a50
|
remove a task that doesnt seem to work
|
2012-02-10 15:31:46 -08:00 |
|
danielgrippi
|
3c7ebe3200
|
forgot to save a template [ci skip]
|
2012-02-10 15:24:47 -08:00 |
|
danielgrippi
|
33fb1222f1
|
change rake assets:compile_s3 to rake assets:deploy [ci skip]
|
2012-02-10 15:21:59 -08:00 |
|
danielgrippi
|
3e4d2fe7e8
|
adding custom landing page for heroku
|
2012-02-10 15:20:15 -08:00 |
|
danielgrippi
|
b866d9356a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2012-02-10 15:18:49 -08:00 |
|
danielgrippi
|
ed3d5c429a
|
fix a bunch of small css related media box issues [ci skip]
|
2012-02-10 15:18:27 -08:00 |
|
Maxwell Salzberg
|
232e620637
|
make posts have empty photos so reshared stop messing up
|
2012-02-10 13:45:41 -08:00 |
|
Maxwell Salzberg
|
6bc44f6f5a
|
add more images to use handlebars imageUrl helper
|
2012-02-10 13:44:45 -08:00 |
|
Dennis Collinson
|
f8ec80b62d
|
Merge branch 'participation_refactor'
|
2012-02-09 19:01:17 -08: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 |
|
Maxwell Salzberg
|
1c314c9540
|
return to diaspora after oauth cukes to prevent failures [ci skip]
|
2012-02-09 18:52:57 -08:00 |
|
danielgrippi
|
0056bc354e
|
fix weird search bar shadow issue in chrome [ci skip]
|
2012-02-09 18:35:19 -08:00 |
|
danielgrippi
|
2b15bc7938
|
fix syntax in comment.rb
|
2012-02-09 18:29:52 -08:00 |
|
danielgrippi
|
7a5838a363
|
allow comments to be 65535 chars long (as opposed to 2500)
|
2012-02-09 18:26:20 -08:00 |
|
danielgrippi
|
535c39ae7b
|
fix jasmine
|
2012-02-09 18:21:51 -08:00 |
|
danielgrippi
|
5a4f9d5b99
|
fix cuke
|
2012-02-09 18:03:41 -08:00 |
|
Maxwell Salzberg
|
62b222020d
|
allow localhost in cukes
|
2012-02-09 17:54:56 -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
|
f7e09df49b
|
fix reshare tempalte; reorder header
|
2012-02-09 15:50:32 -08:00 |
|
danielgrippi
|
e6e49bbf1f
|
stubbornella media and img dom structure FTW! major css deletion <3
|
2012-02-09 14:29:01 -08:00 |
|
danielgrippi
|
398ca3d97b
|
Participate / Explore have been upgraded to top-level status.
|
2012-02-09 14:29:01 -08:00 |
|
Maxwell Salzberg
|
ceb0a15a84
|
update participate path in cuke
|
2012-02-09 10:52:53 -08:00 |
|
Maxwell Salzberg
|
16b20905a5
|
Merge pull request #2846 from diasp/2398-fixed-following-tag-button
Tags should be case insensitive
|
2012-02-09 10:12:48 -08: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 |
|
Dennis Collinson
|
74409d64b5
|
cleanup, yoq
|
2012-02-08 17:25:25 -08: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 |
|
Dennis Collinson
|
94a7f5bb91
|
unsfw - sorry Kinky Joe!
|
2012-02-08 16:35:55 -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 |
|
Diaspora Europe
|
3c4b37dad7
|
PMs should always be displayed with the navigation.
|
2012-02-08 16:53:48 +01:00 |
|
Sarah Mei
|
6e9d5f013a
|
Fixes #2820 by disambiguating which Person class we want
|
2012-02-08 06:19:59 -08: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
|
8ae18bb393
|
nsfw's users posts are now nsfw
|
2012-02-07 19:14:44 -08:00 |
|
Dennis Collinson
|
558ceec92a
|
a user can mark themselves as nsfw
|
2012-02-07 19:03:20 -08:00 |
|
Dennis Collinson
|
efd99344eb
|
git status
|
2012-02-07 18:29:51 -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
|
5425d405d8
|
try running jammit explicitly before jasmine
|
2012-02-07 14:59:59 -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 |
|
Maxwell Salzberg
|
7d325cb29b
|
sad fix for stupid app config problem in development [ci skip]
|
2012-02-07 13:41:03 -08:00 |
|