Commit graph

923 commits

Author SHA1 Message Date
zhitomirskiyi
d595a64169 new interface to send invitation WIP 2011-01-26 12:16:47 -08:00
zhitomirskiyi
b3467b5d17 pending specs for facebook inviter 2011-01-26 12:16:47 -08:00
zhitomirskiyi
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
maxwell
75f08f8cb9 limit results in people#show to 15 posts 2011-01-25 14:21:15 -08:00
maxwell
cef10c1228 added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css 2011-01-24 23:18:24 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -08:00
maxwell
1b3c58c2c2 Use a fake to not allocate an AR model for every reference to a person 2011-01-24 15:13:52 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Sarah Mei
46dcd07f39 Oops, debugging statement 2011-01-22 15:59:30 -08:00
zhitomirskiyi
ff375b71cb works need a middle stage 2011-01-22 13:48:25 -08:00
Dan Hansen
67100aa7bb fix the build 2011-01-22 00:39:53 -06:00
Dan Hansen
c23811e1ab flash the user whether or not that person was moved to a different aspect 2011-01-21 20:02:42 -06:00
zhitomirskiyi
01a4327c2b use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd getting rid of gruff and it's imagemagic deps. made graphs on stats pending. 2011-01-21 11:11:58 -08:00
zhitomirskiyi
46cb9dd346 before auth filter 2011-01-21 10:39:10 -08:00
zhitomirskiyi
56831cec63 stats WIP 2011-01-21 10:29:07 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
Raphael
88fa595d59 Move seed_aspects to after accept_invitation 2011-01-20 15:03:33 -08:00
maxwell
b21b0adca7 remove single user redirect 2011-01-20 15:02:46 -08:00
Raphael
4deec0cb38 Fix call to search in controller 2011-01-20 10:28:27 -08:00
Raphael
2c68bb0305 Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
Raphael
ad48f4796c Remove warning in aspectscontroller 2011-01-19 16:08:14 -08:00
maxwell
e7a065a521 make jobs have a base class, which will verify the activerecord connection before trying the job 2011-01-19 14:10:42 -08:00
maxwell
85b824babc Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 22:12:11 -08:00
maxwell
7a02a31440 fix invitations#new, and a post spec which was mongo specific 2011-01-18 22:11:58 -08:00
Raphael
3935d978ac Take some queries out of views 2011-01-18 19:11:01 -08:00
zhitomirskiyi
21bccedf9b notification eagerly load the target 2011-01-18 17:22:48 -08:00
zhitomirskiyi
5ac194911f Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 17:07:03 -08:00
zhitomirskiyi
e7a4c47f0a include target for notification 2011-01-18 17:06:54 -08:00
Raphael
38dd58315d typo 2011-01-18 17:04:22 -08:00
zhitomirskiyi
38a3193a61 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:58:04 -08:00
zhitomirskiyi
63590e2e7e restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives" 2011-01-18 16:57:34 -08:00
danielvincent
511a48adde fixed publicscontroller specs 2011-01-18 16:52:11 -08:00
Raphael
3b394c1c89 One more defualt scope out 2011-01-18 16:48:02 -08:00
Raphael
e6e2ba9cfb Take out default scopes 2011-01-18 16:46:52 -08:00
zhitomirskiyi
ef1b7644f3 got rid of more hash from 2011-01-18 16:38:31 -08:00
zhitomirskiyi
3e6a271ad8 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:22:03 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
85bae12a00 Query on guid, not id 2011-01-18 16:07:58 -08:00
Raphael
28b7302c9e Specify type again 2011-01-17 19:42:49 -08:00
Raphael
6474ca9540 display photos correctly 2011-01-17 19:34:33 -08:00
Raphael
8bd784e5ab Fix aspect edit 2011-01-17 17:36:36 -08:00
zhitomirskiyi
fc92779ddc redirect after contact destroy 2011-01-17 14:46:38 -08:00
Raphael
4ba58d8132 Simplify hashes_for_contacts 2011-01-17 14:23:50 -08:00
Raphael
6410355d71 Fix aspect edit page 2011-01-17 14:23:50 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
f509367a40 fix the 404 page to show the dun goofed guy 2011-01-13 17:31:18 -08:00