Dan Hansen
45444316cb
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-22 12:40:36 -06:00
Dan Hansen
b209fd0c2c
our spec would complain about the data of the ajax request not being there, move it into the callback instead
2011-01-22 12:40:20 -06:00
MrZYX
cadcc3e7c3
some browers (Firefox for example) have no pushState, so disable it for those for now
2011-01-22 16:43:34 +01:00
Dan Hansen
8619a2035c
green for the night
2011-01-22 01:16:52 -06:00
Dan Hansen
a3bc8932d4
fixes for the alert widget, widgets.init didn't execute correctly because of the context
2011-01-21 20:09:34 -06:00
Dan Hansen
c23811e1ab
flash the user whether or not that person was moved to a different aspect
2011-01-21 20:02:42 -06:00
zhitomirskiyi
01a4327c2b
use google API instead of highcharts due to licensing
2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da
use highcharts.js for stats
2011-01-21 12:19:05 -08:00
danielvincent
c5bf7b523f
use history.pushstate to preserve filters on page refresh
2011-01-21 11:11:00 -08:00
danielvincent
8af2fc7bcc
fix in calculating selected states on aspect filters
2011-01-21 01:16:34 -08:00
danielvincent
22d4083c8c
use history.pushstate to preserve filters on page refresh
2011-01-21 01:10:29 -08:00
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
lfortin
0393ac5a6f
more JS formatting
2010-12-19 00:15:00 -05:00
danielvincent
01e557ba7a
put ajax:success for publisher where it belongs
2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287
removed comment button from sight
2010-12-18 20:26:27 -08:00
danielvincent
7b4da22617
shift+enter for a newline, enter for submission. inversion of current implementation.
2010-12-18 18:49:10 -08:00
danielvincent
78a50756c6
publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn().
2010-12-18 18:28:00 -08:00
maxwell
bcca61af6b
infinate scroll
2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a
aspects streams now ajax
2010-12-17 19:41:42 -08:00
lfortin
77c102cce6
more JS formatting
2010-12-16 23:46:28 -05:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
Laurent
4515ba631f
some JS refactoring
2010-12-15 19:25:35 -05:00
zhitomirskiyi
1212b34706
fadeOut on delete
2010-12-15 11:58:38 -08:00
Raphael
02d76441e4
Merge branch 'aspect-list-on-profile'
2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7
Add aspect list to contact page
2010-12-13 15:58:08 -08:00
Mark Schmale
9a873aa760
added fix for Bug #695 to email-validation
2010-12-13 15:54:35 +01:00
Mark Schmale
d163875577
added email validation. The border of the input field becomes red if the input seems to be invalid.
2010-12-13 15:46:19 +01:00
Mark Schmale
f5038cdc3c
replaced charCode by keyCode. On every browser, keyCode is filled
...
with the Unicode Character Code when used in keypress.
charCode is only supported in some browsers.
2010-12-13 11:55:54 +01:00
Dan Hansen
02bb2fa19f
hide reshare menu if you click somewhere it's not
2010-12-12 01:38:28 -05:00
Dan Hansen
55b16b00f4
Firefox sends charCode 0 when backspace is pressed
2010-12-12 01:09:47 -05:00
danielvincent
52a3996ad0
textareas auto expand
2010-12-11 22:18:03 -08:00
Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
danielvincent
fa9caf00ca
added tooltip text to public icon
2010-12-08 19:07:08 -08:00
maxwell
5f1f28923f
fixed a comment counting bug, and the show_all_comments message when the comment count was three
2010-12-08 13:44:57 -08:00
maxwell
efee7682e2
aspect rename now works
2010-12-08 13:11:13 -08:00
danielvincent
b94e6ae4a0
shift+enter submits new messages/comments
2010-12-07 21:30:29 -08:00
OhaiBBQ
4bbbbf6bb1
tipsy on sidebar avatars
2010-12-05 09:44:10 +03:00
Sarah Mei
9da69a4b01
Mobile log in form is usable. Also, added mixins for sass.
2010-12-04 20:45:52 -08:00
OhaiBBQ
1b7749f282
typo on last commit
2010-12-05 06:21:06 +03:00
OhaiBBQ
05f54e0ebd
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-05 06:18:30 +03:00
OhaiBBQ
78ac693dcd
only tipsy on avatars in left_pane and manage_aspect_zone
2010-12-05 06:17:14 +03:00
sentientwaffle
b303cf6830
fixed issue with post deletion confirmation for the latest verison of jquery
2010-12-04 18:55:15 -08:00
maxwell
23eb192524
double the time that notifications are seen on the page
2010-12-04 17:45:52 -08:00
danielvincent
105c788bf8
fixed comment js. fadeToggle is only supported in jquery >= 1.4.4
2010-12-04 17:37:57 -08:00
danielvincent
948707ea23
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
2010-12-04 17:22:22 -08:00
danielvincent
4251a3a093
prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted
2010-12-04 17:02:29 -08:00
OhaiBBQ
c55a867f61
fix build, .remove is the callback, don't call it immediately
2010-12-05 00:26:10 +03:00
OhaiBBQ
ba23bd7a0a
Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs
2010-12-04 11:54:59 +03:00
danielvincent
7fdbc9015b
swapped new invitation lightbox for a proper page.
2010-12-03 00:57:53 -08:00
danielvincent
6c05d01177
enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.
2010-12-02 17:36:46 -08:00
