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
Daniel Grippi
e02849bde0
Merge pull request #2835 from rekado/fix-1308
...
Fix #1308 : publisher submits w/o pasted text [ci skip]
2012-02-07 09:40:37 -08:00
Ricardo
b4c0c0e679
Fix #1308 : publisher submits w/o pasted text
...
Text can be input not only with the keyboard but also with a right-click
paste or a middle mouse button paste in X. The publisher now listens to
the 'textchange' event instead of ignoring anything but a 'keyup'.
2012-02-07 22:40:56 +08:00
Maxwell Salzberg
e46bf0cba4
that weird header is not loading bug was a missing semicolan #dumb #javascript
2012-02-06 18:33:14 -08:00
Dennis Collinson
ff1cbb48cc
remove excess call to appconfi#setup
2012-02-06 17:42:01 -08:00
Dennis Collinson
9b5f5b8129
Merge branch 'fix_stream_order'
2012-02-06 16:52:35 -08:00
Dennis Collinson
a399572995
MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things
2012-02-06 16:51:32 -08:00
Dennis Collinson
578e8ef269
broken
2012-02-06 14:55:14 -08:00
Maxwell Salzberg
4382d45e82
almost failing cuke
2012-02-06 12:25:02 -08:00
danielgrippi
de757db48b
fix ruby reshare model; extract sortOrder in app.models.Stream.
2012-02-06 08:26:11 -08:00
danielgrippi
fa5424653a
fix markup display on reshares. DERP. [ci skip]
2012-02-06 08:02:27 -08:00
Jonne Haß
f83076850b
use :absolute => true instead of concatenating the pod url manually in ostatus_builder [ci skip]
2012-02-06 10:18:51 +01:00
Jonne Haß
7638619c7f
Merge pull request #2821 from gandaro/missing-translation-invitations
...
add previously missing translation in the invitation-lightbox
2012-02-06 04:38:42 -08:00
danielgrippi
b2be1b2c53
a little less broken. formatting is broken on reshares, but the cukes should now pass.
2012-02-05 22:58:08 -08:00
danielgrippi
bb95bf55f6
fix images in reshares. unfortunately, the reshare presenter is broken right now and i'm passing out in front of my laptop (re: cuke failure) :( [ci skip]
2012-02-05 21:54:06 -08: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
Daniel Grippi
a142911a8f
Merge pull request #2811 from gandaro/2809-atom-userlink-incorrect
...
use guid in atom feed to fix the link
2012-02-05 20:31:03 -08:00
Daniel Grippi
fc8a9a7b58
Merge pull request #2826 from nolith/capistrano
...
fixed and improved capistrano recipe [ci skip]
2012-02-05 20:29:42 -08:00
danielgrippi
5d051fcc52
we're now rolling 100% handlebars for our templates, with jammit handling them as static assets.
2012-02-05 16:42:34 -08:00
danielgrippi
36e5ca431f
replace two more underscore templates with handlebar counterparts [ci skip]
2012-02-05 13:40:34 -08:00
danielgrippi
5a72f868d3
replace two underscore templates with their handlebars counterparts
2012-02-05 12:50:28 -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
Alessio Caiazza
67e2ca44fc
capistrano deploy: fixed multiple thin detection
2012-02-04 18:11:34 +01:00
Alessio Caiazza
8632c8c40b
capistrano deploy: let the user choose if running svc and svstat with sudo
...
Set svc_sudo to true in deploy_config.yml to use sudo.
The default value will be false, so that if the parameter is missing capistrano will behave exactly as before.
2012-02-04 17:59:30 +01:00
Jakob Kramer
d8183d3973
add missing translation in the invitation-lightbox [ci skip]
2012-02-04 14:17:19 +01:00
