Ricardo
24e3617c66
correct reference to application config file
...
The page that is initially shown after starting diaspora for the first
time tells the administrator to customize ./config/app.yml.example,
which doesn't exist. The file is actually called
./config/application.yml.example.
2011-07-01 20:34:56 +08:00
danielgrippi
4e48db23f0
aspect dropdown shows name of aspect if contact is only in one; green
2011-06-30 12:18:41 -07:00
danielgrippi
b8ea8e9e75
start a conversation with an aspect from contact index page
2011-06-28 23:09:11 -07:00
danielgrippi
2c3e403bc0
muted the headers colors a bit, refined buttons
2011-06-28 21:09:15 -07:00
Raphael Sofaer
0eb31e3ba7
added jwt to the chubbies bundle, made the asterisk black
2011-06-28 17:52:38 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041
notifications tests pass
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f
Move some DB logic from helper to controller
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
bc874e92cd
close link for notifications ajax
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
cba7a1a577
timeago for ajax notifications
2011-06-27 19:51:35 -07:00
Dan Hansen & Maxwell Salzberg
37aeb2fa36
add CSS and refactor to new file
2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6
Handle multiple notification objects correctly
2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c
proof of concept for notifications overlay
2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
2011-06-27 18:58:29 -07:00
danielgrippi
00ffade884
sub menu for people only sharing with you on contacts page
2011-06-27 17:22:36 -07:00
danielgrippi
44b77c58a3
just have a remove from aspect icon when viewing an aspect in contacts index
2011-06-27 16:26:54 -07:00
danielgrippi
f9a23b8120
added inf scroll to contacts index page
2011-06-27 15:54:03 -07:00
danielgrippi
9e92230cf7
make contact listings more compact on contact index (we don't need to know their tags here)
2011-06-27 15:32:39 -07:00
danielgrippi
f839714646
added aspect filtering to contact index. fixed rspec
2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de
don't group by
2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f
sort contacts by last name on contacts page
2011-06-27 14:00:15 -07:00
danielgrippi
a2609f7dac
simple filter on contacts index page (my/all contacts)
2011-06-27 12:12:50 -07:00
Raphael Sofaer
137181e07f
Fix autoresizing after infscroll and aspect change, inflabels after aspect change
2011-06-26 20:09:21 -07:00
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254
nicer auth prompt. wip.
2011-06-23 12:40:47 -07:00
Raphael Sofaer
2276f2d4a6
Fix color of via link on mobile site
2011-06-22 18:51:35 -07:00
Raphael Sofaer
02739259b6
Don't hide the forgot password link
2011-06-22 13:19:54 -07:00
Raphael Sofaer
7fd86924ee
Fix pagination in AppsController
2011-06-09 16:23:15 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07:00
Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07:00
danielgrippi
b8a6bf9f51
trying something different on app show page. worth a shot.
2011-06-06 22:59:31 -07:00
Nahir Acosta
e2d2db202a
Added CSS3 rotation for Gecko (Firefox).
2011-06-03 19:55:43 -07:00
Maxwell Salzberg
d35970a0ab
make like font bigger
2011-06-03 17:50:48 -07:00
Maxwell Salzberg
de55a1cbb3
remove remember aspects feature
2011-06-03 17:35:27 -07:00
danielgrippi
01edfeee03
Chubbies now sends manifest data to create a client
2011-06-03 16:24:12 -07:00
Dan Hansen
bc465848c9
MS DH fixed like sizes, everywhere
2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63
fix status message show page and break out Post to it's own javascript widget
2011-06-02 17:45:45 -05:00
Dan Hansen
0f0c033c26
MS DH; add context to timeago events
2011-06-02 16:32:41 -05:00
Dan Hansen
7363bf3499
MS DH; update timeago if a timeago element on the page exists.
2011-06-02 12:09:06 -05:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Raphael Sofaer
0770d6e8fd
Most of the stream.js stuff needs to be live, unfortunately.
2011-05-31 16:00:57 -07:00
Raphael Sofaer
62977e1d15
Don't initialize the stream if there is no stream.
2011-05-31 15:18:59 -07:00
Raphael Sofaer
203e05bf3a
Remove console.logs
2011-05-31 14:32:07 -07:00
Dan Hansen
b1bbfbac32
Merge branch 'master' of github.com:diaspora/diaspora
2011-05-31 15:52:59 -05:00
Dan Hansen
0edc160007
Clean up stream.js, make the comments step selector more sane
2011-05-31 15:52:17 -05:00
Sebastian
d9f23b5e2a
fixed #1018 - aspects width on /aspects/manage
2011-05-31 18:29:24 +02:00
Nicolas Berens
c9417ec93f
optimized images (safes a few bits and makes pagespeed shut the fuck up )
2011-05-31 17:34:22 +02:00
Raphael Sofaer
cfd077a90d
Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec
2011-05-28 20:37:12 -07:00
Raphael Sofaer
503de3efe1
Fix facebox close button and loading gif
2011-05-28 18:18:22 -07:00
MrZYX
406622eeed
prevent timing issue when autosuggest is too slow
2011-05-25 13:32:11 +02:00