Raphael
|
36781481bb
|
Pulling in changes from master
|
2011-01-17 11:41:15 -08:00 |
|
danielvincent
|
e2fdad02f1
|
css fixes, incl. timeago style fix on stream_element
|
2011-01-14 22:12:31 -08:00 |
|
zhitomirskiyi
|
a00fbb1717
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-14 16:11:37 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -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
|
a0489112b7
|
made show page times smaller
|
2011-01-14 10:21:38 -08:00 |
|
maxwell
|
f509367a40
|
fix the 404 page to show the dun goofed guy
|
2011-01-13 17:31:18 -08: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
|
8c0a8c6af8
|
increase header zindex so things don't fly over it
|
2011-01-13 13:31:43 -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 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08: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 |
|
Alec Leamas
|
1e3d70f98b
|
Add public/well-known dir for the moment.
|
2011-01-10 20:47:20 +01: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
|
cadba3f2b7
|
fixed specs with a reload. added header gradient for firefox
|
2011-01-08 13:11:55 -08:00 |
|
danielvincent
|
c5e0c616b5
|
share with pane styles fixed
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
98ceb1ca6b
|
fixups on people/show. make photos scroll over header on show pages.
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
c74dc120df
|
fixed all cucumber tests
|
2011-01-08 13:11:54 -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
|
2e472ded94
|
new notification/request text on aspects/index
|
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
|
3ff4b67ff0
|
touched up stream_element and comment partial
|
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
|
e1b6f4f074
|
aspect filters shown selected on photo and statusmessage show pages
|
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
|
b029475421
|
aspects now have edit pages accessible through the top nav
|
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 |
|