Commit graph

11852 commits

Author SHA1 Message Date
danielgrippi
b3a5b8a369 only segment by beta / non-beta [ci skip] 2012-04-29 13:19:07 -07:00
danielgrippi
2acc52375d small css tweak with info shade box shadow grossness [ci skip] 2012-04-29 11:58:23 -07:00
danielgrippi
d2c996006f forgot to add _setCustomVar param to _gaq. doh. [ci skip] 2012-04-29 11:57:52 -07:00
danielgrippi
c06e8b3329 track anonomous user segments via analytics (let's see how successful the beta channel features are) 2012-04-29 11:37:05 -07:00
danielgrippi
90919fa488 don't attempt to favorite with a save if you are not the post owner. in doing so, you will get logged out. also, update the gemfile.lock 2012-04-29 00:05:49 -07:00
danielgrippi
cfb52a7129 dg ms; little js cleanup [ci skip] 2012-04-28 23:52:54 -07:00
Sean Tilley
cf129b52ab Merge pull request #3197 from ktkaushik/my-modifications
optimizied code for destroy action under tag_followings_controller.rb [ci skip]
2012-04-28 21:27:47 -07:00
Sean Tilley
13a92a5f9c Merge pull request #3198 from ktkaushik/patch-2
Updated acts-as-taggable-on gem.
2012-04-28 21:11:00 -07:00
Maxwell Salzberg
a4bf4a40f2 slay reLayout suckage by reading 2012-04-28 17:58:53 -07:00
Maxwell Salzberg
fcc18fa776 use cover for background-image [ci skip] 2012-04-28 17:58:48 -07:00
Maxwell Salzberg
7ebf5380c6 addressable has a helper method for this 2012-04-28 17:58:46 -07:00
danielgrippi
1b6c33aff5 show a user's full profile info if she's on her own page. duh. 2012-04-28 17:41:22 -07:00
danielgrippi
d5f511c325 hitting profiles.json publically displays only public stuff; if you're connected to a user, it shows that user's complete profile response 2012-04-28 17:05:25 -07:00
danielgrippi
c3b0bbd425 show new profile pages for those who have it activated 2012-04-28 16:06:36 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
Jonne Haß
b3de5ccbbe Merge pull request #3202 from movilla/resha_ampa2
Translation popup "Reshare author's post?" /stream
2012-04-28 15:03:54 -07:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
danielgrippi
52efb3710c show a follow button for users with pre-existing contacts (legacy beta testers) 2012-04-28 14:13:43 -07:00
Kaushik
c7433d3f67 Updated acts-as-taggable-on gem. 2012-04-29 00:23:48 +05:30
danielgrippi
4dea64fe9f click entire white bar on post in profile to go to show page to make it easier to navigate (our icons are too small for my dumb mouse to click) [ci skip] 2012-04-28 11:52:11 -07:00
danielgrippi
accd507f36 logout button on your profile [ci skip] 2012-04-28 11:51:27 -07:00
danielgrippi
9a547b8161 follow links on profile page [ci skip] 2012-04-28 11:13:39 -07:00
danielgrippi
cf85f15fcc add padding around the composer box [ci skip] 2012-04-28 11:09:28 -07:00
danielgrippi
699b0cff16 don't expose follow/unfollow to a user in the UI
following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.
2012-04-28 11:07:18 -07:00
Florian Staudacher
462959fbcd Merge pull request #3190 from diaspora/reshare-flash
use flash message instead of just appending reshares to the current stream
2012-04-28 10:04:40 -07:00
Jonne Haß
008ed32e9e unambigousify community spotlight query in the multi stream, fix #3196 2012-04-28 12:28:07 +02:00
Kaushik Thirthappa
a1f25a475d optimizied code for destroy action for tags that a user is following. 2012-04-28 15:36:57 +05:30
danielgrippi
8d08f2604b added a follow button on others' profile pages [ci skip] 2012-04-27 20:59:44 -07:00
danielgrippi
92f72bdcbe remove duplicated home button on post show page [ci skip] 2012-04-27 20:48:36 -07:00
danielgrippi
7f4af0359f add bootstrap tooltips for great justice (and clarity) [ci skip] 2012-04-27 20:45:26 -07:00
danielgrippi
889b86f9cb implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved) 2012-04-27 19:38:06 -07:00
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
Maxwell Salzberg
6b115a7d22 update backgound-size declaration for skinny images 2012-04-27 16:19:13 -07:00
Maxwell Salzberg
62b604e4be Merge branch 'roles' 2012-04-27 16:15:07 -07:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can
also now add a beta role
2012-04-27 16:14:43 -07:00
danielgrippi
562e6641e1 fix jasmine 2012-04-27 16:02:44 -07:00
danielgrippi
7fafb0e3b2 DG RY; publisher css tweaks 2012-04-27 14:58:07 -07:00
Maxwell Salzberg
b138c91466 fix cucumber 2012-04-27 14:55:44 -07:00
Sean Tilley
f2bbbec49e Merge pull request #3192 from ktkaushik/patch-1
Updated readme. [ci skip]
2012-04-27 11:07:16 -07:00
Florian Staudacher
979eb66e44 added tests for flash messages on reshares 2012-04-27 19:23:30 +02:00
Jonne Haß
560da5ce98 Merge pull request #3193 from ktkaushik/better_pirate_translation
Modified Pirate Translation making it better.
2012-04-27 09:48:54 -07:00
Kaushik Thirthappa
1dae3d9f47 Modified Pirate Translation making it better. 2012-04-27 21:51:13 +05:30
Jonne Haß
9cb803831f improve webfinger failure handling
* do not raise if profile xrd isn't found
* error out on a ssl error rather than on the unexpected nil value later
* be more verbose about failed xrd fetches
2012-04-27 16:53:26 +02:00
Kaushik
9ab6bf1af5 Updated readme. 2012-04-27 16:28:24 +05:30
Maxwell Salzberg
0f15c3e0b0 add z-index to home button, and some small whitespace junk [ci skip] 2012-04-26 21:43:21 -07:00
Maxwell Salzberg
7309114136 adding magic to buttons on framer [ci skip] 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
fb4ad72378 composer is much cooler 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
c3ef944878 push publisher form box up [ci skip] 2012-04-26 20:30:17 -07:00
danielgrippi
c413a494d7 retina-ify icons; fix 404 scrolling issue; serif -> san-serif in some style [ci skip] 2012-04-26 20:25:25 -07:00
danielgrippi
e55b305bca better 404 page. with kittens. 2012-04-26 19:52:41 -07:00