danielgrippi
aa4c554177
DG MS; added photos and more styling to the canvas view.
2012-04-21 13:12:57 -07:00
danielgrippi
32d8cfd48d
MS DG; basic style enumeration for profile
2012-04-21 13:12:57 -07:00
Dennis Collinson
f46dd08cb5
canvas view is infinite stream
2012-04-21 13:12:57 -07:00
Dennis Collinson
062de4c269
MDC DC New Profile shows users info
...
Profile show json
Profile backbone model
2012-04-21 13:12:56 -07:00
danielgrippi
f62b9f9698
wip.
2012-04-21 13:12:56 -07:00
Dennis Collinson
f7d320b622
MS DG; checkboxes are togglable, with tested css magick
2012-04-19 14:05:55 -07:00
danielgrippi
e379a6df0f
Merge branch 'master' into stream-for-photos
...
Conflicts:
app/assets/javascripts/app/views/stream_view.js
2012-04-18 18:30:54 -07:00
danielgrippi
a307b60dd2
DC DG extract infininte scroll to a mixin
2012-04-18 12:34:43 -07:00
Florian Staudacher
8eb70c8a80
use app.models.Stream instead of app.models.Photos,
...
change naming a bit to be more general since its posts+photos now
(re #3158 )
2012-04-18 20:20:56 +02:00
danielgrippi
3621576717
add/remove hidden class for pagination instead of manipulating HTML contents on every page load.
2012-04-18 10:27:22 -07:00
danielgrippi
3479cb7bdd
refactored stream and Stream View
...
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
2012-04-17 21:06:34 -07:00
danielgrippi
37cd6f616e
refactor stream fetching logic
2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f
change new publisher to public by default to make testing easier
2012-04-17 16:43:42 -07:00
Florian Staudacher
fe130caf10
moved non-ascii url markdown tests to text_formatter_spec, added test case + fix
2012-04-16 23:41:05 +02:00
Maxwell Salzberg
9f6ad65d73
update schema, views spec
2012-04-13 18:32:35 -07:00
Dennis Collinson
a0ea8c8542
Update aspects dropdown to say number of selected aspects
2012-04-13 17:49:49 -07:00
Dennis Collinson
9e50d0efb6
Newspaper theme selected by default, template picker object
2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88
Wallpaper frame selected when post has one photo
2012-04-12 11:56:27 -07:00
Dennis Collinson
d767410e6d
mentions are clickable in framer
2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f
can mention in new composer
2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec
Refactor composer and framer to user same layout
...
composer touchup; added controls to the bottom; centered input area; removed forms.Base view
Fix tests
2012-04-10 11:38:35 -07:00
Florian Staudacher
0bd4d63640
fix jasmine test for publisher textarea "resets height on close"
2012-04-06 22:24:13 +02:00
Maxwell Salzberg
9c9562d0fd
fix http urls with 3 slashes
2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d
DG DC; visual fixups
2012-04-04 18:59:19 -07:00
danielgrippi
6098890783
redirect to post show on create
2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff
framer has better styling
2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732
newspaper template WIP
2012-04-04 18:59:19 -07:00
Maxwell Salzberg
f5754d2b71
small fix for jasmie that works in chrome and ff
2012-04-03 17:26:13 -07:00
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
danielgrippi
e156947d0b
fix jasmine specs
2012-04-02 18:17:55 -07:00
Florian Staudacher
1709036764
fix jasmine unhappiness I introduced with #3088
2012-04-02 21:25:01 +02:00
Daniel Grippi
a45eed13d5
Merge pull request #3086 from Raven24/fix-publisher-height
...
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
2a4bc32eb5
make wallpaper-post spec pass
2012-04-01 17:43:33 +02:00
Florian Staudacher
0629f4fd9c
added tests for resetting height on close
2012-03-30 16:40:08 +02:00
Maxwell Salzberg
fe1c0d34d5
Merge pull request #3084 from Raven24/non-ascii-begone
...
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-30 00:29:34 +02:00
Dennis Collinson
59f7f504e8
Wallpaper Mood
2012-03-29 15:14:09 -07:00
Dennis Collinson
78a2ed28b9
User can select Night and Day Moods
...
headline method on post
extract headline and body from post, at first newline
Night Mood
2012-03-28 16:22:05 -07:00
Dennis Collinson
6288eff599
day mood for a post responds to content
...
extract creating a post with templates to a static post view method.
Legacy templates extracted, day view
day mood shows photos and has variable text size
2012-03-27 14:54:27 -07:00
Dennis Collinson
663abcb0aa
MS DC Pull out stream post logic into own class
2012-03-27 14:54:27 -07:00
Dennis Collinson
775eca0026
MS DC You can has choose a template
2012-03-27 14:52:53 -07:00
Dennis Collinson
11eb1eb7d8
MS DC fix tests
2012-03-27 14:52:53 -07:00
Dennis Collinson
e0b18f5d6c
MS DC template picker override
2012-03-27 14:52:52 -07:00
Dennis Collinson
358414371e
MS DC framer shows rudimentary version of post
2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2
MS DC Post framer process init
2012-03-27 14:52:52 -07:00
Dennis Collinson
60420f1061
DG DC form autosubmits on file field change
2012-03-27 14:52:51 -07:00
Dennis Collinson
426f0278f9
DG DC uploading a photo shows up in the stream
2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1
Select multiple aspects
2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246
MS DG; mentions work in new publisher
2012-03-27 14:52:50 -07:00
danielgrippi
fd0065598c
DG MS; posting to services now works, updated form serializer to handle array attributes.
2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8
DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services
2012-03-27 14:52:50 -07:00
Dennis Collinson
680e7f6637
select one aspect
2012-03-27 14:52:50 -07:00
Dennis Collinson
a3ecd32264
DG DC Change dropdown text on select
2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd
DC DGtoggle between public an private
2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06
DG DC OMG FORMZ
2012-03-27 14:52:50 -07:00
Dennis Collinson
bf4dabc4f4
MS DC posting from post/new werks
2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d
MS DC posts/new page init
2012-03-27 14:51:40 -07:00
Florian Staudacher
49801644cc
also handle images and links without sub-domain
2012-03-24 02:57:32 +01:00
Florian Staudacher
c5139c9a71
improve behaviour, add more tests
2012-03-24 01:51:41 +01:00
Florian Staudacher
b7b8a11551
fix #2665 - allow umlauts and other non-ascii characters in url
2012-03-24 00:10:36 +01:00
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
Dennis Collinson
5f9c469b12
Revert "now using handlebars for client side templates" for now
...
This reverts commit 4692055d8a
2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a
now using handlebars for client side templates
2012-01-22 16:59:44 -08:00
danielgrippi
c3b9bb9a9a
expanding likes works again
2012-01-21 18:55:07 -08:00
danielgrippi
9e3521396d
clear new comment on submit; include the newer autoexpander in jasmine
2012-01-20 21:58:07 -08:00
danielgrippi
25d0f0d87f
updated jquery autoResize; comment boxes now expand
2012-01-20 21:45:55 -08:00
danielgrippi
356494b78b
DG DC; $("window") doesn't actually work in the binding scenario
2012-01-19 17:16:58 -08:00
danielgrippi
c219cee97d
fix inf scroll issues in stream view
2012-01-19 17:01:45 -08:00
Dennis Collinson
9b1d64bb76
stream model has a posts collection
2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f
refactoring backbone urls
2012-01-18 19:08:36 -08:00
Dennis Collinson
9cde06a628
You can now like "reshares", stream is polymorphic
2012-01-17 17:22:56 -08:00
Dennis Collinson
66d71a217e
you should be able to reshare reshares again, first pass
2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802
TT MS; fix a bug when the mention string is not actually in the mentions
2012-01-16 15:59:40 -08:00
danielgrippi
8150d32b86
using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app
2012-01-15 18:28:58 -08:00
danielgrippi
177f608276
fix oembed issues in backbone land
2012-01-15 15:56:34 -08:00
danielgrippi
9d2b1e9415
actually clear photos from the publisher. also, i hate the photo uploader we're using.
2012-01-14 15:40:44 -08:00
Jonne Haß
5d0223601b
fallback to english pluralization rule if none is found
2012-01-14 21:26:01 +01:00
Dennis Collinson
dec3006b50
DH DC don't render feedback view on public posts
2012-01-12 17:47:03 -08:00
Dennis Collinson
7b1d7b8ac9
small refactor
2012-01-12 17:47:02 -08:00
danielgrippi
c11fdb0459
put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]
2012-01-08 23:43:17 -08:00
danielgrippi
a1cf279226
support twitter hashbangs in urls for url parsing [ci skip]
2012-01-08 17:35:56 -08:00
danielgrippi
5e65c88bd8
better regex for capturing urls (sensitive to urls in tags) [ci skip]
2012-01-08 17:06:25 -08:00
danielgrippi
b5dea63774
larger buffer for autoscroll
2012-01-07 21:25:02 -08:00
danielgrippi
a899e71ce5
switch order of auto-linking
2012-01-07 21:19:13 -08:00
danielgrippi
ad2e6a414f
autolink urls in content view
2012-01-07 20:47:30 -08:00
danielgrippi
c9c7cff479
don't fetch more posts from the stream if only one post has been returned
2012-01-07 19:59:33 -08:00
danielgrippi
e928cc805a
fixed markdown issues with reshares; removed puts from specs
2012-01-07 17:33:16 -08:00
Dennis Collinson
8fa6c46de2
DG DC more hashtag fixes, throw in mention clearing cowboy style
2012-01-07 14:24:28 -08:00
Dennis Collinson
daba42c857
mentions now render client side, wow
2012-01-07 14:24:28 -08:00
Dennis Collinson
b13e72bc00
spec fix for markdown
2012-01-07 14:24:28 -08:00
danielgrippi
0fb1bf5d4b
hash tags are linked on the front end, adding markdown.js file
2012-01-07 14:24:27 -08:00
danielgrippi
fd6e3bae62
move timeago and tooltip logic to the base View
2012-01-07 14:24:27 -08:00
danielgrippi
d2807b5202
markdown for posts on front end, tags broken
2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c
remove unusued javascript files; GC clearing from application/vanna controller
2012-01-07 14:24:27 -08:00
danielgrippi
24950bd364
restored ability to 'unlike'
2012-01-07 14:23:28 -08:00
danielgrippi
f72edbc039
added notification and unread mesasge count back to the header
2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c
added translations to templates; mock out the locale file in jasmine
2012-01-07 14:23:28 -08:00
danielgrippi
a92401f157
prevent further pagination if user has fetched all posts for a given stream
2012-01-07 14:23:28 -08:00
Dennis Collinson
d5e9c5eebc
DG DC add stream faces to page party
2012-01-07 14:23:28 -08:00
Dennis Collinson
b582f45452
green jasmine, yo
2012-01-07 14:23:28 -08:00
Dennis Collinson
9d24b518f5
DC DG; correctly populate the stream jasmine fixture
2012-01-07 14:23:28 -08:00
danielgrippi
dbfb18e249
display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber
2012-01-07 14:23:27 -08:00
danielgrippi
85b5974fa9
removed top-level element delcarations from app templates
2012-01-07 14:23:27 -08:00
danielgrippi
64a90a30ef
only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream
2012-01-07 14:23:27 -08:00
danielgrippi
71bae10317
fixed notification specs; removed a cuke around reshares already tested in jasmine
2012-01-07 14:23:27 -08:00
danielgrippi
3268726a9a
added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh)
2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68
modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine
2012-01-07 14:23:26 -08:00
danielgrippi
0a4b4fb344
remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher
2012-01-07 14:23:26 -08:00
danielgrippi
02ca7a32f0
added reshare logic back (doesn't append it to the stream...)
2012-01-07 14:23:25 -08:00
danielgrippi
027bb3dee7
removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view
2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03
created publisher view; wip
2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22
downcase namespacing of app
2012-01-07 14:23:25 -08:00
Dennis Collinson
f5609f2182
App views base renders subviews like magic
2012-01-07 14:23:24 -08:00
danielgrippi
31d24c60c7
added spec for .like_action link being rendered; added comments div back to stream_element for now
2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465
DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green
2012-01-07 14:23:24 -08:00
danielgrippi
67e56dce2c
backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget
2012-01-07 14:23:23 -08:00
danielgrippi
c6e4172926
fixed likes_controller; half of the failing jasmine tests
2012-01-07 14:23:23 -08:00
Dennis Collinson
a7627fabea
pulling more view logic into superclass
2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb
don't use Diaspora widget system or stream.js when backbone is active;
...
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85
added more jasmine spec; NSFW wip
2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e
reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again
2012-01-07 14:23:22 -08:00
danielgrippi
34e3403e2e
jasmine green again; template switching in place, defaulting to displaying post text
2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe
make jasmine view tests work, load templates, party
2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240
DC DG; test stream view WIP
2012-01-07 14:23:21 -08:00
danielgrippi
1d178116e9
DC DG; jasmine green
2012-01-07 14:23:21 -08:00
