danielgrippi
d74942877f
touch up message inbox view
2011-07-06 00:38:25 -07:00
Raphael Sofaer
4a9900dff6
Fix some ui bugs on the post show page
2011-07-05 18:52:00 -07:00
danielgrippi
41be7a37b0
hide aspect dropdowns on tag show temporarily
2011-07-05 16:42:32 -07:00
danielgrippi
ecaf7974e3
removed fixed sidebar for tag following
2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5
Color the follow tag button
2011-07-05 15:03:26 -07:00
danielgrippi
632eacc51f
css fix on followed tags nav
2011-07-05 15:03:26 -07:00
danielgrippi
b2f580c39e
user dropdown height 100%
2011-07-05 14:24:30 -07:00
danielgrippi
ecd79766ce
remove aspect badges
2011-07-04 22:36:21 -07:00
Raphael Sofaer
162f035c62
Merge branch 'ajaxy-likes'
2011-07-04 22:12:12 -07:00
Raphael Sofaer
4f056dca8e
Ajax in likes in stream
2011-07-04 22:10:30 -07:00
danielgrippi
1aed8e7e16
testing fixing left nav on aspect/index
2011-07-04 21:55:04 -07:00
danielgrippi
d75a682199
compress png
2011-07-04 17:26:34 -07:00
danielgrippi
85d6eb70e7
fix cubbies info page (removed reference to token, changed infographic)
2011-07-04 16:14:05 -07:00
Dan Goldenberg
39ef006aef
Revert "Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever"
...
This reverts commit 3467c8d996 .
2011-07-04 13:33:36 -07:00
Dan Goldenberg
fa01b4f09d
Revert "Also replaced facebox loading GIF"
...
This reverts commit 2e10643d00 .
2011-07-04 13:33:02 -07:00
Dan Goldenberg
2e10643d00
Also replaced facebox loading GIF
2011-07-04 12:14:36 -07:00
Dan Goldenberg
3467c8d996
Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever
2011-07-04 12:00:14 -07:00
danielgrippi
403d18bac4
fixed content expander in comments; comments have a smaller limit than posts
2011-07-03 22:06:58 -07:00
Michael Sofaer
d2b7168195
Use an explicit per_page param instead of switching on format
2011-07-03 21:16:58 -07:00
danielgrippi
8a8f8db9ad
Merge branch 'notifications'
2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c
visual touchups, show loading gif right away
2011-07-02 17:53:07 -07:00
Dan Hansen
eb0fbe519c
remove read/unread state, always mark notifications as read, only return 5 notifications for json requests
2011-07-02 16:39:01 -07:00
danielgrippi
689bde2e5f
take out useless 'reshare'
2011-07-02 15:41:50 -07:00
Dan Hansen
0b56ade468
basic unread/read states
2011-07-02 15:14:02 -07:00
Dan Hansen
3941d562a8
clean up notifications-badge.js
2011-07-02 14:57:17 -07:00
Dan Hansen & Daniel Grippi
b48b182c73
STYLIN'
2011-07-02 00:04:14 -07:00
Dan Hansen
05688c2f43
notifications wip
2011-07-01 22:46:54 -07:00
danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab
added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index
2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a
More visual cleanup; top nav; edit aspects
2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e
Almost done with left-nav, added link to aspect edit facebox, colored share button
2011-07-01 14:22:38 -07:00
danielgrippi
cd9be3904b
publisher rework
2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a
minor visual changes, more or less. facebox headers are now white.
2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe
add contact images to aspect index, removed comment background color, add vertical rule to people pages
2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550
DG RS left nav almost there. touched up publisher, among other things
2011-07-01 10:49:19 -07:00
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