Maxwell Salzberg
56a7da530f
small js test fixes
2012-03-13 19:30:34 -07:00
Maxwell Salzberg
2a30e60fe0
Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly
2012-03-13 16:41:16 -07:00
Steven Fuchs
73fd96d439
this file should have never been added...
2012-03-10 14:21:13 -05:00
Maxwell Salzberg
0d5c518630
Merge pull request #2976 from jbivins/legacy-browser-support
...
Legacy browser support
2012-03-09 16:51:34 -08:00
Steven Fuchs
9de477cf5a
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f
jasmine spec for stimulating deferred searches
2012-03-07 23:19:51 -05:00
Steven Fuchs
ac8cd8368e
fixing conflicts in merge
2012-03-07 23:19:51 -05: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
danielgrippi
dc0b5db0ac
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
2012-02-24 20:14:26 -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
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
danielgrippi
2c0cfa53dc
don't show left-right nav when idle
2012-02-24 13:31:17 -08:00
danielgrippi
806487a5ff
namespace view folder with folders
2012-02-23 11:12:20 -08:00
danielgrippi
8f4fed8c0e
add participants to info pane on post viewer
2012-02-22 13:15:54 -08:00
Florian Staudacher
412853bfcc
make lightbox work for photos page (+tests)
2012-02-22 14:45:43 +01: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
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
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
Daniel Grippi
1638f32042
Merge pull request #2841 from Raven24/bookmarklet-specs
...
intentionally failing specs - dirty input breaks bookmarklet (+fix)
2012-02-13 21:14:56 -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
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
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
Florian Staudacher
d965016cf6
added intentionally failing specs, because dirty input breaks bookmarklet
...
see also #2741 #2751 #2800
2012-02-07 21:47:53 +01: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
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
Dennis Collective
6dbd644b01
Merge pull request #2719 from stwf/return-contact-popup-to-notify
...
aspects popup menu missing from 'started sharing' notifications
2012-02-03 00:42:10 -08:00
