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

1278 commits

Author SHA1 Message Date
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
Raphael
f44b02e22c Clean up people/person 2010-11-30 13:07:02 -08:00
Raphael
fce428826c Try to take photos query out of views 2010-11-29 23:41:03 -08:00
Raphael
03e3c3a202 Render comment partial with collection option 2010-11-29 17:50:30 -08:00
Raphael
ec6f42eaf0 Take JS out of landing page 2010-11-28 16:47:41 -08:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
5041a84882 Fix immediate response on status_message create 2010-11-28 00:23:53 -05:00
Raphael
5b29cff56a Take out comment rendering logging 2010-11-27 23:46:13 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
maxwell
62b4e85b0b DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist 2010-11-27 16:20:46 -05:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
77d46b2d66 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:09:38 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
danielvincent
bf66be9ea4 fixed template error on statusmessage controller 2010-11-26 13:29:49 -05:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
danielvincent
e56df5c159 fixed issue rendering partial for a comment in comments#create 2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd Make the getting_started aspects page more like the manage page 2010-11-25 23:17:27 -05:00
Raphael
6e14018abb Fixing http referer 2010-11-25 19:50:14 -05:00
zhitomirskiyi
037f822287 removed the puts 2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b if you create an aspect from the aspect manage page it redirects back there 2010-11-25 19:37:05 -05:00
zhitomirskiyi
a2d3a940a6 removed the puts 2010-11-25 16:20:09 -08:00
zhitomirskiyi
de75617070 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:19:30 -08:00
zhitomirskiyi
16d023e800 if you create an aspect from the aspect manage page it redirects back there 2010-11-25 16:18:39 -08:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Sarah Mei
fa602cabf2 fix messaging around invitation success/failure 2010-11-24 09:34:05 -08:00
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -08:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
maxwell
52b02176db invited users seed aspects 2010-11-23 11:07:33 -08:00
MrZYX
ed3dc10f79 various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit 2010-11-23 14:02:13 +01:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
maxwell
f4ff48f5c0 commenting out mobile for now. photos now post from only a users photos 2010-11-22 10:26:00 -08:00
danielvincent
55952d00c0 fixed failing photoscontroller spec. 2010-11-21 22:58:24 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
maxwell
c4a270ef8b putting mobile interface back in so we can get it cleaned up 2010-11-21 17:14:43 -08:00
danielvincent
069b372c19 photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http. 2010-11-21 16:30:47 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
ea7bdfde28 fix validation and order of status message sent 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812 MS DG form now works reasonably well. still need to limit number of photos 2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e added photos to status messages 2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
Raphael
37a694ed1f Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects 2010-11-17 18:49:03 -08:00
Raphael
5e269edb5a Adding logging to webfinger in people_controller 2010-11-17 15:56:39 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d Add logging statements, rescue callbacks in em-webfinger 2010-11-17 13:55:58 -08:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
MrZYX
ca72bb40a6 refactored en.yml 
removed unused keys out of en.yml
replaced some ' with "
 2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
