Commit graph

1455 commits

Author SHA1 Message Date
Raphael
f8d63052d4 Remove stream lives from ready block 2010-08-25 13:52:59 -07:00
Raphael
17636f4fd2 View modifications, refactored stream javascript to another file 2010-08-25 13:51:16 -07:00
Raphael
c3b75703ac Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 11:35:56 -07:00
Raphael
3121cf57d3 Refactored top nav haml, added non-functional gear link next to group 2010-08-25 11:35:50 -07:00
ilya
ea1c3e10ec forgotten to add the actual images 2010-08-25 10:19:13 -07:00
ilya
75d5f19a7d added photos to tom and korth 2010-08-25 10:17:31 -07:00
danielvincent
8497586547 linked group titles on group pages 2010-08-25 10:09:39 -07:00
danielvincent
90ce31173a fixed errors on album/photo pages 2010-08-25 09:59:18 -07:00
danielvincent
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
501f98b9e1 fixed comments from not showing. also, touched them up a bit. 2010-08-24 20:13:37 -07:00
danielvincent
d87f330369 added titles for columns in layout 2010-08-24 19:46:57 -07:00
Raphael
f9dd462957 Check for current user again 2010-08-24 19:32:38 -07:00
Raphael
174dbc069b Fix publisher checkboxes on index 2010-08-24 19:25:38 -07:00
Raphael
5ac5f58679 Tabs on the top aren't all selected on group select, some other view tweaks 2010-08-24 19:22:43 -07:00
Raphael
d3c10f8777 made left column in layout a little wider 2010-08-24 19:02:00 -07:00
Raphael
008c450f66 Add friend button resized 2010-08-24 18:52:50 -07:00
Raphael
5779610659 messed with the views 2010-08-24 18:31:16 -07:00
Raphael
559b6cd02f Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 17:43:35 -07:00
Raphael
1faaf1dd81 Fix profile pic getting unset on profile update 2010-08-24 17:43:11 -07:00
maxwell
326f17567e bad signature valid hack 2010-08-24 17:34:13 -07:00
Raphael
41aa8ed10e Specs pass again, need to make albums have a group 2010-08-24 17:12:27 -07:00
Raphael
f23a9d80b2 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 16:56:16 -07:00
Raphael
c102e81b03 put the visible back in 2010-08-24 16:56:04 -07:00
ilya
55c43b4498 grr, silly comma 2010-08-24 16:48:40 -07:00
ilya
35e2523b95 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 16:45:52 -07:00
ilya
b62d76bd66 going back to the old simple way of doing things 2010-08-24 16:45:38 -07:00
Raphael
7861fe5abc Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 16:39:42 -07:00
Raphael
3f5df61810 minor tab tweaks 2010-08-24 16:38:42 -07:00
ilya
385472351d not going through user.post 2010-08-24 16:25:12 -07:00
ilya
9db4838543 collecting the ids 2010-08-24 16:15:59 -07:00
ilya
0f04cad670 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 16:05:43 -07:00
ilya
f5ae090e9b posting empty albums to people 2010-08-24 16:05:29 -07:00
Raphael
ac48bf4d07 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:55:49 -07:00
Raphael
de3044fa0a Remove publisher selection remnants, fix posting 2010-08-24 15:55:35 -07:00
ilya
c0dc2c5047 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:54:19 -07:00
ilya
e65ce0e5c1 Mr. Clean! deploy even cleaner, no more silly way of doing things 2010-08-24 15:54:02 -07:00
Raphael
10bd40d1a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:49:04 -07:00
Raphael
abafa03e92 Spec for posting to no group 2010-08-24 15:48:51 -07:00
maxwell
ec3d902c36 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:48:02 -07:00
maxwell
204c910f66 MS fixing small bugs, adding a very dump list of a groups that a friend is in for you 2010-08-24 15:47:44 -07:00
ilya
f3f2eb5abf Made it green now making it clean 2010-08-24 15:43:53 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
ilya
45f3eb2a9a trying yet again 2010-08-24 15:37:55 -07:00
ilya
1aef262165 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:24:18 -07:00
ilya
82d140aa80 trying to redeploy to get photos working 2010-08-24 15:23:58 -07:00
maxwell
92a2df5c77 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 15:23:02 -07:00
maxwell
2a28607bc6 Moved some prod changes into master 2010-08-24 15:22:48 -07:00
ilya
19e2c8f898 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 14:48:41 -07:00
ilya
17080730f8 opening the file in the set photo 2010-08-24 14:48:26 -07:00
Raphael
143db96d7e No more socket debug 2010-08-24 14:45:50 -07:00