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

846 commits

Author SHA1 Message Date
Raphael
7049cb3ca4 A less efficient, but simpler way of checking whether the photo is the profile photo 2010-09-22 10:31:40 -07:00
ilya
d26e7850ac RS, IZ; removed url from user and views 2010-09-21 15:52:26 -07:00
danielvincent
0a99b82bd3 Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-21 13:40:17 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
ilya
1882509a0b removed the auto_link seems to fix HTML injection, no more autolinking 2010-09-21 11:59:04 -07:00
danielvincent
4d200fea87 removed view all link from status_message#show 2010-09-20 20:17:18 -07:00
Raphael
441f75203a Add autolink and sanitize to show page 2010-09-20 17:33:05 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
maxwell
24ca139241 MS remove some stray puts 2010-09-20 17:11:07 -07:00
maxwell
e2fc48c9ff MS being slightly more proper with application helper, and fixing the person search page 2010-09-20 16:44:35 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
Arnaud Delcasse
eeb132d825 Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results. 2010-09-21 03:20:06 +08:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
maxwell
64d371d9d6 MS added a warning for account 2010-09-20 11:30:08 -07:00
Ariel Zavala
db7ad16503 Added localization to comments views 2010-09-21 02:03:51 +08:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
danielvincent
14ad24ba7e visual tweaks on header. moved upload a file button to header on album#show 2010-09-19 14:27:20 -07:00
danielvincent
b40b81e447 aspect manage tab now reads 'manage aspects' 2010-09-19 10:11:41 -07:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39 description text for all boxes in manage page. search box text defaults to query on people#index. 2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
mishudark
c46ad0d7fa photo description with ajax request 2010-09-18 12:33:22 -05:00
mishudark
b7bc4b8615 prevent next prev when youre add writting 2010-09-18 04:14:44 -05:00
mishudark
910bd71c78 prevent photho redirect next,prev if textarea has focus 2010-09-18 03:32:37 -05:00
Ariel Zavala
58c2d0dd28 merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two) 2010-09-18 02:21:45 -04:00
Don Park
2d16289e46 use photos_path to generate the correct POST destination for photo uploads 2010-09-18 07:50:12 +08:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Ariel Zavala
271925a7f6 added photo view translations 2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d Added people views translations 2010-09-17 11:27:08 -04:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57 DG IZ; dropzones on left back on aspect manage page. 2010-09-16 17:22:42 -07:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9 Added localization to status message views 2010-09-16 15:47:12 -04:00
Ariel Zavala
ec9affb849 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:14:38 -04:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Ariel Zavala
5078830785 Added localization to comments views 2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
d2f5d3c4c1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 17:05:36 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
3681ae62c7 remove google analytics 2010-09-15 16:43:38 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
55c1530c9f MS DG fixing an edit profile bug 2010-09-15 14:09:05 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
57bd052c5b user edit bug 2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
deac53f178 see yourself in aspect sidebar, because you're going to post to yourself anyway 2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
fe35d60b13 hack on aspect nav for ff & chrome compatability 2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474 fixed 500 error with @photos 2010-09-15 11:24:23 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065 moving things around for consistency. consistency isn't pretty right now. 2010-09-15 10:26:57 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Daniel Vincent Grippi
4a86632cf3 show default user photos for requests 2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8 profile photo doesn't change to null if not changed on profile update 2010-09-14 19:48:11 -07:00
ilya
8aa39c5f08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:58:55 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
be7c3f28a9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc spelling mistake, broken links on search page 2010-09-14 11:42:47 -07:00
ilya
cb12e497f6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:14:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01 DG RS; passing around params[:aspect]. querying in application controller for current aspect. 2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8 fixed photo show header 2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb minor visual tweaks 2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
fe57a698d3 minor cleanup on album flow 2010-09-13 19:54:30 -07:00
Daniel Vincent Grippi
aa5447f553 Albums are now created within a context 2010-09-13 19:39:51 -07:00
maxwell
15651a7bb6 IZ MS group manage page can now add friends to groups 2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
5ecbb28dc7 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144 albums don't show publisher, refactored css 2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
maxwell
650a502404 MS IZ removed a bunch of unused request stuff 2010-09-13 16:58:23 -07:00
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
maxwell
3b1223c9dd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:48:50 -07:00
maxwell
6f75a81a9d IZ MS trying again on fixing remote profile images 2010-09-13 15:48:30 -07:00
Daniel Vincent Grippi
48403996f0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:11:38 -07:00
Daniel Vincent Grippi
2fae1049d9 silent comments in all views except the layout and session wall 2010-09-13 15:11:14 -07:00
maxwell
a7231d041e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:09:20 -07:00
maxwell
c098be99bc MS IZ attempt one to fix remote profile images 2010-09-13 15:08:39 -07:00
Daniel Vincent Grippi
a87925b359 missing license on layout 2010-09-13 14:39:18 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
maxwell
0b33e6b3eb MS IZ album page is now not completely wonky, but still kind of pointless... 2010-09-13 14:23:38 -07:00
maxwell
24d957cb32 MS IZ removed the views and redirected the edit route 2010-09-13 12:20:47 -07:00
maxwell
27f1b29581 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:54:50 -07:00
maxwell
812f2550aa removed status message webfinger link 2010-09-13 11:52:47 -07:00
Daniel Vincent Grippi
6aeaea1b7d removed some things. also, comment buttons are now css-ified when they come through the socket 2010-09-13 11:42:41 -07:00
Raphael
1312728b88 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50 more cleanup 2010-09-13 11:05:10 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi
a74e00c159 removed hover user menu 2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
ilya
a738807cf4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 22:56:29 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
897074c869 replace in comment websocket action replaces one or more number instead of just the first 2010-09-12 22:33:51 -07:00
ilya
370e2ef688 not displaying requests in the remove 2010-09-12 21:31:03 -07:00
ilya
1e74acd9b0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 19:56:47 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
31df3cea11 friend pictures on group edit page should now display the default person image if friend's picture isn't present 2010-09-12 18:11:05 -07:00
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
danielvincent
85c268b5eb Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 11:12:04 -07:00
Raphael
fb33d955c9 Fix group show controller/view and haml error in nav 2010-08-24 11:11:25 -07:00
danielvincent
4ffb8e7fa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 11:07:56 -07:00
danielvincent
86146d195f moving stuff around to the header 2010-08-24 11:07:39 -07:00
Raphael
7ca9d1e791 Changed group_nav a little, deleted people_sidebar 2010-08-24 11:02:30 -07:00
danielvincent
562656e96a added edit link for group 2010-08-23 18:42:30 -07:00
danielvincent
2b125fdc66 fixed left friends bar a bit 2010-08-23 17:00:40 -07:00
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -07:00
Raphael
48959b3ded Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:45:20 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
danielvincent
fb7e945fc2 removed useless if/else 2010-08-23 14:19:16 -07:00
danielvincent
60b7c30a8a Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:17:26 -07:00
danielvincent
d874ba3b38 dropdown menu for user 2010-08-23 14:17:05 -07:00
Raphael
5a02f92448 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
Raphael
0092069372 Take signed in check out of websocket js 2010-08-23 11:57:29 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4 left/right arrow keys on photo show page go to prev/next 2010-08-23 11:22:55 -07:00
danielvincent
2355947d8e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 11:05:36 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
Raphael
dc1dd07720 Don't crash on requesting a non-existent email address 2010-08-23 11:04:57 -07:00
maxwell
361adda6cd added group picker. sends the right params, but posts only have one group right now so thats a bummer 2010-08-22 22:20:34 -07:00
danielvincent
36b2445a11 added title to search page 2010-08-19 13:41:48 -07:00
maxwell
35f6856380 MS search and index works 2010-08-19 12:40:50 -07:00
maxwell
756278f498 MS added friend search, and allow for autodiscover 2010-08-19 12:37:34 -07:00
maxwell
c98c52ad14 MS IZ renamed the array 2010-08-19 12:17:29 -07:00
maxwell
df435dc319 MS IZ made a reques form in the user index page 2010-08-19 11:59:58 -07:00
maxwell
af8448dd51 photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page 2010-08-19 10:20:43 -07:00
maxwell
84cc598017 MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page 2010-08-18 22:58:57 -07:00
Raphael
7ce8f94d58 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
36c06349c5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 20:59:18 -07:00
ilya
284601c6b1 got moved photo.image.stuff to photo.url[:stuff] 2010-08-18 20:59:01 -07:00