7d6be51cfb making photos#show be in no aspect 2010-11-08 17:53:47 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Raphael
8023b6f344 Check for birthday before putting in birthday paramaters 2010-11-05 18:32:18 -07:00
maxwell
4a39d1a516 date now has a default nil value 2010-11-05 17:38:51 -07:00
maxwell
4300b20c34 cleaned up profile page a bit more 2010-11-05 14:28:39 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
b4679c9041 Take application_controller before filters out of publicscontroller 2010-11-04 15:33:16 -07:00
zhitomirskiyi
ea0f0fbdc5 add moved dev controller to use the user post api 2010-11-04 15:07:24 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
zhitomirskiyi
7771219a0a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 13:16:57 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
danielvincent
3e001c74d6 Albums#index hidden from views. Photos must be accessed through a person. 2010-11-03 12:21:14 -07:00
Raphael
c8a8849518 Move to build_post and dispatch_post in most controllers 2010-11-03 09:30:41 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -07:00
danielvincent
da8124f8a7 hcard has searchable field, and is taken in to account when building Person from webfinger 2010-11-02 16:12:43 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
Raphael
7fdd0475ae robustdj's specs now green 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
377cae8cba Merge remote branch 'ed0h/i18n-fallbacks' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:57:43 -07:00
Raphael
488df6eaa0 RS IZ a good test to overwrite ids 2010-11-01 11:35:37 -07:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
zhitomirskiyi
c86a3eb608 moved getting started logic to the controller 2010-10-31 19:33:11 -07:00
Sarah Mei
ce213513eb PeopleController#update handles getting an empty string for :image 2010-10-31 17:49:47 -07:00
livefromthemoon@gmail.com
cf82a0a9c8 Better to set the default locale in an initializer than in a before_filter 2010-10-31 22:39:54 +01:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
danielvincent
7acc138a21 resolved issue regarding profile images referenced at https:// locations. 2010-10-29 14:56:41 -07:00
danielvincent
6eb50ea934 profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so. 2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad photo uploader on edit profile page. 2010-10-29 14:11:59 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
6d139ab946 more tests pass 2010-10-29 11:17:39 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
fddec49655 adding nexttick 2010-10-29 11:15:14 -07:00
zhitomirskiyi
8b3a9cd801 adding some zombie friend puts 2010-10-29 11:15:14 -07:00
maxwell
dae9f6540b adding case for error message being emmited 2010-10-29 11:14:28 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
0aae89aa03 adding case for error message being emmited 2010-10-29 11:06:31 -07:00
maxwell
c645e2aff9 removing double fetch in dev utils controller 2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
4776f4810e fixed failing spec for photos_controller#edit 2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3 user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show 2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
Sarah Mei
14fedf5369 GAHHH STOP EMAILING ME (specs pass) 
Also, added attr_protected to Photo#person and Photo#person_id.
 2010-10-29 00:59:26 -07:00
Gabriel Gilder
bdb77ff282 redirecting to :back instead of manage page on failed aspect creation +spec 2010-10-28 21:01:53 -07:00
Raphael
78acdb7368 Pushing broken photo controller spec for dan to fix 2010-10-28 16:19:18 -07:00
Raphael
512f40eac2 attr_accessible on Post 2010-10-28 15:50:19 -07:00
danielvincent
a0d83e28a1 copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
danielvincent
6626b00961 fix on aspect#show in @friends_not_in_aspect 2010-10-28 11:11:05 -07:00
danielvincent
bb9a6e47a4 added birthday and gender to Profile. fixed a view issue on getting_started#2 2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com
52522c102e add some basic verification when loading the languages config file 2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587 remove two useless lines of code 2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
livefromthemoon@gmail.com
6e1121179d guess locale from browser settings 2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
db1a753add major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working. 2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -07:00
danielvincent
335bd9c96a skip getting started button sets getting_started to false via js and redirects to root_path 2010-10-27 12:53:46 -07:00
danielvincent
b906dd5a1d added redirect to getting_started_path in requests#create 2010-10-27 12:31:48 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
danielvincent
4ec11691cd user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set. 2010-10-27 10:36:13 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
Raphael
49c09b9c8c Remove unused clean_hash 2010-10-26 19:16:16 -07:00
danielvincent
f1fbb68fd8 added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward. 2010-10-26 18:35:14 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
danielvincent
385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
 2010-10-26 16:50:57 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
