nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16478 commits 4 branches 0 tags 121 MiB
Commit graph

1324 commits

Author SHA1 Message Date
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
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
7bcbd86cdf remove stray console.log 2012-01-20 01:21:13 -08:00
danielgrippi
b4e0483a18 fixed really nasty inf scroll bug (hotfix) 2012-01-20 01:20:41 -08:00
danielgrippi
b9c98b2b44 support shortened post routes in js router 2012-01-19 23:41:49 -08:00
danielgrippi
356494b78b DG DC; $("window") doesn't actually work in the binding scenario 2012-01-19 17:16:58 -08:00
danielgrippi
750e26e8fb Merge branch 'stream-js-cleanup' 
Conflicts:
	public/javascripts/app/models/stream.js
 2012-01-19 17:07:17 -08:00
danielgrippi
b583a7a444 Put dennis's changes back in 
Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd52.

Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0ebd4.
 2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
3fa2592728 fix a bug with client side validations and jquery cache thx 2 grippi for idea 2012-01-19 15:59:20 -08:00
Maxwell Salzberg
838da1fd52 Revert "refactoring backbone urls" 
This reverts commit 4ad58bdf2f.
 2012-01-19 14:20:31 -08:00
Maxwell Salzberg
2a69c0ebd4 revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection) 2012-01-19 11:18:13 -08:00
Jonne Haß
51851ea1f2 pass response into fetched event as expected 2012-01-19 15:57:11 +01:00
Maxwell Salzberg
aa449f3a2d a couple of additions to the branch 2012-01-19 13:33:05 +01:00
Florian Staudacher
ad5a17776f Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders 2012-01-19 13:29:35 +01: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
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -08:00
danielgrippi
880efd3e72 use '/reshare' instead of 'reshare/' to ensure the correct path (js) 2012-01-17 17:53:02 -08:00
danielgrippi
641ca9fdd2 we want to POST to /status_messages on Publisher submit 2012-01-17 17:46:49 -08:00
Dennis Collinson
9cde06a628 You can now like "reshares", stream is polymorphic 2012-01-17 17:22:56 -08:00
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
Florian Staudacher
81ae0c644c start using new placeholders on login page 2012-01-18 01:17:20 +01:00
Florian Staudacher
849db2f34b started moving from infieldlabel to (html5) placeholders 2012-01-18 01:15:12 +01:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -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ß
a07b742c85 remove old code from timeago widget 2012-01-14 23:58:34 +01:00
Jonne Haß
b382bdd3e3 load timeago 2012-01-14 23:29:28 +01:00
Jonne Haß
5d0223601b fallback to english pluralization rule if none is found 2012-01-14 21:26:01 +01:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Tray Torrance
ca07f5b9a3 Close #2606 and address other FF 3.x deficiencies. 2012-01-13 21:46:37 -08:00
Dennis Collinson
9b8afba9cf metaprogram template addition 2012-01-12 19:41:39 -08: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
Maxwell Salzberg
ee6fc18703 fix oembed specs by allowing ; in auto link on client side" 2012-01-12 17:25:01 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
danielgrippi
2243778c17 add services to be sent to the controller via the Publisher view [ci skip] 2012-01-10 11:36:11 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
Joe Bivins
cb18f204ef Fixes #2610 (attempt 2). 
Works-around the IE 9 login problem without modifying vendor/backbone.js.

Tested with IE 9.0.4.
 2012-01-10 01:59:42 -05: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
