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

2362 commits

Author SHA1 Message Date
Michael Sofaer and Raphael Sofaer
b9cafc0579 Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution. 
This reverts commit 4c96e12a31.
 2010-11-26 17:16:11 -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
maxwell
e83271ef22 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 09:57:18 -08:00
maxwell
4c96e12a31 removing the form for user creation thru signup 2010-11-26 09:56:30 -08:00
MrZYX
6e5b097f81 try at fixing a translation 2010-11-26 18:33:52 +01:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
Paweł Wilk
7e2e95df76 Added i18n for 'make public' message in views/shared/_publisher.haml 2010-11-26 16:09:19 +01:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82 Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button 2010-11-26 15:34:46 +01: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
Dan Hansen & Sarah Mei
5075a7384b allow hyphens in YouTube video IDs 2010-11-25 21:05:54 -08:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -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
502b4dde30 Merge branch 'invitation_flow' 2010-11-25 23:18:01 -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
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Raphael
6e14018abb Fixing http referer 2010-11-25 19:50:14 -05:00
Paweł Wilk
c7059a58da Added i18n for "Sign up for invite" button. 2010-11-26 01:38:08 +01: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
Dan Hansen & Sarah Mei
e5673b304d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:29:00 -08: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
Dan Hansen & Sarah Mei
792690bb80 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:07:53 -08:00
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -08:00
Paweł Wilk
8138473b91 Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly. 2010-11-26 00:47:02 +01:00
Paweł Wilk
e1a965c2fb Added multiple plurals for translations of 'contacts' and 'requests'. 
- Added multiple plurals handling for .contacts token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .new_requests token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .contacts token in views/aspects/show.html.haml.
 2010-11-26 00:47:02 +01:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Sarah Mei
ef2fa21d06 person_image_link and object_path return empty strings if parameter is nil. 2010-11-25 12:26:46 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar. 
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
 2010-11-25 10:29:35 -08:00
Sarah Mei
287b79ab17 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 22:09:25 -08:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Raphael
12c049fec2 Add logging to inviting 2010-11-25 01:06:25 -05:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Raphael
eeac6901b9 Revert "Change invite button text" 
This reverts commit d443b15c97.
 2010-11-24 21:01:48 -05:00
Raphael
38a2ea5199 Remove auto-friending in db:reset for dev servers 2010-11-24 17:55:51 -05:00
Raphael
93ebbbb65f put some logging in the mailer 2010-11-24 17:13:28 -05:00
maxwell
062593ee0f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 14:06:17 -08:00
maxwell
bd1cbdb297 adding drag to add people above friend accept box 2010-11-24 14:03:11 -08:00
Raphael
d443b15c97 Change invite button text 2010-11-24 16:48:24 -05:00
Sarah Mei
fa602cabf2 fix messaging around invitation success/failure 2010-11-24 09:34:05 -08:00
MrZYX
849072f283 this should fix #572 2010-11-24 17:48:47 +01: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
danielvincent
0b36e955fe check if profile exists before fetching profile photo 2010-11-23 14:49:32 -08:00
danielvincent
7c6bc7f7ea removed debug info from layout 2010-11-23 12:32:39 -08:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
zhitomirskiyi
546e7876d5 correct logging of the invitation acceptance 2010-11-23 11:46:45 -08:00
danielvincent
efab6449b3 message for closed signups on users#sign_in 2010-11-23 11:14:26 -08:00
maxwell
ec41ace9bf Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 11:07:48 -08:00
maxwell
52b02176db invited users seed aspects 2010-11-23 11:07:33 -08:00
zhitomirskiyi
ebaf2c081e returning nothing on empty query and limit the returning of the query to 90 2010-11-23 10:02:01 -08:00
danielvincent
9d98afb94f took out fade on photos#index, because it only displayed all photos half the time. 2010-11-23 09:44:58 -08:00
maxwell
dab3725a9c hotlinking image for invite 2010-11-23 09:39:53 -08:00
Raphael Sofaer
31a851e787 No guarantees on functionality here, editing from a browser. 2010-11-23 06:14:36 -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
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
82d0e193e7 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 01:17:05 -08:00
maxwell
bd31bc423f MSSM added links to github and blog in header 2010-11-23 01:16:51 -08:00
danielvincent
376d403651 made publisher semi-hidden on home page 2010-11-23 00:34:28 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/fixtures/users.yaml
 2010-11-23 00:15:26 -08:00
maxwell
32390933e8 PALINDROME message for multiple emails 2010-11-23 00:14:26 -08: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
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
danielvincent
f725641eaf added shadow on diaspora text on landing page. 2010-11-22 20:53:20 -08:00
danielvincent
69cac02ade landing page fix 2010-11-22 20:35:30 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
maxwell
ffedd9fa77 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 17:30:00 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
08aaccbdf1 Revert "--amend" 
This reverts commit 7650870502.
 2010-11-22 17:11:38 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -08:00
maxwell
21a90656fd fixing translations 2010-11-22 16:55:06 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
7650870502 --amend 2010-11-22 16:38:29 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic. 
Added an un-minified version of jquery-mobile for debugging.
 2010-11-22 15:02:25 -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
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01: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
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -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
c7ac90538a added some spacing between photos and text on stream 2010-11-22 01:57:51 -08:00
maxwell
cdbd9df15e Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 01:50:23 -08:00
maxwell
ae2b3d75c2 added some copy to the landing page, and some basic styling 2010-11-22 01:50:15 -08:00
danielvincent
108ac9fd7c resolved stray h3 tag in stream 2010-11-22 01:31:21 -08:00
danielvincent
cb837f5fd7 moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading. 2010-11-22 01:24:04 -08:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
danielvincent
9a18b7e6f3 photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level. 2010-11-22 00:32:46 -08:00
maxwell
7da5accee8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-21 23:48:44 -08:00
maxwell
3a99ec3f8c uploader now shows current file uploading, and progress 2010-11-21 23:44:20 -08:00