danielvincent
ea46fa8fd8 save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00
danielvincent
69b1b71a5d removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers). 2010-10-26 13:04:47 -07:00
danielvincent
278a74f1f9 draft 2010-10-26 13:04:46 -07:00
danielvincent
7f1d87f424 fixed pagination bug on aspect#show (re: #445) 2010-10-26 12:57:43 -07:00
zhitomirskiyi
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
maxwell
af917557f6 can't call match on nil 2010-10-25 22:56:50 -07:00
danielvincent
060d8f9c7b DG MS; fixed some bugs with posting publicly. 2010-10-25 19:24:48 -07:00
zhitomirskiyi
917d1838de MS IZ specs are green 2010-10-25 18:55:51 -07:00
danielvincent
287d633c44 user#post now handles posting to services. 2010-10-25 17:41:59 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
maxwell
154b6e0ee7 MS DG added specs for posting to twitter, and basic services controller tests 2010-10-25 17:41:58 -07:00
maxwell
606c7a02a4 MS DG public message now post to twitter, if connected 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
Raphael
fe1a6bce20 Attr-accessible on aspects, check whether built user is persisted 2010-10-21 12:49:50 -07:00
ilya
bec1842bed redirects to the right place 2010-10-20 17:40:58 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
6bee872039 moved the add people into a partial 2010-10-20 15:42:03 -07:00
ilya
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
danielvincent
65ffe2ecdd Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:19:24 -07:00
danielvincent
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -07:00
danielvincent
e4d6e170e3 aspect tab no longer selected on user#edit and person#show, person#index 2010-10-20 10:22:29 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
ilya
7ab2b00231 moved fb posting into the user model 2010-10-18 14:50:48 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
244accc9a9 flash error on friending self 2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07:00
ilya
73dfab8601 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 09:56:36 -07:00
danielvincent
2f5547626e fixed error in status_messages_controller 2010-10-17 21:31:12 -07:00
danielvincent
1139299f42 removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller 2010-10-17 20:47:51 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f Backfill specs for RegistrationsController#create. 
Remove RegistrationsController#new (which just called super, so it's not necessary).
 2010-10-16 21:14:37 -07:00
ilya
f33298e762 removed the puts, initial token checking 2010-10-16 00:42:37 -07:00
ilya
d4702aefa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:20:19 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
a0ce9630b1 added test for facebook posting 2010-10-15 16:03:02 -07:00
maxwell
d56800f9e8 fixing facebook posting 2010-10-15 14:53:36 -07:00
ilya
2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/invitations/_new.haml
 2010-10-15 14:36:49 -07:00