f09da04c8a add tooltips to stream faces [ci skip] 2012-01-08 17:43:58 -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
665517abfc use app.router.navagate for nav elements that don't expand (i.e. aspects, tags) 2012-01-08 14:41:43 -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
d5a4f9eb98 use content_view for comments (markdown, tagging) 2012-01-07 20:19:47 -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
36e13893a3 fix closes account feature 2012-01-07 14:57:44 -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
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
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
24950bd364 restored ability to 'unlike' 2012-01-07 14:23:28 -08:00
danielgrippi
ae5fb67f71 long text truncation 2012-01-07 14:23:28 -08:00
danielgrippi
ff82283b3c removed 'loaded' class from two views; we don't need to specify post_id explicitly with comment creation 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
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
31fac53969 added blocks js model; load app.models.Post before any other model when loading assets 2012-01-07 14:23:27 -08:00
danielgrippi
5e88ca846a remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs 2012-01-07 14:23:27 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23:27 -08:00
danielgrippi
1e20ca0cf5 remove old js files, specs; remove stream references in page js initializers 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
f804db36b8 DG DH; fix most of the cukes (7 failures left) 2012-01-07 14:23:26 -08:00
danielgrippi
1804b19ccc DG DH; dry-d up appending/prepending posts to the stream's collection 2012-01-07 14:23:26 -08:00
danielgrippi
bc0c92ec64 added inf. scroll to stream; passing inf. scroll cukes 2012-01-07 14:23:26 -08:00
danielgrippi
33e0de94f8 silently add a newly created Post to the stream's posts collection & fire stream.prependPost instead (this will make new posts show up top 2012-01-07 14:23:26 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
42276a73c8 remove old stream initialization from js pages; remove websocket js code 
from the layout; rename templates to have a .jst extension
(JavaScriptTemplate?)
 2012-01-07 14:23:26 -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
096efee929 better strategy for Diaspora.backboneEnabled (ATM) 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
505adbe07b aspect stream uses backbone; don't ajax in aspect selectors for now 2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03 created publisher view; wip 2012-01-07 14:23:25 -08:00
danielgrippi
b120faa4f9 took some functions out of stream-element widget; refactored Header view; refactored tooltip logic in Post view 2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22 downcase namespacing of app 2012-01-07 14:23:25 -08:00
danielgrippi
6ad4c8e348 loadMore -> render (Stream view); add #paginate div if not already present in addLoader 2012-01-07 14:23:25 -08:00
danielgrippi
79208e9073 CommentStream inherits from Base view; using subviews in Post view; be a little smarter about bindAll in Stream view 2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879 fixed 14 cukes (all comments features) 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
7c5e3cb415 switch like_stream to use backbone 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
828624f392 slightly fade in stream elements; made a better spinner for the stream (css3) 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
03aa7d9d5f remove duplicate declaration 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
6911ed5d7d expand comments working 2012-01-07 14:23:23 -08:00
danielgrippi
574eb7b12d removed App.Views.PostContent in lieu of StreamObject; moved some view logic to where it should be 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
b94b5240a8 added block user functionality to the stream 2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d remove js resposne for likes, do it in backbone with json responses instead 2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f added api response for likes; cleaned up view logic; specify like collection url from parent model (Post) 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
cd1d25dc30 remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts) 2012-01-07 14:23:22 -08:00
danielgrippi
dc82316f13 bind Twipsy in stream_element_view.js 2012-01-07 14:23:22 -08:00
danielgrippi
525fd3c4e4 make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function) 2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977 comment and post deletion now works on the backbone stream 2012-01-07 14:23:22 -08:00
danielgrippi
46b1567622 added loader gif when 'more' is clicked in stream; fixed nsfw positioning 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
e6d4ec2dc8 added as::photo view 2012-01-07 14:23:21 -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
f62b26fc73 put the frontend into its own folder; only use one routes file 2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e DH DG; create comments via backbone 2012-01-07 14:23:21 -08:00
danielgrippi
3f7d992a0b DH DG; added new routes for streams; fixed pagination 2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581 introduce comments 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
d4219799e4 namespace view, model, and collection under App 2012-01-07 14:23:20 -08:00
Daniel Grippi
dca3581ae2 added likes to the stream element underscore partial 2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad serialize current user json into body tag for now 2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0 DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now). 2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b backbone all the streams, besides user. don't use the acts_as_api way for now. 2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773 DG DH; pagination on backbone stream 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Steven Fuchs
95b553f953 notifications popup menu should use functions from regular notification object. 2011-12-23 23:01:18 -05:00
Steven Fuchs
02531337cb break actions into separate functions. Make css changes happen inside the completion functions 2011-12-23 23:00:16 -05:00
Steven Fuchs
1519cdd672 new parameter name and fix to notification badge css 2011-12-22 22:57:33 -05:00
Steven Fuchs
4d6f53401b makes sure that the large notification count badge on the notifications page gets incremented and decremented. Not the neatest solution since this code can be called from many pages, but shouldn't cause any problems in that case. 2011-12-22 15:57:59 -05:00
Steven Fuchs
b6dd14a968 clicking on notifications takes note of the current UI state and makes sure that the resulting 'read' state matches the users expectation. 2011-12-22 15:56:03 -05:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
Pistos
ae07b7c559 Publisher: Hook up same "after keypress" handler to "after mouse click", because the text can change without any keypresses (paste, etc.). 2011-11-10 11:38:39 -05:00
Pistos
5f73cdc67d Only show post deletion spinner when the AJAX call actually gets underway (i.e. not when the user cancels the deletion). 2011-11-10 00:50:43 -05:00
Jonne Hass
22dc8f44ef fixed notification counter increment via websocket 2011-11-09 17:26:16 +01:00
Sarah Mei
0f9e82eea1 Merge pull request #2358 from Pistos/issue-2353-ie-photo-zoom 
IE: Open images in a new tab, no lightbox
 2011-11-08 21:05:52 -08:00
