nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1843 commits 4 branches 0 tags 121 MiB
Commit graph

580 commits

Author SHA1 Message Date
Daniel Vincent Grippi
db5d000757 made a sticky request link on the bottom of every page 2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
1092c7b8d1 moved manage to be its own tab on right 2010-09-11 07:53:45 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -07:00
Raphael
b704704334 People index now works when there is a non-friend on the page 2010-09-10 16:49:09 -07:00
Raphael
c170726f6c Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-10 16:04:30 -07:00
Daniel Vincent Grippi
d3a8e27833 DG IZ; selector fix 2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
b4e3ea3937 another little fix 2010-09-10 15:33:16 -07:00
Daniel Vincent Grippi
9fd8cfcc99 DG IZ added the same structure as groups 2010-09-10 15:31:00 -07:00
Daniel Vincent Grippi
8afb590128 small fix 2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26 DG IZ; small fix 2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa DG IZ; requests bar added to group/edit 2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02 DG IZ; groups = relations. now you can rename groups in the manage relation page 2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
f70ade6705 DG IZ; moved info on the person show page 2010-09-10 13:52:12 -07:00
Raphael
522450c9d3 RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:19:34 -07:00
Raphael
d0de8b4988 Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-09 15:43:20 -07:00
Raphael
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d group header now has a page_title field. 2010-09-08 20:52:35 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00
maxwell
c3a1b36282 MS fixing this to be request host on the login page 2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
7072c633ec Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 19:39:42 -07:00
Raphael
061f9de668 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 17:35:39 -07:00
Raphael
91f2e2e6ae Add public key to webfinger profile 2010-09-08 17:35:18 -07:00
Daniel Vincent Grippi
ca780f3560 DG MS; hide debug info by default. also, made the text lighter. 2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163 DG MS; tweaking top nav and publisher. 2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81 DG MS; moved tabs around up top 2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9 DG MS; changed the gear on top nav to not be a tab 2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
5fd105c1dc DG MS; search now links user names if you're friends with them 2010-09-08 12:04:05 -07:00
Daniel Vincent Grippi
edae8f1e66 DG MS; fixed a view bug in user edit page. page also displays diaspora username . 2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Raphael
d25327d32d Add example to request partial 2010-09-08 11:07:49 -07:00
Raphael
91667c1990 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 10:59:17 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Daniel Vincent Grippi
1749a9c52d no console 2010-09-08 10:51:18 -07:00
Raphael
5fd1602731 Group batch edit is for all groups 2010-09-08 10:00:31 -07:00
Daniel Vincent Grippi
20d9334ce1 DG IZ; changed the photo uploader to drag and drop. now works in firefox. 2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi
41afd86fe7 DG IZ; fixed photos. 2010-09-07 12:03:43 -07:00
maxwell
6c33c2a463 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-07 00:55:02 -07:00
Daniel Vincent Grippi
39c366e2e9 group edit button up top. 2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi
48415b4de8 cleaned up group edit a little 2010-09-06 13:01:24 -07:00
maxwell
919d7d23c0 MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays 2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
7e909d4034 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-31 16:38:52 -07:00
Daniel Vincent Grippi
f9c2e0e76d moved publisher down.wn. header is now a dark grey instead of black. 2010-08-31 13:07:11 -07:00
ilya
12f7d16c0b Merge branch 'master' of github.com:diaspora/diaspora 2010-08-31 10:48:29 -07:00
ilya
98db03d36e the group edit resets the data started to reset the from id attr 2010-08-31 10:46:49 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7 controller cleanup: using respond_to and respond_with. 2010-08-29 22:49:13 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
Raphael
7b36ae7009 Move back link out of big_text 2010-08-27 12:28:39 -07:00
Raphael
7223d21721 Add singular move friend route, it must be eliminated later 2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90 Groups can now be batch edited 2010-08-27 12:23:20 -07:00
Raphael
f309299e22 Take out remove friend button on stranger, there should be an add friend 2010-08-27 10:26:03 -07:00
Raphael
e1d6c9ce03 fixing person show on stranger 2010-08-27 10:24:42 -07:00
Raphael
39380c3c06 check if you are friends before displaying group list 2010-08-27 10:22:58 -07:00
danielvincent
390bf24e14 Don't try to put yourself in any groups 2010-08-26 17:34:06 -07:00
danielvincent
81438678cd Refactored more photo js out to photos.js. That should be it for that refactor 2010-08-26 17:10:19 -07:00
danielvincent
81edef9b8a Fading out every form tag on photo upload was a bad idea 2010-08-26 17:00:45 -07:00
danielvincent
1d515e7b7e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 15:02:29 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -07:00
ilya
915144e08b size 30 by 30 2010-08-26 12:32:14 -07:00
ilya
df74020a16 small thumbnail 2010-08-26 12:27:10 -07:00
ilya
3554de48d8 trying image url 2010-08-26 12:24:53 -07:00
danielvincent
d2b471a58d Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 11:09:07 -07:00
danielvincent
39551a0162 fixed comments not showing for photos in stream 2010-08-26 11:08:03 -07:00
Raphael
19e8aa5c35 Refactored view js 2010-08-26 11:06:35 -07:00
maxwell
9b690b863a droping things 2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:20:37 -07:00
Raphael
ad67798004 User to_id on groups_with_post 2010-08-25 18:15:38 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
maxwell
b4174c664e you can now reassign a peson's group 2010-08-25 18:07:31 -07:00
Raphael
e714e0d457 Comment sets now pop open on receiving a new comment 2010-08-25 18:00:53 -07:00
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
3a91858bcf Don't alert 2010-08-25 16:47:11 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
maxwell
c9e64ae209 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 13:54:27 -07:00
maxwell
6a613c3304 addded the draggable javascript 2010-08-25 13:53:53 -07:00
Raphael
17636f4fd2 View modifications, refactored stream javascript to another file 2010-08-25 13:51:16 -07:00
Raphael
3121cf57d3 Refactored top nav haml, added non-functional gear link next to group 2010-08-25 11:35:50 -07:00
danielvincent
8497586547 linked group titles on group pages 2010-08-25 10:09:39 -07:00
danielvincent
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
d87f330369 added titles for columns in layout 2010-08-24 19:46:57 -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
c102e81b03 put the visible back in 2010-08-24 16:56:04 -07:00
Raphael
de3044fa0a Remove publisher selection remnants, fix posting 2010-08-24 15:55:35 -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
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
Raphael
03abd1ac21 Remove statuS MESsages new page. TaKE New OUt OF ROutes 2010-08-24 14:44:32 -07:00
Raphael
ef9cf8fc52 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 14:41:04 -07:00
maxwell
de335e7366 MS messed with the temporary group picker thing: whatever, it is less annoying 2010-08-24 14:37:47 -07:00
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly 
support multiple groups.
 2010-08-24 14:36:03 -07:00
maxwell
cc1f1e2f24 removed the plus button from the all people add a friend page 2010-08-24 14:16:54 -07:00
danielvincent
c3cf135a3f tabs on top 2010-08-24 11:33:20 -07:00