ilya
0074aadd48 added a select tag to email invitations 2010-10-15 14:21:08 -07:00
maxwell
7e0825e492 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 13:58:40 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
maxwell
20f164fd45 fixing some of the invite copy 2010-10-15 11:11:25 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
Raphael
9e90463455 Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric. 2010-10-14 17:29:26 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00
Raphael
65958cf85c Should close Issue 368 2010-10-14 15:53:43 -07:00
Raphael
d66c1e70bc Merge remote branch 'bigbash/280-bug-fix' 2010-10-14 13:21:50 -07:00
maxwell
f2bdc98b47 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 23:52:46 -07:00
maxwell
e1dd0cf6be Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion 2010-10-13 23:49:13 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
Shawn McGuire
711dcdc5f4 Issue #280 Fixed trailing whitespace error 2010-10-13 14:36:03 -05:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -07:00
Raphael
04d5271530 Merge remote branch 'crimer/master' 2010-10-11 10:03:09 -07:00
maxwell
0541833c18 stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
Crimer
4163ce4544 Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page" 2010-10-09 11:51:42 +00:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
maxwell
255901dfab fixing copypasta 2010-10-08 15:00:04 -07:00
maxwell
d7521cb288 MS trying to not use MiniFB to post since it is barfing 2010-10-08 14:49:09 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -07:00
maxwell
b6b192da01 MS DG trying to move around fb url 2010-10-08 14:25:39 -07:00
danielvincent
ed1cb5a0e7 DG MS; moved change password to account page; fixed the styling on password inputs 2010-10-07 18:52:46 -07:00
Raphael
399e437655 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:34:03 -07:00
danielvincent
7a56d82873 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00
danielvincent
4deea95057 DG MS; export photos button in users#edit 2010-10-07 16:56:10 -07:00
Raphael
1d463d22a1 Person show for a nonexistent person now redirects to people index page, rather than giving a 500 2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72 DG MS; test for users#export 2010-10-07 15:22:03 -07:00
danielvincent
206e10f66a dont put log behind devise 2010-10-07 14:57:00 -07:00
danielvincent
8f1973815e DG MS; added route for exported xml 2010-10-07 14:21:53 -07:00
Raphael
9cbdf78aa7 Don't redirect on status message create 2010-10-07 12:01:49 -07:00
Raphael
0859d8ebfe Merge remote branch 'jeffry/master' 2010-10-07 11:45:39 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
0fb091ebbc MS pretty sure we dont need to get the oauth path every time we load the public aspect... 2010-10-06 18:38:37 -07:00
maxwell
ec4c63ada7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:51:10 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -07:00
danielvincent
c9d97d3233 render public with correct mime type 2010-10-05 17:15:00 -07:00
danielvincent
4a8a21b95f public fix 2010-10-05 16:28:01 -07:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -07:00
danielvincent
aed9125e93 more querying through the current_user in controllers 2010-10-05 12:41:41 -07:00
Jeffry Degrande
132eec2c63 Merge branch 'upstream' 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-09-29 02:11:20 -03:00
Jeffry Degrande
046dbf063b fix i18n => I18n 2010-09-29 01:49:35 -03:00
danielvincent
bf15514bc9 redirect users#public to root_url if user does not exist. 2010-09-28 10:23:03 -07:00
danielvincent
15a4609c14 moved user's public route to user controller. changed person.public_url to reflect change. 2010-09-27 22:30:16 -07:00
danielvincent
eac6b8a63b builder is now a class initialized with a user. added director class. 2010-09-27 21:54:01 -07:00
danielvincent
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
ilya
6e407572c4 removed unused repost method, going through the warden object 2010-09-27 17:27:49 -07:00
ilya
c2b84fd9c6 added a public key to post 2010-09-27 16:59:54 -07:00
ilya
7b29e6ec26 checking that a user is logged in before doing fb checking 2010-09-27 15:50:52 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Raphael
12bd0f2301 Merge branch 'master' of http://github.com/uiri/diaspora 2010-09-27 14:48:11 -07:00
Raphael
1ab536bf04 Merge branch 'master' of http://github.com/sarahmei/diaspora 2010-09-27 11:09:14 -07:00
Raphael
ce0accafbb Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303 2010-09-27 11:03:48 -07:00
Stephen Caudill
43fa70f90b Label error notification as such. 2010-09-26 16:10:13 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Uiri
151a57cc93 well, that explains why it was adding the url variable. Fixed so that now new pictures work too. 2010-09-26 11:47:34 -04:00
Sarah Mei
17757a2e2d Merging upstream changes 2010-09-25 15:57:59 -07:00
Uiri
e8d6fb26e7 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-25 18:30:15 -04:00
Uiri
0b19b77b5f A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel 2010-09-25 17:34:13 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
Raphael
f4d18ce9bc don't use request.host as data 2010-09-24 17:12:18 -07:00
Raphael
999d229225 Post photos in either 1.8.7 or 1.9.2 2010-09-24 15:18:30 -07:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
 2010-09-24 14:36:00 -07:00
ilya
82b99decbb putting the token in the warden session 2010-09-24 10:45:27 -07:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
Raphael
16b6fc6cdc Don't give exception on webfinger with no query 2010-09-23 17:18:34 -07:00
ilya
0d71a1896c posting to FB from public now works 2010-09-23 17:11:42 -07:00
ilya
107fb58917 added a logger statement 2010-09-23 17:04:27 -07:00
ilya
d7833c66b2 typo 2010-09-23 16:48:58 -07:00
ilya
4d2bd52310 public aspect param on statusMessage create and in the partial 2010-09-23 16:41:05 -07:00
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:49:41 -07:00
maxwell
457be4385b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:39:04 -07:00
danielvincent
c000b31ffb query for post through user 2010-09-23 10:17:13 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
fc0350e4e1 DG IZ; user can post a status update from user edit page to facebook. 2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95 DG IZ; quick form in user edit 2010-09-22 17:33:57 -07:00
danielvincent
ae58120deb another typo... 2010-09-22 17:18:46 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	config/routes.rb
 2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