Pistos
c592997fce Skip lightbox when clicking (non-cubbies) images in IE. Just open the image in a new tab. 
This is because the lightbox doesn't work in IE.
 2011-11-08 23:54:40 -05:00
Pistos
611aa339fc Don't use a dropdown for notifications in IE (because it doesn't render properly). Just go to notifications URL on click. 2011-11-08 22:25:51 -05:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
Jonne Hass
1d0109d4cb fix timeago widget 2011-11-07 16:33:38 +01:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Pistos
af82fb1600 Total hax, but this is better than the user menu completely not working. 2011-11-04 01:22:57 -04:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
danielgrippi
3118f7a019 up the timeout even more on search autocomplete 2011-10-31 18:55:35 -07:00
danielgrippi
3845010be6 double the delay for search 2011-10-31 17:36:20 -07:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)" 
This reverts commit 3d8f971ca9.
 2011-10-27 23:53:55 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
danielgrippi
c8fc9fcb76 fixed spinny location on getting_started 2011-10-27 18:03:09 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
Florian Staudacher
139cfcdd60 compacted the statement, since distinction now takes place elsewhere 2011-10-28 00:24:40 +02:00
Florian Staudacher
5cfb5b714b fixed issue #2260 - "Aspect dropdown od Publisher is broken" 2011-10-28 00:16:49 +02:00
danielgrippi
b879070744 avatars for likes 2011-10-26 23:50:01 -07:00
Maxwell Salzberg
302ef968bc move it to the right 2011-10-26 17:50:17 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
danielgrippi
1344931271 fix jammit error 2011-10-26 16:47:44 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Dan Hansen
091db3fd66 js i18n now accepts a count 2011-10-25 21:58:37 -05:00
Maxwell Salzberg
1a521a792a zomg text collapse is finally back #thankgod 2011-10-25 19:46:09 -07:00
danielgrippi
0033237b4e made flash messages awesome this time 2011-10-24 17:33:18 -07:00
danielgrippi
aec8ca5c5e remove diapsora ids from titles on small avatars; add twispys to contact sidebar 2011-10-24 15:04:58 -07:00
danielgrippi
923a73fb3a move publisher js to the right place 2011-10-24 14:11:35 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
bfd2d440d1 ajax form on the getting started 2011-10-24 14:11:34 -07:00
Dan Hansen
b92cb921c1 Publisher.bindAspectToggles() is called in Publisher.initialize(). only bind the events once 
jQuery objects containing the same elements don't evaluate as true. test that the elements within the jQuery objects are the same
 2011-10-23 21:30:54 -05:00
Dan Hansen
81fc5b28da remove embedder 2011-10-23 21:30:54 -05:00
Sarah Mei
06ad78f026 Fix some publisher specs - spelling errors and stray console.log 2011-10-23 19:09:20 -07:00
Gonzalo Rodriguez
178b7af946 When browser hits 404 for avatar image, fallback to default one. Fixes #2014. 2011-10-23 20:06:22 -02:00
John Edmonds
b482d16622 Merge branch 'master' into issue1144 2011-10-22 14:39:03 -04:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
Maxwell Salzberg
80a6a57992 live tipsys 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
danielgrippi
b61246c168 fixed all but two jasmine specs... 2011-10-17 16:54:18 -07:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo
12ddf00e16 Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text 
Issue 2136 wrong aspect button text
 2011-10-12 18:47:27 -07:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Gonzalo Rodriguez
