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
Dan Hansen & Sarah Mei
84face159d
Removing unused js
2010-11-25 21:44:57 -08: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
Raphael
1fb58c53fb
Monkeypatching to change rails default logging to something more useful
2010-11-25 19:37:05 -05:00
Paweł Wilk
8138473b91
Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly.
2010-11-26 00:47:02 +01:00
John Yani
7f64bf052f
Small russian locale fixes
2010-11-25 23:58:56 +02:00
MrZYX
72f8747c51
pulled locales, big thank you all contributors
2010-11-25 22:10:34 +01:00
Alec Leamas
df31de2898
Generate all content in public/ before server starts.
...
Introduces a delay first time the server is started, but makes all resources
available to jammit. Can be disabled by flag in config/server.sh. Hopefully
silences jammit's messages about application.css et. al. not found
2010-11-25 14:22:21 +01:00
Sarah Mei
aa4a61870c
you can click on photos in manage aspects to see profiles
2010-11-24 22:09:14 -08:00
Raphael
38a2ea5199
Remove auto-friending in db:reset for dev servers
2010-11-24 17:55:51 -05:00
MrZYX
86914f3f6d
swedish is perfect again :D, thanks Hexagon and all the others
2010-11-24 23:42:18 +01:00
MrZYX
64f2ec550d
polish is at 100%, thanks jandom
2010-11-24 22:19:14 +01:00
MrZYX
be7d36b7fb
updated locales - added macedonian thanks to stojmenovski
2010-11-24 21:31:01 +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
Raphael
9bb44e6cac
My mom cringed when she saw our front page
2010-11-23 23:57:01 -05:00
MrZYX
3a8c82c7b4
italian is at 100%, thanks silviorelli
2010-11-24 01:09:44 +01:00
zhitomirskiyi
a038b512a0
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-23 15:49:58 -08:00
MrZYX
2d3f0b71e9
fixed issue in he.yml
2010-11-24 00:41:23 +01:00
MrZYX
c2e5b539d8
updated locales from 99translations. big thank you to all contributors
2010-11-24 00:08:59 +01:00
zhitomirskiyi
8ed1865de8
removing dev util routes
2010-11-23 13:38:05 -08:00
danielvincent
efab6449b3
message for closed signups on users#sign_in
2010-11-23 11:14:26 -08:00
MrZYX
4348a9ed6a
russian is back at 100%, thanks to all contributors
2010-11-23 16:58:15 +01: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
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
69cac02ade
landing page fix
2010-11-22 20:35:30 -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
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
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
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
zhitomirskiyi
e84ce5591f
The discription in several places
2010-11-22 14:55:30 -08:00
zhitomirskiyi
edbb0bdf07
slightly more discriptive cannot remove the person from the last aspect messagge
2010-11-22 14:52:39 -08:00
Sarah Mei
ab37fd0d98
Fix type-o on front page, copy edit a bit.
2010-11-22 14:11:27 -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
maxwell
5c2d161146
small changes to mobile
2010-11-22 01:19:11 -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
