Maxwell Salzberg
2e1f353ac4
Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more
...
Conflicts:
public/javascripts/app/views/content_view.js
2012-03-19 19:11:57 -07:00
Florian Staudacher
5dae27c170
finally some working tests for "show more"
2012-03-16 02:00:50 +01:00
danielgrippi
5c90b0d5e7
comment out a jasmine spec for now to make travis happy
2012-03-14 17:33:08 -07:00
Florian Staudacher
cd965e32fa
fix comment stream jasmine - bind function after spy has been defined
2012-03-14 18:43:06 +01:00
Maxwell Salzberg
56a7da530f
small js test fixes
2012-03-13 19:30:34 -07:00
Florian Staudacher
9aa0a7ed58
extracted "show more" part from #2941 , tests still WIP
2012-03-14 02:09:27 +01:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Joe Bivins
7b47edff14
Move date parsing to a helper.
2012-03-04 13:36:35 -05:00
Joe Bivins
e26fcf836a
Correct JS error in app_spec.js
2012-03-03 12:20:31 -05:00
Joe Bivins
4769a25d59
Add ISO 8601 timestamp parsing for legacy browsers.
...
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
2012-03-03 12:14:43 -05:00
Diaspora Europe
e2776420bc
added likes specs to post view
2012-02-29 12:12:32 +01:00
danielgrippi
74cdc91bb1
fix likes and comment loading in the stream
2012-02-27 20:38:59 -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
8f4fed8c0e
add participants to info pane on post viewer
2012-02-22 13:15:54 -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
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
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
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
danielgrippi
a1df9fe8db
fix jasmine
2012-02-18 16:26:11 -08:00
danielgrippi
173894d926
stubbornella media and img dom structure FTW! major css deletion <3
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
Florian Staudacher
dc01515aac
a little too much copy&paste...
2012-02-18 18:59:52 +01: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
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
danielgrippi
535c39ae7b
fix jasmine
2012-02-09 18:21:51 -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
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
danielgrippi
8fb3ad710f
fix jasmine
2012-02-08 10:34:21 -08:00
Sarah Mei
7389b895d6
Fix #2799 - bullet points in a post that has 'read more'
2012-02-01 14:31:07 -08:00
Sarah Mei
38908396f5
Fix stream view spec to look for different things on FF and on webkit. Sigh.
2012-01-29 00:09:56 -08:00
Sarah Mei
0e242c3e0a
Fix one spec on FF; pendingify the other until I can figure out what's going on. Seems to be different behavior of the expander plugin across chrome and FF.
2012-01-28 23:35:26 -08:00
Sarah Mei
1f710232d8
Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766
2012-01-28 22:29:43 -08:00
danielgrippi
f250b79105
post owners can now delete any comments on their own posts. fixes #2652
2012-01-27 18:24:46 -08:00
danielgrippi
410f2d436f
fix jasmine
2012-01-27 16:09:45 -08:00
danielgrippi
a3d596a853
DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests.
2012-01-26 18:51:02 -08:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Jonne Haß
6f283632c5
fix resharing a reshare, javascript isn't ruby :P
2012-01-24 19:44:45 +01:00
Jonne Haß
51d1bbbd70
app.user returns false instead of undefined if logged out, fix #2723
2012-01-24 11:56:48 +01:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
danielgrippi
3a76490640
window.app.user() doesn't return attributes nested in a key; added a comment_view spec
2012-01-22 23:37:13 -08:00
danielgrippi
5d15c53f6b
Revert "Revert "now using handlebars for client side templates" for now"
...
This reverts commit 5f9c469b12
2012-01-22 22:01:57 -08:00