27d9e7a8c6 Remove this, since selected aspects are now handled in the session hash 
Not only this code is unnecessary with the new way selected
aspects are stored, also on some edge cases could confuse the user
for example when having two tabs opened and hitting refresh in one
of them. Expecting selected aspects, but the "a_ids[]"-like url could
instead set the new group of selected aspects.
 2011-10-12 02:58:42 -02:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Gonzalo Rodriguez
6b5928ca09 Remember last selected aspects through the session 2011-10-09 02:24:53 -02:00
Gonzalo Rodriguez
583dd20249 Refactor selected aspects ui setup 2011-10-08 23:14:04 -02:00
Gonzalo Rodriguez
dc46a3f79c Always request aspects, not current location 
This becomes a problem when having this widget
instantiated looking at the followed_tags stream
With the former code de/selecting aspects was
only refreshing the followed_tags stream, not
loading aspect stream posts
 2011-10-08 00:45:05 -02:00
Gonzalo Rodriguez
e2e2bdf69c Select correct publisher textarea 
With previous css selector two textareas where
returned, causes reset of the post text when
selecting new aspects for the second time on
the left nav. Related to #2102
 2011-10-08 00:03:49 -02:00
Pistos
2d7a2c7e29 Reopen Publisher after changing Aspect selection if there is unsent text in the Publisher. 2011-10-07 15:54:34 -04:00
Gonzalo Rodriguez
54b1da4bec Remember selected aspects when refreshing the page. #2120 2011-10-07 03:23:45 -02:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Ilya Zhitomirskiy
3e2b30ec61 passing the server time to help intiate the infinite scrolling 2011-10-05 15:12:30 -07:00
Maxwell Salzberg
9cc7523f0e fix the time on the conversation view 2011-10-04 18:20:14 -07:00
Maxwell Salzberg
dfd65c4b4b prevent publisher on mentions and tags from crashing 2011-10-04 16:54:41 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
9672c27232 using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake 2011-10-02 12:27:14 -07:00
Gonzalo Rodriguez
389136eaf2 Show all aspects selected by default 2011-09-28 22:35:33 -03:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
7d662fcc92 move share button to top right corner 2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb expand/collapse comments with animation; added collapse link on bottom 2011-09-27 21:09:27 -07:00
danielgrippi
64113eb8f2 increment counter on comment add 2011-09-27 21:09:27 -07:00
danielgrippi
51c7e879de use deletage instead of live; bind where we don't need to delegate 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406 wip 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
d972802142 comment ajax on mobile. 2011-09-27 21:09:26 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00
Gonzalo Rodriguez
dc0c23da2f Slight enhacements on aspect-navigation widget 2011-09-27 03:09:48 -03:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07:00
John Edmonds
8a44b384c0 Add CSRF token to forms generated by fileuploader. 
Diaspora added an X-CSRF-Token header to XHR made by fileupload.
Since fileupload doesn't think Opera supports XHR, it builds a form and submits that instead.
By adding a hidden authenticity_token to the form, Opera can submit the form without logging the user out.
 2011-09-25 11:09:01 -04:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
Gonzalo Rodriguez
4f17dbf36e Reuse abortAjax function on aspectNavigation widget 2011-09-11 22:49:57 -03:00
Gonzalo Rodriguez
37c67c23cf Add aspectLis to aspectNavigation widget 2011-09-11 22:46:45 -03:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
6131d5d29d Merge branch 'master' into aspect_nav_rework 2011-09-08 01:54:49 -03:00
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07:00
Dan Hansen & Gonzalo Rodriguez
2057c8fcf1 Aspect navigation rework started.. 
ToDo:
  * Fix failing posts cuke, seems to be timing issue
  * Populate stream title when no aspects selected
  * All aspects selected by default?
 2011-09-05 02:02:07 -03:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Maxwell Salzberg
