Commit graph

10774 commits

Author SHA1 Message Date
Maxwell Salzberg
7bdff9e505 return to diaspora after oauth cukes to prevent failures [ci skip] 2012-02-18 16:26:12 -08:00
danielgrippi
6573559faf fix weird search bar shadow issue in chrome [ci skip] 2012-02-18 16:26:11 -08:00
danielgrippi
24e37cf32b fix syntax in comment.rb 2012-02-18 16:26:11 -08:00
danielgrippi
2c041701ea allow comments to be 65535 chars long (as opposed to 2500) 2012-02-18 16:26:11 -08:00
danielgrippi
a1df9fe8db fix jasmine 2012-02-18 16:26:11 -08:00
danielgrippi
89938bac6e fix cuke 2012-02-18 16:26:11 -08:00
Maxwell Salzberg
36cb22ce1a allow localhost in cukes 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
29ea9c05e3 fix reshare tempalte; reorder header 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
danielgrippi
a16a8fc784 Participate / Explore have been upgraded to top-level status. 2012-02-18 16:26:10 -08:00
Maxwell Salzberg
083aae1a25 update participate path in cuke 2012-02-18 16:26:10 -08:00
Florian Staudacher
2d29f93e42 fix shifted image button in firefox 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
56d9da6e04 make previously added specs green 2012-02-18 16:26:09 -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
Adrián Chaves Fernández (Gallaecio)
84f5561c77 Some progress on Galician translation review. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
d812502ee4 Additional progress on the Galician translation. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
9b7e3e8f2d Some progress on the Galician translation review. 2012-02-18 16:26:09 -08:00
Adrián Chaves Fernández (Gallaecio)
550ffec091 Updated devise.gl.yml Galician translation file. 2012-02-18 16:26:09 -08:00
Florian Staudacher
dc01515aac a little too much copy&paste... 2012-02-18 18:59:52 +01:00
Florian Staudacher
cab953848f added tests for photos page 2012-02-09 23:12:39 +01:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +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