maxwell
63ed6a3a95 MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems 2010-09-21 21:31:53 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -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
cb0f0b72eb MS removed a log and trying to be slightly more pedantic 2010-09-20 15:32:18 -07:00
maxwell
5e2fdedf8b MS removed another logging of encrypted data.... 2010-09-20 15:07:30 -07:00
danielvincent
4fe4326ed1 DG IZ photo uploading now works 2010-09-20 15:00:02 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07: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
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
Aria Stewart
45b6ff53f1 Ruby 1.9 fixes 2010-09-18 16:35:48 -06: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
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04:00
Raphael
84789f64c9 scope album queries through user 2010-09-17 14:57:14 -07:00
Ariel Zavala
ce3284f1a1 Merge branch 'master' into i18n 2010-09-17 17:28:55 -04:00
Ariel Zavala
7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-17 17:21:29 -04:00
Ariel Zavala
c1c20e14f7 Added translations to requests controller 2010-09-17 17:05:54 -04:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
Raphael
be26794e4a only write to your own profile 2010-09-17 10:46:14 -07:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Ariel Zavala
d7e9744e84 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 23:53:18 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
Ariel Zavala
db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 21:09:11 -04:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Claudius Coenen
64b07fca55 Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de 2010-09-17 00:23:43 +02:00
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Michael Fellinger
35c9922c61 And fix some more requires 2010-09-16 15:24:26 +09:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7 change the name of instantiate back 2010-09-15 17:08:56 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Raphael
8c8eb02316 Reset albumscontroller 2010-09-15 10:20:46 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -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
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -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
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
maxwell
650a502404 MS IZ removed a bunch of unused request stuff 2010-09-13 16:58:23 -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
26e4e088d7 flash messages are now being set. 2010-09-13 15:44:26 -07:00
Raphael
ff348eb944 Add flashes back in to aspect and albums 2010-09-13 15:20:57 -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
24d957cb32 MS IZ removed the views and redirected the edit route 2010-09-13 12:20:47 -07:00
Raphael
e33d6d8123 Don't create 500s on comment posting 2010-09-13 11:30:10 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
ebd4bea5de Adding a log statement to zombiefriends 2010-09-10 18:57:08 -07:00
Raphael
d9bb850b5b pass group not id into send_friend_request 2010-09-10 17:00:27 -07:00
Raphael
17be027738 redirect to root instead of search 2010-09-10 16:52:28 -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
82a31228fa DG IZ; requests bar added to group/edit 2010-09-10 15:07:55 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
d0de8b4988 Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-09 15:43:20 -07:00
Raphael
3e9a36e1f1 Layout false on all publics controller routes 2010-09-09 14:15:20 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
maxwell
3cf7938028 MS fixing pagination numbers and couple of other things 2010-09-08 20:51:46 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -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
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
5e34506df6 added custom as_json methods to models 2010-08-29 23:46:19 -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
5babda044d cleaned up group controller. added custom as_json to group model. 2010-08-29 21:56:10 -07:00
maxwell
34cb15c423 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-27 13:33:39 -07:00
maxwell
d1bac3e078 MS added a log route for easy access 2010-08-27 13:33:28 -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
danielvincent
390bf24e14 Don't try to put yourself in any groups 2010-08-26 17:34:06 -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
Raphael
9f11a474d8 Take out some logging, put in log user on receive 2010-08-26 11:46:04 -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
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
maxwell
6a613c3304 addded the draggable javascript 2010-08-25 13:53:53 -07:00
danielvincent
90ce31173a fixed errors on album/photo pages 2010-08-25 09:59:18 -07:00
Raphael
f9dd462957 Check for current user again 2010-08-24 19:32: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
1faaf1dd81 Fix profile pic getting unset on profile update 2010-08-24 17:43:11 -07:00
ilya
385472351d not going through user.post 2010-08-24 16:25:12 -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
de3044fa0a Remove publisher selection remnants, fix posting 2010-08-24 15:55:35 -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
ilya
82d140aa80 trying to redeploy to get photos working 2010-08-24 15:23:58 -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
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
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly 
support multiple groups.
 2010-08-24 14:36:03 -07:00