fd68915461 MS DH fix tag show page comments 2011-09-03 14:47:52 -07:00
Maxwell Salzberg
13ba4eb3b2 update jquery expander, but disable use until we flution to working with <p> tags 2011-09-03 13:03:00 -07:00
Maxwell Salzberg
722a2a86ea remove console.log; instantiate a page for jasmine tests 2011-09-03 12:21:09 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
vcuculo
9072de5096 fixed bookmarklet 2011-09-02 10:25:34 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
e6d1617268 added timeago to notifications page. @ohaibbq, this is getting annoying :P 2011-09-01 10:52:07 -07:00
maxwell
f5fbaaadcf added timeago and stream to the tag page 2011-08-31 21:54:14 -07:00
Dan Hansen
818af38bdf autoresize inputs 2011-08-31 17:13:24 -05:00
Maxwell Salzberg
197dcc1a61 Merge pull request #1856 from vcuculo/fix-search-user 
Previous fix for avatars doesnt work on FF
 2011-08-31 09:29:52 -07:00
vcuculo
5b0ce6b2a9 fix for mobile site 2011-08-31 14:11:51 +02:00
vcuculo
3832f24a02 previous fix for avatars doesnt work on FF 2011-08-31 09:25:39 +02:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Dan Hansen
3bed2ac834 only pass in the post's likes container to the likes widget, comments have likes widgets 2011-08-30 22:53:47 -05:00
Daniel Grippi
50e7d2a254 Merge pull request #1852 from vcuculo/fix-search-user 
fixed user search + avatar
 2011-08-30 20:44:55 -07:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
vcuculo
640408b166 fixed user search + avatar 2011-08-30 22:38:39 +02:00
Maxwell Salzberg
51ace97323 fix youtube embedding. camelCase is such a bummer 2011-08-30 11:55:51 -07:00
Andrej Kacian
e1cfd59dce Move bindings for post hiding/deleting effect from old stream.js to StreamElement 2011-08-30 01:18:51 +02:00
Andrej Kacian
4d666e3f5b Fix back-to-top scroller widget. 2011-08-29 22:50:28 +02:00
Gonzalo Rodriguez
5dcff46d0b Fixing expand likes ajax call that was broken. Related jasmine still red. 2011-08-29 04:06:55 -03:00
danielgrippi
b7f9400a9f Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking). 2011-08-28 22:04:06 -07:00
Andrej Kacian
f0b8114738 Show friendly timestamps when expanding all comments on a post. 2011-08-28 18:46:19 +02:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Sarah Mei
60c8a0d00b Use different mouse events to fix tag unfollow icon hovering 2011-08-27 21:54:05 -07:00
Dan Hansen
20b4304f23 fix cucumber failures 2011-08-26 15:32:13 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Andrej Kacian
2d45a4287f Fix tipsy tooltips in stream elements 2011-08-26 21:19:52 +02:00
Dan Hansen
07beb3c1fb add a basepage that is instantiated on all pages. remove meaningless pages 2011-08-26 12:30:28 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
vcuculo
d90f38bb38 fix live stream 2011-08-26 18:54:30 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Dan Hansen
121c0c97f8 optimize infinite scroll widget instantiation. don't instantiate timeago widgets for StreamElement and Comment widgets 2011-08-24 19:23:39 -05:00
Maxwell Salzberg & Sarah Mei
c1c622ff52 Viewing more comments rebinds javascript 2011-08-23 23:39:56 -07:00
Maxwell Salzberg & Sarah Mei
a7d05756db Infinite scroll now provokes stream refresh 2011-08-23 23:00:55 -07:00
Maxwell Salzberg
b7d6d511df pass in the class for signifing 'in aspects' 2011-08-23 13:58:05 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
3366aa62dc add a bunch of boilerplate js pages so the header works. would be great to get a baseclass, or some sort of 'run this on all pages' kinda thang 2011-08-23 10:52:37 -07:00
Dan Hansen
049efae1a6 instantiate StreamElement widget after a post has been added to the stream by a user. time to clean publisher.js up. gross. 2011-08-22 20:11:56 -05:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
bd3683d0d1 Fix selector in the hide undo click handler. 2011-08-22 01:15:43 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00