Commit graph

4260 commits

Author SHA1 Message Date
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -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
MrZYX
cc163b13c6 lithuanian is at 100% now, thanks to tahu, Karolis Parfeniukas, Saulius Žemaitaitis and Evaldas Guogis - also some updates to other locales, as always big thank you to all contributors 2010-11-24 15:37:05 +01:00
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -08:00
Raphael
9bb44e6cac My mom cringed when she saw our front page 2010-11-23 23:57:01 -05:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
MrZYX
3a8c82c7b4 italian is at 100%, thanks silviorelli 2010-11-24 01:09:44 +01:00
danielvincent
6a6661d42b prevent text overflow in stream 2010-11-23 15:58:23 -08:00
zhitomirskiyi
a038b512a0 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 15:49:58 -08:00
zhitomirskiyi
a9b503b65e made the dev. util things pending 2010-11-23 15:49:50 -08:00
MrZYX
3fff04470f Merge branch '99translations' of ../diaspora-fork 2010-11-24 00:41:52 +01:00
MrZYX
2d3f0b71e9 fixed issue in he.yml 2010-11-24 00:41:23 +01:00
danielvincent
03243a277f took out slide animation on comments due to sluggish performance 2010-11-23 15:20:36 -08:00
MrZYX
c2e5b539d8 updated locales from 99translations. big thank you to all contributors 2010-11-24 00:08:59 +01:00
danielvincent
0b36e955fe check if profile exists before fetching profile photo 2010-11-23 14:49:32 -08:00
zhitomirskiyi
8ed1865de8 removing dev util routes 2010-11-23 13:38:05 -08:00
danielvincent
7c6bc7f7ea removed debug info from layout 2010-11-23 12:32:39 -08:00
danielvincent
d334ffb3fa batch inviter takes an invite count for new users. default=10 2010-11-23 11:58:00 -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
3f737116d6 since there is only one person with that name in the db, it returns a redirect 2010-11-23 11:02:17 -08:00
danielvincent
5e8606169d rolling back twitter gem to 0.9.12 release. 2010-11-23 10:55:40 -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
356d8ab23b Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	app/views/devise/mailer/invitation.html.haml
2010-11-23 09:40:45 -08:00
maxwell
dab3725a9c hotlinking image for invite 2010-11-23 09:39:53 -08:00
maxwell
0455249585 hotlinking image for invite 2010-11-23 09:35:24 -08:00
maxwell
0b81d9e446 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 09:27:32 -08:00
maxwell
b7834b298c adding chrome frame for poor ie souls 2010-11-23 09:27:02 -08:00
MrZYX
4348a9ed6a russian is back at 100%, thanks to all contributors 2010-11-23 16:58:15 +01: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
danielvincent
97171b3083 resolved press logos 2010-11-22 21:20:03 -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