ilya
27de7f930a forgot the backer number set photo 2010-08-24 14:29:05 -07:00
ilya
d92ae1c871 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-24 14:22:47 -07:00
ilya
a70132fcdc IZ we update profile in zombie friends accept 2010-08-24 14:22:21 -07:00
maxwell
b4ab91043a MS added check for current user 2010-08-24 13:45:38 -07:00
Raphael
ebfe77fc6d Making warzombie work again 2010-08-24 12:17:06 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
Raphael
fb33d955c9 Fix group show controller/view and haml error in nav 2010-08-24 11:11:25 -07:00
Raphael
6ab6dc1c3a Removing some unused routes 2010-08-24 11:06:56 -07:00
Raphael
7ca9d1e791 Changed group_nav a little, deleted people_sidebar 2010-08-24 11:02:30 -07:00
Raphael
ab4ad249df Forgot to return in that rescue 2010-08-23 17:09:20 -07:00
Raphael
e05956bddd rescuing 500 on friending someone that was already friends 2010-08-23 17:05:24 -07:00
Raphael
0cff5a45a2 Deleting gridfs controller 2010-08-23 15:02:28 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -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
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
5d25861dc6 IZ MS person profile page now displays only posts a user can see 2010-08-19 10:46:47 -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
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
516a667ce4 going back to showing the first group on the index page 2010-08-18 16:35:11 -07:00
ilya
5de9362933 DG IZ setting group id to nil and changing the deploy script for renaming of the repo 2010-08-18 16:27:08 -07:00
Raphael
a52077b176 Redirect to the group you put someone in after adding them as friends 2010-08-18 14:57:53 -07:00
ilya
034755368b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-18 12:17:23 -07:00
Raphael
b7d648e173 Validate presence of name on group 2010-08-18 11:54:44 -07:00
Raphael
4cd46abaac render nothing at the top 2010-08-18 11:48:32 -07:00
Raphael
10aef7a0a3 Begin rescue on publics controller to make the post for nonexistent user error more readable 2010-08-18 11:46:28 -07:00
ilya
b0088c73d8 DG IZ; user's own post gets referenced in group model 2010-08-18 10:37:33 -07:00
danielvincent
2409fd3f20 user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self 2010-08-18 02:40:53 -07:00
Raphael
539316a235 Removing posts relation from person 2010-08-17 23:50:07 -07:00
ilya
c501707f80 DG IZ posts_for to visible posts 2010-08-17 23:24:42 -07:00
Raphael
82f53663ab remove user index 2010-08-17 20:39:05 -07:00
Raphael
20bc88c0bf Merge branch 'socket-group' of github.com:diaspora/diaspora_rails 2010-08-17 20:19:29 -07:00
Raphael
48756e77f3 Friend_by_id changed to visible_person_by_id 2010-08-17 19:32:42 -07:00
Raphael
86afa7a987 Remove bookmarks and blogs 2010-08-17 18:56:42 -07:00
ilya
7d68089c8b DG IZ using group_id when passing the id around the app 2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d DG IZ added group id to the action hash 2010-08-17 15:27:12 -07:00
ilya
2a90e59f1e DG IZ the group should view the posts for the group (and yourself) w 2010-08-17 12:22:14 -07:00
ilya
5dff3369ad DG IZ; removed puts statements. 2010-08-17 10:48:40 -07:00
Raphael
e32315b6c6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281 Moved search specs, renamed method 2010-08-17 10:24:59 -07:00
ilya
fc7f59bdfc DG IZ stream for the current user's posts 2010-08-17 10:13:23 -07:00
Raphael
3a591b0713 Merging in friend-refactor... 2010-08-16 15:35:14 -07:00
ilya
16a4cbc4e2 DG IZ redirect to requests on error 2010-08-16 15:21:45 -07:00
Raphael
6bb8c52dc4 Syntax error in requests 2010-08-16 15:16:29 -07:00
ilya
33ed838b79 DG IZ added an error message on request delete 2010-08-16 15:08:05 -07:00
ilya
373321beef DG IZ made the selector box going to the right thing by passing only the id 2010-08-16 14:52:59 -07:00
ilya
97e5468cea adding the user to the correct group 2010-08-16 14:46:15 -07:00
ilya
6a3eb97fd4 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector 2010-08-16 14:43:13 -07:00
Raphael
e2d5bf909f Call right method in dev_utilities, clear junk out of comments helper 2010-08-16 12:45:31 -07:00
Raphael
d7a9c3c087 Take out another couple friends.first and replace with friend_by_id 2010-08-16 12:18:36 -07:00
Raphael
4f22222b30 Splitting accept_friend_request into two methods 2010-08-16 12:10:23 -07:00
ilya
122da43058 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector 2010-08-16 11:50:04 -07:00
ilya
0ee03afe1d DG IZ selector box on request page 2010-08-16 11:39:33 -07:00
Raphael
4c731bf818 special-casing local webfinger 2010-08-16 11:29:14 -07:00
Raphael
6ae4c31e05 Person show should be scoped through user 2010-08-16 11:18:52 -07:00
Raphael
3efa36587a Took out a bunch of user.owner references 2010-08-16 11:01:58 -07:00
danielvincent
18cd4b858a broke out group index and show 2010-08-14 00:27:43 -07:00
ilya
ac40f7974e RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend 2010-08-13 18:37:09 -07:00
ilya
c1d2f271d9 RS, IZ; close the file after writing the backer number 2010-08-13 12:43:27 -07:00
ilya
7e377fc292 RS, IZ; adding set backer number to routes, not authenticating it 2010-08-13 12:37:49 -07:00
ilya
23c57c653f RS, IZ; Trying to speed up cap db reset 2010-08-13 12:34:24 -07:00
ilya
5c9a96d245 That last commit was dumb, including the right module 2010-08-13 12:11:10 -07:00
ilya
0b23b959b4 Adding parser methods to devutilities, these should probably be in controller helpers 2010-08-13 12:06:29 -07:00
ilya
99eec04265 Using webfinger in dev_utilities 2010-08-13 11:59:54 -07:00
ilya
339f1a65e2 Removing friends check on zombiefriends 2010-08-13 11:50:43 -07:00
ilya
085dd61607 RS, IZ; changed zombiefriends to use webfinger 2010-08-13 11:43:30 -07:00
ilya
ef97b4f19d RS, IZ; updated DB seed to have a group, zombiefriend with a group 2010-08-13 11:36:59 -07:00
ilya
af6c70db47 RS, IZ; hack to test requests, accepted friends go into the first group. 2010-08-13 09:56:18 -07:00
danielvincent
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
Raphael
eb36190188 DG, RS; Albums create failure prettier 2010-08-11 18:13:23 -07:00
Raphael
0907d7a9fd RS, DG; Cleaned up the switch in user.receive 2010-08-11 16:01:16 -07:00
Raphael
c6a620c7dd RS, DG; store_from_xml is gone, use user.receive 2010-08-11 15:05:05 -07:00
Raphael
5228e51262 RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated. 2010-08-11 14:40:48 -07:00
Raphael
d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	spec/controllers/publics_controller_spec.rb
 2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7 build_xml_for is no longer static, we should probably change the name 2010-08-11 13:58:18 -07:00
