Commit graph

11825 commits

Author SHA1 Message Date
Maxwell Salzberg
dd2e62fc51 Merge pull request #3217 from liamnic/fix-admin-translation
Fix 'go' Admin Translation (Fixes #3212)[ci skip]
2012-05-03 12:58:10 -07:00
Liam Nicholson
01c51d26f5 Fix 'go' Admin Translation 2012-05-03 20:24:25 +01:00
Jonne Haß
5b7342bb8e updated 34 locale files [ci skip] 2012-05-03 12:12:12 +02:00
danielgrippi
ad593fea6c single instead of double quotes [ci skip] 2012-05-03 00:40:54 -07:00
danielgrippi
a52d8f221a don't post to feed; post to joindiaspora OG tag. also, whoever has the diaspora OG tag, can i haz? 2012-05-03 00:02:00 -07:00
danielgrippi
8cecedc53b TIMELINE TIME. 2012-05-02 23:28:56 -07:00
danielgrippi
bec7b96de7 add more og markup; send over large image re FB's request 2012-05-02 22:50:57 -07:00
danielgrippi
73c91463f9 new publisher if person is admin as well 2012-05-02 22:07:51 -07:00
danielgrippi
2d3edbf74f pulsate control to add new post if no posts present 2012-05-02 22:05:40 -07:00
danielgrippi
bc81c6985a hover state on info in profile [ci skip] 2012-05-02 21:06:55 -07:00
danielgrippi
1b92fe7e7f use zoom-in / zoom-out cursors to signify favoriting [ci skip] 2012-05-02 21:02:10 -07:00
danielgrippi
ab99154a1a add FeatureFlagger to HomeController instead of making calls to Role directly 2012-05-02 20:41:01 -07:00
Jonne Haß
0ed7fd53cf Change IRC link in Readme to the wiki page [ci skip] 2012-05-02 23:09:39 +03:00
Maxwell Salzberg
ef657f53b8 new publisher if is you are beta, not just admin 2012-05-02 11:24:03 -07:00
danielgrippi
f263d0309d spelling error. running cukes are important. 2012-05-01 18:27:24 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked)
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
2012-05-01 18:02:25 -07:00
Sean Tilley
b3e3f98145 Merge pull request #3209 from movilla/69
I think possibly "https://github.com/diaspora/diaspora/issues" better than "http://bugs.joindiaspora.com/" [ci skip]
2012-05-01 15:17:47 -07:00
Florian Staudacher
d31ea8f2bd use back-to-top initializer, fixes #2840 2012-05-02 00:03:07 +02:00
movilla
006742cf04 I think possibly "https://github.com/diaspora/diaspora/issues" better than "http://bugs.joindiaspora.com/" 2012-05-01 23:49:57 +03:00
Jonne Haß
72124bebc6 Merge pull request #3208 from movilla/69
Little traslation "HOME" /post
2012-05-01 08:52:24 -07:00
movilla
4d3ba4f274 Little traslation "HOME" /post 2012-05-01 17:43:51 +02:00
Sean Tilley
d15c7267c2 Merge pull request #3206 from movilla/reshare-flash
Fix url "/logo_caps.png" mails [ci skip]
2012-04-30 14:21:43 -07:00
movilla
bdc479636f Fix url "/logo_caps.png" 2012-04-30 18:29:26 +03:00
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