Raphael
c46b6d80aa
Correct math, take out link_tos
2010-11-27 17:07:35 -05:00
Raphael
49f4ec1432
comment ids in the logs
2010-11-27 16:21:40 -05:00
Raphael
be463f8f7f
Logging for comment partial rendering
2010-11-27 16:17:12 -05:00
Raphael
7030ed0fed
Putting youtube titles back into status messages
2010-11-27 11:43:24 -05:00
Hexagon
702abddce3
1900 was too far back for rails, 1904 were accepted.
2010-11-27 14:13:29 +01:00
Hexagon
033eea9f50
Fixed #550 , diaspora now support seniors up to 110
2010-11-27 14:02:42 +01:00
Hexagon
894f112b75
Removing duplicate id in layout/application
2010-11-27 10:37:04 +01:00
danielvincent
06ff5923c5
fix photos#show and status_messages#show from previous commit
2010-11-27 01:35:57 -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
Raphael
d5d4a08f03
Start moving youtube title getting into the post/comment flow
2010-11-27 01:00:47 -05:00
maxwell
119680d209
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-26 16:10:56 -08:00
maxwell
80f8e4d29a
removing invite partial, with a switch, and updated app_config.yml.example
2010-11-26 16:10:42 -08:00
maxwell
a507927bb3
Revert "invitations are not sent from magent queue (a problem in itself)"
...
This reverts commit 9e5eb86866
2010-11-26 16:02:57 -08:00
danielvincent
ce63e13eca
aspect ids normalized to posts to minimize queries on views.
2010-11-26 18:55:06 -05:00
maxwell
9e5eb86866
invitations are not sent from magent queue (a problem in itself)
...
Revert "Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution."
This reverts commit b9cafc0579
2010-11-26 15:52:34 -08:00
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
maxwell
4c96e12a31
removing the form for user creation thru signup
2010-11-26 09:56:30 -08: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
Raphael
690951dcd1
Take a query out of the views
2010-11-25 23:53:45 -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
Paweł Wilk
c7059a58da
Added i18n for "Sign up for invite" button.
2010-11-26 01:38:08 +01: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
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
aa4a61870c
you can click on photos in manage aspects to see profiles
2010-11-24 22:09:14 -08:00
Raphael
eeac6901b9
Revert "Change invite button text"
...
This reverts commit d443b15c97
2010-11-24 21:01:48 -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
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
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
danielvincent
efab6449b3
message for closed signups on users#sign_in
2010-11-23 11:14:26 -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
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
