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
Florian Staudacher
412853bfcc
make lightbox work for photos page (+tests)
2012-02-22 14:45:43 +01: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
David Morley
b5bb66c66d
fix 2898 - public profile unauthed user
2012-02-18 16:28:05 -08:00
Maxwell Salzberg
1e170291e5
add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing
2012-02-18 16:28:04 -08:00
danielgrippi
7ca423b3f2
DG MS; don't initialize a stream on post pages.
2012-02-18 16:28:02 -08:00
Dennis Collinson
32d58e8a9b
toggle all nsfw posts
2012-02-18 16:26:17 -08:00
danielgrippi
34cc358345
aliasing in routes.js [ci skip]
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
Maxwell Salzberg
10a059e8f8
remove console.log [ci skip]
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
87aa1fde34
change language around explore/participate.
2012-02-18 16:26:15 -08:00
danielgrippi
dba50ae273
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e119377dd30f4d06ccb9ba9
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
Maxwell Salzberg
819e8b1f48
typo in my js SRY [ci skip]
2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4
fix a bunch of small css related media box issues [ci skip]
2012-02-18 16:26:13 -08:00
Maxwell Salzberg
5ea6648550
add more images to use handlebars imageUrl helper
2012-02-18 16:26:12 -08:00
danielgrippi
a1df9fe8db
fix jasmine
2012-02-18 16:26:11 -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
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
David Morley
dcac17855e
fix 2898 - public profile unauthed user
2012-02-18 12:30:01 -06:00
Joe Bivins
1b058cf908
Fix #2354 (attempt 3).
...
Sends the user to the application root (redirecting to /explore) after
they remove post from the post page with one post on it.
2012-02-17 23:14:23 -05:00
Maxwell Salzberg
20c79f1bb2
add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing
2012-02-16 17:37:13 -08:00
danielgrippi
5f83abe418
DG MS; don't initialize a stream on post pages.
2012-02-15 15:07:28 -08:00
Dennis Collinson
e16a20e18c
toggle all nsfw posts
2012-02-14 14:15:24 -08:00
danielgrippi
7f550d2d92
aliasing in routes.js [ci skip]
2012-02-14 12:59:19 -08:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
Maxwell Salzberg
8307514439
remove console.log [ci skip]
2012-02-14 10:39:42 -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
danielgrippi
32f93a0391
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a
change language around explore/participate.
2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e119377dd30f4d06ccb9ba9
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
1225517c51
Merge remote branch 'upstream/master'
2012-02-12 21:45:14 +01:00
Maxwell Salzberg
427a1694db
typo in my js SRY [ci skip]
2012-02-10 15:53:25 -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
6bc44f6f5a
add more images to use handlebars imageUrl helper
2012-02-10 13:44:45 -08:00
danielgrippi
535c39ae7b
fix jasmine
2012-02-09 18:21:51 -08:00
danielgrippi
f7e09df49b
fix reshare tempalte; reorder header
2012-02-09 15:50:32 -08:00
Alex Harrison
54571268e5
Added a post conversion hook to PageDown to add target="_blank" ( fixes #2792 )
2012-02-09 23:30:28 +01: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
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