ilya
29b1217fcd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4 MS IZ testing many the friend request user methods 2010-08-11 12:28:48 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
144e9ed439 Bookmarks now clean link in instantiate, posting them should work right again 2010-08-11 11:18:40 -07:00
Raphael
683bb0dbef Took out create redirects on ajaxy things, authenticating statusmessages 2010-08-11 10:52:01 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
Raphael
a8b77cf868 DG RS; made an instantiate method for user which makes a person and profile 2010-08-10 15:35:27 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -07:00
Raphael
aa4d428ab7 RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in => 2010-08-10 11:02:04 -07:00
maxwell
d7d9c8aac5 MS put some current users checks into a single one 2010-08-09 21:30:56 -07:00
danielvincent
36adf1b6fd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 21:10:31 -07:00
danielvincent
96fa34ea60 changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error. 2010-08-09 21:10:11 -07:00
maxwell
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -07:00
maxwell
68c4de6c16 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 19:05:12 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
maxwell
d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb
 2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
Raphael
02f66d4c0e Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 15:59:23 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
039ec0d06e warzombie is now more friendly 2010-08-09 15:05:54 -07:00
Raphael
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
59147eb232 Person.new in dev seed 2010-08-09 13:03:27 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
maxwell
ac7530d17f MS IZ person doesn't have friends user does 2010-08-09 11:51:32 -07:00
maxwell
f4428679ef First attempt at fixing warzombie friendingw 2010-08-09 11:44:13 -07:00
Raphael
0a40efdaf7 Removing unused messages 2010-08-09 10:47:45 -07:00
maxwell
7be374ac48 MS IZ fixed a couple of view things as well as the dev db seed script 2010-08-09 10:10:41 -07:00
maxwell
f4ca29da41 PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names... 2010-08-06 17:19:33 -07:00
maxwell
58de12df5e DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name) 2010-08-06 16:35:02 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
278189462b fixed ostatus generator references in models 2010-08-04 09:59:15 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
Raphael
6b1f020839 Moved utilities out to special controller, took pound sign out of database name 2010-08-02 18:03:16 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
ilya
3eeb81ad34 DG IZ; time_created_at uses published_at instead of created_at for OstatusPost 2010-07-29 20:43:03 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
ilya
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
maxwell
bdca2348a6 MS IZ profile page has more useful info, but ultimatly kinda ugly 2010-07-27 14:23:31 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
danielvincent
65acd48885 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 15:52:02 -07:00
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
maxwell
88c83bb028 MS added pagination to the author show page 2010-07-26 15:15:42 -07:00
maxwell
47f5c77e1a kinda prettied up the albums page 2010-07-26 15:09:02 -07:00
maxwell
d7550568ad added pagination to photo picker on the user profile. still ugly, less sucky 2010-07-26 13:55:44 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
maxwell
2cbdc5413f MS nuked some random non helpful puts statements 2010-07-24 12:12:48 -07:00
maxwell
302cf54fab MS subscribers should now unsubscribe 2010-07-23 21:31:28 -07:00
ilya
8793709284 No file is now complained about in the view 2010-07-23 16:57:34 -07:00
ilya
1b32afc78f Switching to Grid_FS, correctly 2010-07-23 14:53:12 -07:00
Raphael
d8ebbf8d26 Adding some logging to requesting/subscribing 2010-07-23 14:20:02 -07:00
ilya
a52adba95b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 11:59:31 -07:00
ilya
082274d0d7 RS IZ a nicer fail(notice) on wrong file format on upload 2010-07-23 11:59:04 -07:00
Raphael
473662a265 Layout false on hubub controller 2010-07-23 11:50:14 -07:00
maxwell
e0baf9d6c5 MS sort the updates on a author's page 2010-07-22 23:36:37 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
3f4219cf94 added debugging stuff to index page for ostatus stuffs 2010-07-22 20:19:52 -07:00
maxwell
c5bcab94e1 DG MS...dumb, forgot to call it in the controller 2010-07-22 17:11:44 -07:00
maxwell
b3668956ab MS DG following now works on identica, you subscribe, and then identica spams you for the rest of your life 2010-07-22 13:53:39 -07:00
maxwell
daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus 2010-07-22 11:54:07 -07:00
ilya
b90cb95c64 RS IZ the photo controller now uses instantiate 2010-07-22 11:41:00 -07:00
maxwell
6869384732 i think it works - max 2010-07-21 21:15:16 -07:00
maxwell
9b1fcdbab2 MS DG some serious message handler and user request API stuff....needs way more tests 2010-07-21 20:33:43 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
Raphael
9b4d92e1fa trying to patch relationship controller 2010-07-21 15:36:14 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
ilya
715a6ae770 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:50:45 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -07:00
Raphael
d8cbbcf6c8 Added photo file validation spec 2010-07-20 11:31:41 -07:00
maxwell
ec3f6e6765 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-17 19:22:26 -07:00
danielvincent
c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/post.rb
 2010-07-17 19:00:53 -07:00