zhitomirskiyi
a00fbb1717
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-14 16:11:37 -08:00
maxwell
bc8821fdc5
Revert "some fixes for the alert widget"
...
This reverts commit 4e40c19342
2011-01-14 14:28:03 -08:00
Dan Hansen
4e40c19342
some fixes for the alert widget
2011-01-14 15:13:09 -06:00
Dan Hansen
8103e66ea3
didn't mean to commit some changes in aspect-edit.js
2011-01-14 14:57:26 -06:00
Dan Hansen
d4f30ded1b
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
2011-01-14 14:54:44 -06:00
zhitomirskiyi
aba03ed5b0
added the locales for timeago
2011-01-14 11:46:38 -08:00
Dan Hansen
4ccf51b3d3
fix real time aspect name changing
2011-01-14 13:29:55 -06:00
maxwell
f97a9fa017
added timeago jquery plugin. we now need to figure out a js translation scheme
2011-01-13 16:29:13 -08:00
maxwell
b4fae58f12
just say no to 404 facebox errors
2011-01-13 14:48:30 -08:00
maxwell
c002692657
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-13 09:45:56 -08:00
Dan Hansen
f807bc25d1
whitelist certain keyCodes, e.g. tab, fixes #795
2011-01-13 01:24:05 -06:00
Dan Hansen
ce4fe1938c
remove references to fancybox, we use facebox
2011-01-13 00:24:10 -06:00
Dan Hansen
61512ef7b0
youtube videos shove above comments and under the status -- i'm back\!
2011-01-12 23:05:20 -06:00
maxwell
c29ebdabba
pending photos now stick to the publisher when adding or removing aspects... the home page however is a full reload, and some weird things happen when you switch from home
2011-01-12 15:47:14 -08:00
maxwell
f8d524c983
fix infield labels not rebinding on stream filter, and changed padding to margin for the user badge so the bottom boder does not go over the new request message
2011-01-12 13:50:55 -08:00
danielvincent
f2f3059d72
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab
fixed all rspec/cucumber
2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b
fade in aspect badges on stream
2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7
swapped out delete text for 'x' on stream_elements. controls fade in on hover
2011-01-08 15:06:25 -08:00
danielvincent
9cf1f5a023
fixed reshare with filters
2011-01-08 13:11:55 -08:00
danielvincent
98bcad5c59
visual fixes on people/show. contact count on aspect filters. contact list searches again.
2011-01-08 13:11:54 -08:00
danielvincent
71ca93720b
contact lists functional on aspects/index. edit panes facebox in from header
2011-01-08 13:11:53 -08:00
danielvincent
c9307305b3
collapsed aspect_listing and contact_listing on aspects/index
2011-01-08 13:11:53 -08:00
danielvincent
f44b3cbe3d
contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge.
2011-01-08 13:11:53 -08:00
danielvincent
422f17a648
switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials.
2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a
aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder
2011-01-08 13:11:53 -08:00
danielvincent
14ca5e1cc1
stricter url fix in aspect-filters
2011-01-08 13:11:53 -08:00
danielvincent
0a07dd16b5
posts are properly socketed on filtered streams
2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd
fixed inf scroll on filters issue. one spec failing in AspectsController.
2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1
publisher retains text when filtering stream
2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2
publisher works through ajax filters
2011-01-08 13:11:52 -08:00
danielvincent
f02c13ee73
filters are now working in ajax. inf. scroll and publisher pending ajax.
2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e
header touchup
2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730
aspect filters now functional on aspects/index
2011-01-08 13:11:51 -08:00
danielvincent
6342dff96d
fixed enter js bug on comments. removed enter hotkey on publisher completely.
2011-01-07 15:53:39 -08:00
Raphael
429087ef83
Merge remote branch 'tomk/729-retain-input-on-failure'
2011-01-04 16:39:07 -08:00
danielvincent
055fbe3e00
stream is now a div. generalized some partial extentions for mobile site.
2011-01-01 23:09:18 -05:00
Sarah Mei
a1b92f5224
Merge javascript formatting changes.
2010-12-28 20:31:49 -08:00
Thomas R. Koll
06d80d0e57
Issue #729 : Failed posts and comments don't retain text
...
The forms were cleared on a submit event instead of a ajax:success
2010-12-28 23:46:34 +01:00
Nick van der Burgt
13b33ee864
Added ie.js file
2010-12-27 17:29:10 +01:00
danielvincent
0fb102a2ec
right/left arrow keys functional on photo#show
2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa
mark notifications as read and update badge
2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
2010-12-25 16:07:31 -05:00
Sarah Mei
de502bf67c
Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.
2010-12-24 18:39:20 -08:00
Sarah Mei
9c50f900ed
Merry Christmas! I got you someting green.
...
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
zhitomirskiyi
7796776135
vimeo works, does not yet fetch the title
2010-12-23 15:36:29 -08:00
danielvincent
7cb9760a1e
show comments toggle like fb
2010-12-21 16:56:32 -08:00
maxwell
533ff2fc39
improve selector for inf. scroll
2010-12-19 19:30:33 -08:00
maxwell
d5819e3c9e
fix the ajax-loader for scroll on non root page
2010-12-19 19:15:16 -08:00
danielvincent
bb0375d2f8
uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages.
2010-12-18 22:40:42 -08:00
